Changeset 1736Tweet

Timestamp:

Feb 2, 2007, 12:58:06 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Fixed more MSVC compilation warnings.

Location:

zzuf/trunk

Files:

• msvc/config.h (modified) (1 diff)
• src/fuzz.c (modified) (3 diffs)
• src/libzzuf.h (modified) (1 diff)
• src/mygetopt.c (modified) (1 diff)
• src/zzuf.c (modified) (2 diffs)

zzuf/trunk/msvc/config.h

@@ -36 +36 @@
 typedef unsigned char uint8_t;
 
-typedef unsigned long int uintptr_t;
+#include <stddef.h> /* Has uintptr_t etc. */
 typedef int pid_t;
 

zzuf/trunk/src/fuzz.c

@@ -116 +116 @@
     struct fuzz *fuzz;
     volatile uint8_t *aligned_buf;
-    int i, j, todo;
+    int64_t i, j;
+    int todo;
 
 #if 0
@@ -133 +134 @@
         if(fuzz->cur != (int)i)
         {
-            uint32_t chunkseed = (i + (int)(fuzz->ratio * MAGIC1)) ^ MAGIC2;
+            uint32_t chunkseed = ((int)i + (int)(fuzz->ratio * MAGIC1)) ^ MAGIC2;
             _zz_srand(fuzz->seed ^ chunkseed);
 
@@ -247 +248 @@
                      && tmp[2] && strchr(hex, tmp[2]))
             {
-                new = ((strchr(hex, tmp[1]) - hex) & 0xf) << 4;
-                new |= (strchr(hex, tmp[2]) - hex) & 0xf;
+                new = ((int)(strchr(hex, tmp[1]) - hex) & 0xf) << 4;
+                new |= (int)(strchr(hex, tmp[2]) - hex) & 0xf;
                 tmp += 2;
             }

zzuf/trunk/src/libzzuf.h

@@ -35 +35 @@
     uint32_t seed;
     double ratio;
-    int cur;
+    int64_t cur;
 #ifdef HAVE_FGETLN
     char *tmp;

zzuf/trunk/src/mygetopt.c

@@ -87 +87 @@
         for(i = 0; longopts[i].name; i++)
         {
-            int l = strlen(longopts[i].name);
+            size_t l = strlen(longopts[i].name);
 
             if(strncmp(flag + 2, longopts[i].name, l))

zzuf/trunk/src/zzuf.c

@@ -429 +429 @@
         else while(ret)
         {
-            if((nw = write(1, buf + off, (size_t)ret)) < 0)
+            if((nw = write(1, buf + off, (unsigned int)ret)) < 0)
                 break;
             ret -= nw;
@@ -1033 +1033 @@
     }
 
-    return (char *)nt->OptionalHeader.ImageBase +
-                           nt->OptionalHeader.AddressOfEntryPoint;
+    return (void *)(uintptr_t)(nt->OptionalHeader.ImageBase +
+                                 nt->OptionalHeader.AddressOfEntryPoint);
 }
 #endif