Changeset 3065 in kBuild for trunk/src/kObjCache

Timestamp:

Sep 30, 2017 12:52:35 PM (7 years ago)

Author:

bird

Message:

misc gcc warning fixes

File:

• trunk/src/kObjCache/kObjCache.c (modified) (4 diffs)

trunk/src/kObjCache/kObjCache.c

@@ -70 +70 @@
 #  define O_BINARY 0
 # endif
+# ifndef __sun__
+#  include <sys/file.h> /* flock */
+# endif
 #endif
 #if defined(__WIN__)
@@ -1071 +1074 @@
                 }
             }
+
+            case kOCDepState_Invalid:
+                assert(0);
+                break;
         }
 
@@ -2355 +2362 @@
                 {
                     char *pszNext;
-                    unsigned i = strtoul(&g_szLine[sizeof("cc-argv-#") - 1], &pszNext, 0);
-                    if ((fBad = i >= pEntry->Old.cArgvCompile || pEntry->Old.papszArgvCompile[i] || (pszNext && *pszNext)))
+                    unsigned iArg = strtoul(&g_szLine[sizeof("cc-argv-#") - 1], &pszNext, 0);
+                    if ((fBad = iArg >= pEntry->Old.cArgvCompile || pEntry->Old.papszArgvCompile[iArg] || (pszNext && *pszNext)))
                         break;
-                    pEntry->Old.papszArgvCompile[i] = xstrdup(pszVal);
+                    pEntry->Old.papszArgvCompile[iArg] = xstrdup(pszVal);
                 }
                 else if (!strcmp(g_szLine, "cc-argv-sum"))
@@ -2491 +2498 @@
 
     fprintf(pFile, "magic=kObjCacheEntry-v0.1.1\n");
-    CHECK_LEN(fprintf(pFile, "target=%s\n", pEntry->New.pszTarget ? pEntry->New.pszTarget : pEntry->Old.pszTarget));
-    CHECK_LEN(fprintf(pFile, "key=%lu\n", (unsigned long)pEntry->uKey));
+    CHECK_LEN(fprintf(pFile, "target=%s\n",     pEntry->New.pszTarget ? pEntry->New.pszTarget : pEntry->Old.pszTarget));
+    CHECK_LEN(fprintf(pFile, "key=%lu\n",       (unsigned long)pEntry->uKey));
     CHECK_LEN(fprintf(pFile, "obj=%s\n",        pEntry->New.pszObjName ? pEntry->New.pszObjName : pEntry->Old.pszObjName));
     CHECK_LEN(fprintf(pFile, "cpp=%s\n",        pEntry->New.pszCppName ? pEntry->New.pszCppName : pEntry->Old.pszCppName));
-    CHECK_LEN(fprintf(pFile, "cpp-size=%lu\n",  pEntry->New.pszCppName ? pEntry->New.cbCpp      : pEntry->Old.cbCpp));
-    CHECK_LEN(fprintf(pFile, "cpp-ms=%lu\n",    pEntry->New.pszCppName ? pEntry->New.cMsCpp     : pEntry->Old.cMsCpp));
-    CHECK_LEN(fprintf(pFile, "cc-ms=%lu\n",     pEntry->New.pszCppName ? pEntry->New.cMsCompile : pEntry->Old.cMsCompile));
+    CHECK_LEN(fprintf(pFile, "cpp-size=%lu\n",  (unsigned long)(pEntry->New.pszCppName ? pEntry->New.cbCpp      : pEntry->Old.cbCpp)));
+    CHECK_LEN(fprintf(pFile, "cpp-ms=%lu\n",    (unsigned long)(pEntry->New.pszCppName ? pEntry->New.cMsCpp     : pEntry->Old.cMsCpp)));
+    CHECK_LEN(fprintf(pFile, "cc-ms=%lu\n",     (unsigned long)(pEntry->New.pszCppName ? pEntry->New.cMsCompile : pEntry->Old.cMsCompile)));
 
     if (!kOCSumIsEmpty(&pEntry->New.SumCompArgv))