Changeset 2001 in kBuild

Timestamp:

Oct 29, 2008 10:14:48 PM (16 years ago)

Author:

bird

Message:

kmk: pedantic warnings.

Location:

trunk/src/kmk

Files:

• electric.c (modified) (2 diffs)
• filedef.h (modified) (2 diffs)
• glob/glob.c (modified) (1 diff)
• implicit.c (modified) (1 diff)
• job.c (modified) (1 diff)
• kmkbuiltin/err.c (modified) (1 diff)
• kmkbuiltin/kbuild_protection.c (modified) (4 diffs)
• kmkbuiltin/kbuild_protection.h (modified) (1 diff)
• kmkbuiltin/setmode.c (modified) (1 diff)
• remake.c (modified) (2 diffs)

trunk/src/kmk/electric.c

@@ -54 +54 @@
   fprintf (stderr, "electric heap error: %s (errno=%d)\n", msg, errno);
   __asm__ ("int3"); /* not portable... */
-#endif 
+#endif
   abort ();
   exit (1);
@@ -188 +188 @@
 }
 
-#endif /* ELECTRIC_HEAP */
+#else /* !ELECTRIC_HEAP */
+extern void electric_heap_keep_ansi_c_quiet (void);
+#endif /* !ELECTRIC_HEAP */
 

trunk/src/kmk/filedef.h

@@ -210 +210 @@
 #define ORDINARY_MTIME_MIN (OLD_MTIME + 1)
 #if FILE_TIMESTAMP_HI_RES == 0 /* bird: shut up annoying warnings!
-  ASSUMES: unsinged FILE_TIMESTAMP ++. */
-# define ORDINARY_MTIME_MAX  ( ~ (FILE_TIMESTAMP) 0 )
+  ASSUMES: unsigned FILE_TIMESTAMP ++. */
+# define ORDINARY_MTIME_MAX     ( ~ (FILE_TIMESTAMP) 0 )
 #else
 #define ORDINARY_MTIME_MAX ((FILE_TIMESTAMP_S (NEW_MTIME) \
@@ -224 +224 @@
    targets, which need to be considered newer than anything that depends on
    them, even if said dependents' modtimes are in the future.  */
+#if 1 /* bird: ASSUME the type is unsigned and the wrath of a pedantic gcc.  */
+# define NEW_MTIME              ( ~ (FILE_TIMESTAMP) 0 )
+#else
 #define NEW_MTIME INTEGER_TYPE_MAXIMUM (FILE_TIMESTAMP)
+#endif
 
 #define check_renamed(file) \

trunk/src/kmk/glob/glob.c

@@ -390 +390 @@
           /* Allocate working buffer large enough for our work.  Note that
             we have at least an opening and closing brace.  */
-          int firstc;
+          size_t firstc;
           char *alt_start;
           const char *p;

trunk/src/kmk/implicit.c

@@ -117 +117 @@
 
   if (c == '\0')
-    return 0;
+    {
+      if (length)   /* bird: shut up gcc. */
+        *length = 0;
+      return 0;
+    }
 
 

trunk/src/kmk/job.c

@@ -2103 +2103 @@
         {
           DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s') [start_waiting_jobs]\n"),
-                       not_parallel, not_parallel - 1, job->file, job->file->name));
+                       not_parallel, not_parallel - 1, (void *) job->file, job->file->name));
           assert(not_parallel > 0);
           --not_parallel;

trunk/src/kmk/kmkbuiltin/err.c

@@ -75 +75 @@
 void warnx(const char *fmt, ...)
 {
-    int err = errno;
     va_list args;
     fprintf(stderr, "%s: ", g_progname);

trunk/src/kmk/kmkbuiltin/kbuild_protection.c

@@ -37 +37 @@
 # include <limits.h>
 # include <direct.h>
-#endif 
+#else
+# include <unistd.h>
+#endif
 #include "kbuild_protection.h"
+#include "err.h"
 
 
@@ -185 +188 @@
         }
     }
-#else
+#else  /* !WIN && !OS2 */
     if (!IS_SLASH(pszPath[0]))
     {
@@ -199 +202 @@
         cComponents = countSubPathComponents(szCwd, 0);
     }
-#endif
+#endif /* !WIN && !OS2 */
 
     /*
@@ -352 +355 @@
         if (cComponents < 0)
             return -1;
-        if (cComponents <= pThis->cProtectionDepth)
+        if ((unsigned int)cComponents <= pThis->cProtectionDepth)
         {
             errx(1, "%s: protected", pszPath);

trunk/src/kmk/kmkbuiltin/kbuild_protection.h

@@ -46 +46 @@
 typedef struct KBUILDPROTECTION
 {
-    unsigned        uMagic;
-    unsigned        cProtectionDepth;
+    unsigned int    uMagic;
+    unsigned int    cProtectionDepth;
     unsigned char   afTypes[KBUILDPROTECTIONTYPE_MAX];
 } KBUILDPROTECTION;

trunk/src/kmk/kmkbuiltin/setmode.c

@@ -396 +396 @@
         case 'X':
                 set->cmd = op;
-                set->bits = (who ? who : mask) & oparg;
+                set->bits = (who ? (mode_t)who : mask) & oparg;
                 break;
 

trunk/src/kmk/remake.c

@@ -902 +902 @@
   int touched = 0;
   DB (DB_JOBS, (_("notice_finished_file - entering: file=%p `%s' update_status=%d command_state=%d\n"), /* bird */
-                  file, file->name, file->update_status, file->command_state));
+                  (void *) file, file->name, file->update_status, file->command_state));
 
   file->command_state = cs_finished;
@@ -925 +925 @@
     {
       DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s') [notice_finished_file]\n"), not_parallel,
-                   not_parallel - 1, file, file->name));
+                   not_parallel - 1, (void *) file, file->name));
       assert(not_parallel >= 1);
       --not_parallel;