Changeset 57002 in vbox for trunk/src/bldprogs

Timestamp:

Jul 18, 2015 11:44:13 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

101717

Message:

gccplugin: Use error_at instead of warning_at when there are too many or too few arguments. Implemented %M.

Location:

trunk/src/bldprogs

Files:

• VBoxCompilerPlugIns.h (modified) (2 diffs)
• VBoxCompilerPlugInsCommon.cpp (modified) (3 diffs)
• VBoxCompilerPlugInsGcc.cpp (modified) (4 diffs)

trunk/src/bldprogs/VBoxCompilerPlugIns.h

@@ -62 +62 @@
  * Implements checking format string replacement (%M).
  *
- * Caller will have checked all that can be checked.
+ * Caller will have checked all that can be checked.  This means that there is a
+ * string argument present, or it won't make the call.
  *
  * @param   pState              The format string checking state.
@@ -80 +81 @@
  */
 void            VFmtChkWarnFmt(PVFMTCHKSTATE pState, const char *pszLoc, const char *pszFormat, ...);
+
+/**
+ * Error.
+ *
+ * @returns
+ * @param   pState              .
+ * @param   pszLoc              .
+ * @param   pszFormat           .
+ * @param   ...                 .
+ */
+void            VFmtChkErrFmt(PVFMTCHKSTATE pState, const char *pszLoc, const char *pszFormat, ...);
 
 /**

trunk/src/bldprogs/VBoxCompilerPlugInsCommon.cpp

@@ -118 +118 @@
             cchWidth = 0;
             fFlags |= RTSTR_F_WIDTH;
+            ch = *pszFmt++;
         }
 
@@ -142 +143 @@
                 iArg++;
                 cchPrecision = 0;
+                ch = *pszFmt++;
             }
             else
-                VFmtChkWarnFmt(pState, pszPct, "Missing precision value, only got the '.'");
+                VFmtChkErrFmt(pState, pszPct, "Missing precision value, only got the '.'");
             if (cchPrecision < 0)
             {
-                VFmtChkWarnFmt(pState, pszPct, "Negative precision value: %d", cchPrecision);
+                VFmtChkErrFmt(pState, pszPct, "Negative precision value: %d", cchPrecision);
                 cchPrecision = 0;
             }
@@ -223 +225 @@
             {
                 if (*pszFmt)
-                    VFmtChkWarnFmt(pState, pszFmt, "Characters following '%%M' will be ignored");
+                    VFmtChkErrFmt(pState, pszFmt, "Characters following '%%M' will be ignored");
                 if (chSize != '\0')
                     VFmtChkWarnFmt(pState, pszFmt, "'%%M' does not support any size flags (%c)", chSize);

trunk/src/bldprogs/VBoxCompilerPlugInsGcc.cpp

@@ -617 +617 @@
 
 
+void VFmtChkErrFmt(PVFMTCHKSTATE pState, const char *pszLoc, const char *pszFormat, ...)
+{
+    char szTmp[1024];
+    va_list va;
+    va_start(va, pszFormat);
+    vsnprintf(szTmp, sizeof(szTmp), pszFormat, va);
+    va_end(va);
+
+    /* display the warning. */
+    error_at(MyGetFormatStringLocation(pState, pszLoc), "%s", szTmp);
+}
+
+
 
 void VFmtChkVerifyEndOfArgs(PVFMTCHKSTATE pState, unsigned iArg)
@@ -631 +644 @@
             tree hArg = gimple_call_arg(pState->hStmt, iArg);
             if (cArgs - iArg > 1)
-                warning_at(MY_LOC(hArg, pState), 0, "%u extra arguments not consumed by format string", cArgs - iArg);
+                error_at(MY_LOC(hArg, pState), "%u extra arguments not consumed by format string", cArgs - iArg);
             else if (   TREE_CODE(hArg) != INTEGER_CST
                      || !TREE_INT_CST(hArg).fits_shwi()
                      || TREE_INT_CST(hArg).to_shwi() != -99) /* ignore final dummy argument: ..., -99); */
-                warning_at(MY_LOC(hArg, pState), 0, "one extra argument not consumed by format string");
+                error_at(MY_LOC(hArg, pState), "one extra argument not consumed by format string");
         }
         /* This should be handled elsewhere, but just in case. */
         else if (iArg - 1 == cArgs)
-            warning_at(pState->hFmtLoc, 0, "one argument too few");
+            error_at(pState->hFmtLoc, "one argument too few");
         else
-            warning_at(pState->hFmtLoc, 0, "%u arguments too few", iArg - cArgs);
+            error_at(pState->hFmtLoc, "%u arguments too few", iArg - cArgs);
     }
 }
@@ -654 +667 @@
         if (iArg >= cArgs)
         {
-            VFmtChkWarnFmt(pState, pszLoc, "Missing argument! %s", pszMessage);
+            VFmtChkErrFmt(pState, pszLoc, "Missing argument! %s", pszMessage);
             return false;
         }
@@ -695 +708 @@
 
 
-
 void VFmtChkHandleReplacementFormatString(PVFMTCHKSTATE pState, const char *pszPctM, unsigned iArg)
 {
     if (pState->iArgs > 0)
     {
-        pState->iArgs += iArg;
-
+        pState->iFmt  = pState->iArgs + iArg;
+        pState->iArgs = pState->iFmt  + 1;
+        MyCheckFormatRecursive(pState, gimple_call_arg(pState->hStmt, pState->iFmt - 1));
     }
 }