儲存庫 kBuild 的更動 1726

時間撮記:

2008-9-5 上午01:44:07 (16 年 以前)

作者:

bird

訊息:

kmk/expreval.c: Warnings and a couple of bugs.

檔案:

• trunk/src/kmk/expreval.c (修改) (8 筆差異)

trunk/src/kmk/expreval.c

@@ -260 +260 @@
 
     /* copy it into the output buffer. */
-    psz++;
     return (char *)memcpy(pszDst, psz, &szTmp[EXPR_NUM_LEN] - psz);
 }
@@ -343 +342 @@
     for (;;)
     {
-        int iDigit;
+        unsigned iDigit;
         int ch = *psz;
         switch (ch)
@@ -1021 +1020 @@
         rc = expr_var_make_num(pThis, pVar2);
         if (rc >= kExprRet_Ok)
-            pVar1->uVal.i %= pVar2->uVal.i;
+            pVar1->uVal.i *= pVar2->uVal.i;
     }
 
@@ -1534 +1533 @@
 static EXPRRET expr_op_right_parenthesis(PEXPR pThis)
 {
+    (void)pThis;
     return kExprRet_Ok;
 }
@@ -1595 +1595 @@
 static void expr_map_init(void)
 {
-    int i;
+    unsigned i;
     if (g_fExprInitializedMap)
         return;
@@ -1642 +1642 @@
 {
     char ch = *psz;
-    int i;
+    unsigned i;
 
     for (i = uchVal >> 1; i < sizeof(g_aExprOps) / sizeof(g_aExprOps[0]); i++)
@@ -1860 +1860 @@
                 {
                     psz++;
-                    if (iPar > sizeof(achPars) / sizeof(achPars[0]))
+                    if (iPar > (int)(sizeof(achPars) / sizeof(achPars[0])))
                     {
                         expr_error(pThis, "Too deep nesting of variable expansions");
@@ -2079 +2079 @@
         o = variable_buffer_output(o, pVar->uVal.psz, strlen(pVar->uVal.psz));
     }
+    else
+        o = variable_buffer_output(o, "<expression evaluation failed>", sizeof("<expression evaluation failed>") - 1);
     expr_destroy(pExpr);