Mercurial > hg > forks > yadex

changeset 115:8fdb848549d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't use "long" here, and kill some warnings.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 06 Oct 2014 15:48:31 +0300
parents 3287e1b7c77c
children edd7a18b71a2
files src/wads2.cc
diffstat 1 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/wads2.cc	Mon Oct 06 15:47:56 2014 +0300
+++ b/src/wads2.cc	Mon Oct 06 15:48:31 2014 +0300
@@ -271,7 +271,7 @@
             names++;
             if ((*entry_type == 'm' || *entry_type == 'l')
                 && wad->directory[n].size)
-                verbmsg(" warning: non-zero length (%ld)",
+                verbmsg(" warning: non-zero length (%d)",
                         wad->directory[n].size);
         }
         // Either F_END or FF_END mark the end of a
@@ -484,14 +484,14 @@
             goto byebye;
         }
     }
-    verbmsg("  Type %.4s, directory has %ld entries at offset %08lXh\n",
-            wf->type, (long) wf->dirsize, (long) wf->dirstart);
+    verbmsg("  Type %.4s, directory has %d entries at offset %08lXh\n",
+            wf->type, wf->dirsize, wf->dirstart);
 
     // Load the directory of the wad
-    wf->directory = (DirPtr) GetMemory((long) sizeof(struct Directory) * wf->dirsize);
+    wf->directory = (DirPtr) GetMemory(sizeof(struct Directory) * wf->dirsize);
     if (fseek(wf->fp, wf->dirstart, SEEK_SET) != 0)
     {
-        printf("%.128s: can't seek to directory at %08lXh\n",
+        printf("%.128s: can't seek to directory at %08Xh\n",
                filename, wf->dirstart);
         fail = true;
         goto byebye;
@@ -504,8 +504,8 @@
         e |= file_read_bytes(wf->fp, wf->directory[n].name, WAD_NAME);
         if (e)
         {
-            printf("%.128s: read error on directory entry %ld\n", filename,
-                   (long) n);
+            printf("%.128s: read error on directory entry %d\n", filename,
+                   n);
             fail = true;
             goto byebye;
         }
@@ -542,7 +542,7 @@
     for (dir = cfg.MasterDir; dir; dir = dir->next)
     {
         strncpy(dataname, dir->dir.name, WAD_NAME);
-        fprintf(file, "%-*s  %-50s  %6ld  x%08lx\n",
+        fprintf(file, "%-*s  %-50s  %6d  x%08x\n",
                 WAD_NAME, dataname, dir->wadfile->pathname(),
                 dir->dir.size, dir->dir.start);
 
@@ -568,7 +568,7 @@
     for (n = 0; n < wad->dirsize; n++)
     {
         strncpy(dataname, wad->directory[n].name, WAD_NAME);
-        fprintf(file, "%-*s  %6ld  x%08lx  x%08lx\n",
+        fprintf(file, "%-*s  %6d  x%08x  x%08x\n",
                 WAD_NAME, dataname,
                 wad->directory[n].size,
                 wad->directory[n].start,
@@ -691,7 +691,7 @@
             continue;
         strncpy(dataname, entry->dir.name, WAD_NAME);
         dataname[WAD_NAME] = '\0';
-        fprintf(file, "Contents of entry %s (size = %ld bytes):\n",
+        fprintf(file, "Contents of entry %s (size = %d bytes):\n",
                 dataname, entry->dir.size);
         const Wad_file *wf = entry->wadfile;
         wf->seek(entry->dir.start);
@@ -824,8 +824,8 @@
             break;
     if (entry)
     {
-        verbmsg("Writing %ld bytes starting from offset %lX...\n",
-                (long) entry->dir.size, (unsigned long) entry->dir.start);
+        verbmsg("Writing %d bytes starting from offset %X...\n",
+                entry->dir.size, entry->dir.start);
         entry->wadfile->seek(entry->dir.start);
         if (entry->wadfile->error())
         {