Changeset 1184 in kBuild

Timestamp:

Oct 5, 2007 10:25:54 PM (17 years ago)

Author:

bird

Message:

Usage and version. Shut up a couple of warnings.

File:

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

trunk/src/kObjCache/kObjCache.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * kObjCache - Object Cache.
- *
+ */
+
+/*
  * Copyright (c) 2007 knut st. osmundsen <[email protected]>
- *
  *
  * This file is part of kBuild.
@@ -21 +21 @@
  * You should have received a copy of the GNU General Public License
  * along with kBuild; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
@@ -59 +59 @@
 # ifndef _P_WAIT
 #  define _P_WAIT   P_WAIT
-# endif 
+# endif
 # ifndef _P_NOWAIT
 #  define _P_NOWAIT P_NOWAIT
@@ -749 +749 @@
         size_t cb = cbBuf >= 128*1024 ? 128*1024 : cbBuf;
         pSum->crc32 = crc32(pSum->crc32, pb, cb);
-        MD5Update(&pCtx->MD5Ctx, pb, cb);
+        MD5Update(&pCtx->MD5Ctx, pb, (unsigned)cb);
         cbBuf -= cb;
     }
@@ -1925 +1925 @@
 
     kOCSumInitWithCtx(&pEntry->New.SumHead, &Ctx);
-    cbAlloc = pEntry->Old.cbCpp ? (pEntry->Old.cbCpp + 4*1024*1024 + 4096) & ~(4*1024*1024 - 1) : 4*1024*1024;
+    cbAlloc = pEntry->Old.cbCpp ? ((long)pEntry->Old.cbCpp + 4*1024*1024 + 4096) & ~(4*1024*1024 - 1) : 4*1024*1024;
     cbLeft = cbAlloc;
     pEntry->New.pszCppMapping = psz = xmalloc(cbAlloc);
@@ -2053 +2053 @@
                      pEntry->New.pszCppName, pEntry->pszDir, strerror(errno));
         psz = pEntry->New.pszCppMapping;
-        cbLeft = pEntry->New.cbCpp;
+        cbLeft = (long)pEntry->New.cbCpp;
         while (cbLeft > 0)
         {
@@ -2095 +2095 @@
 {
     const char *psz = pEntry->New.pszCppMapping;
-    long cbLeft = pEntry->New.cbCpp;
+    long cbLeft = (long)pEntry->New.cbCpp;
     while (cbLeft > 0)
     {
@@ -2177 +2177 @@
 
     kOCSumInitWithCtx(&pEntry->New.SumHead, &Ctx);
-    cbAlloc = pEntry->Old.cbCpp ? (pEntry->Old.cbCpp + 4*1024*1024 + 4096) & ~(4*1024*1024 - 1) : 4*1024*1024;
+    cbAlloc = pEntry->Old.cbCpp ? ((long)pEntry->Old.cbCpp + 4*1024*1024 + 4096) & ~(4*1024*1024 - 1) : 4*1024*1024;
     cbLeft = cbAlloc;
     pEntry->New.pszCppMapping = psz = xmalloc(cbAlloc);
@@ -3631 +3631 @@
  * @returns 0.
  */
-static int usage(void)
-{
-    printf("syntax: kObjCache [--kObjCache-options] [-v|--verbose]\n"
-           "            <  [-c|--cache-file <cache-file>]\n"
-           "             | [-n|--name <name-in-cache>] [[-d|--cache-dir <cache-dir>]] >\n"
-           "            <-f|--file <local-cache-file>>\n"
-           "            <-t|--target <target-name>>\n"
-           "            [-r|--redir-stdout] [-p|--passthru]\n"
-           "            --kObjCache-cpp <filename> <precompiler + args>\n"
-           "            --kObjCache-cc <object> <compiler + args>\n"
-           "            [--kObjCache-both [args]]\n"
-           "            [--kObjCache-cpp|--kObjCache-cc [more args]]\n"
-           "        kObjCache <-V|--version>\n"
-           "        kObjCache [-?|/?|-h|/h|--help|/help]\n"
-           "\n"
-           "The env.var. KOBJCACHE_DIR sets the default cache diretory (-d).\n"
-           "The env.var. KOBJCACHE_OPTS allow you to specifie additional options\n"
-           "without having to mess with the makefiles. These are appended with "
-           "a --kObjCache-options between them and the command args.\n"
-           "\n");
+static int usage(FILE *pOut)
+{
+    fprintf(pOut,
+            "syntax: kObjCache [--kObjCache-options] [-v|--verbose]\n"
+            "            <  [-c|--cache-file <cache-file>]\n"
+            "             | [-n|--name <name-in-cache>] [[-d|--cache-dir <cache-dir>]] >\n"
+            "            <-f|--file <local-cache-file>>\n"
+            "            <-t|--target <target-name>>\n"
+            "            [-r|--redir-stdout] [-p|--passthru]\n"
+            "            --kObjCache-cpp <filename> <precompiler + args>\n"
+            "            --kObjCache-cc <object> <compiler + args>\n"
+            "            [--kObjCache-both [args]]\n"
+            "            [--kObjCache-cpp|--kObjCache-cc [more args]]\n"
+            "        kObjCache <-V|--version>\n"
+            "        kObjCache [-?|/?|-h|/h|--help|/help]\n"
+            "\n"
+            "The env.var. KOBJCACHE_DIR sets the default cache diretory (-d).\n"
+            "The env.var. KOBJCACHE_OPTS allow you to specifie additional options\n"
+            "without having to mess with the makefiles. These are appended with "
+            "a --kObjCache-options between them and the command args.\n"
+            "\n");
     return 0;
 }
@@ -3696 +3697 @@
      */
     if (argc <= 1)
-        return usage();
+        return usage(stderr);
     for (i = 1; i < argc; i++)
     {
@@ -3724 +3725 @@
             enmMode = kOC_Options;
         else if (!strcmp(argv[i], "--help"))
-            return usage();
+            return usage(stderr);
         else if (enmMode != kOC_Options)
         {
@@ -3782 +3783 @@
         else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "-?")
               || !strcmp(argv[i], "/h") || !strcmp(argv[i], "/?") || !strcmp(argv[i], "/help"))
-            return usage();
+        {
+            usage(stdout);
+            return 0;
+        }
         else if (!strcmp(argv[i], "-V") || !strcmp(argv[i], "--version"))
         {
-            printf("kObjCache v0.1.0 ($Revision$)\n");
+            printf("kObjCache - kBuild version %d.%d.%d ($Revision$)\n"
+                   "Copyright (C) 2007 Knut St. Osmundsen\n",
+                   KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, KBUILD_VERSION_PATCH);
             return 0;
         }