# HG changeset patch # User Matti Hamalainen # Date 1412599649 -10800 # Node ID 275ec0b8c4cd2fd18e2cabccfbcac1328ff66b64 # Parent 9694eb987bf30e90e00186ae1daf9d00484689ec Cosmetics. diff -r 9694eb987bf3 -r 275ec0b8c4cd src/wads2.cc --- a/src/wads2.cc Mon Oct 06 15:23:55 2014 +0300 +++ b/src/wads2.cc Mon Oct 06 15:47:29 2014 +0300 @@ -359,8 +359,7 @@ */ static int level_name_order(const void *p1, const void *p2) { - return levelname2rank((const char *) p1) - - levelname2rank((const char *) p2); + return levelname2rank((const char *) p1) - levelname2rank((const char *) p2); } @@ -431,15 +430,15 @@ FIXME if reopening fails, we're left in the cold. I'm not sure how to avoid that, though. */ + Wad_file *dummy; + wad_list.rewind(); + while (wad_list.get(dummy)) { - Wad_file *dummy; - wad_list.rewind(); - while (wad_list.get(dummy)) - if (fncmp(filename, dummy->filename) == 0) - { - wad_list.del(); - break; - } + if (fncmp(filename, dummy->filename) == 0) + { + wad_list.del(); + break; + } } // Create a new Wad_file @@ -479,6 +478,7 @@ fail = true; goto byebye; } + for (int32_t n = 0; n < wf->dirsize; n++) { bool e = file_read_i32(wf->fp, &wf->directory[n].start); @@ -550,12 +550,11 @@ */ void ListFileDirectory(FILE * file, const Wad_file * wad) { - char dataname[WAD_NAME + 1]; char key; + char dataname[WAD_NAME + 1] = ""; int lines = 5; long n; - dataname[WAD_NAME] = '\0'; fprintf(file, "Wad File Directory\n"); fprintf(file, "==================\n\n"); fprintf(file, "Wad File: %s\n\n", wad->pathname());