Mercurial > hg > forks > yadex

changeset 113:275ec0b8c4cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 06 Oct 2014 15:47:29 +0300
parents 9694eb987bf3
children 3287e1b7c77c
files src/wads2.cc
diffstat 1 files changed, 11 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- 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());