Changeset 69171 in vbox for trunk/src/bldprogs

Timestamp:

Oct 23, 2017 4:03:51 PM (8 years ago)

Author:

vboxsync

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

118482

Message:

scm: License and copyright updating. [build fix]

Location:

trunk/src/bldprogs

Files:

• scm.cpp (modified) (4 diffs)
• scm.h (modified) (1 diff)

trunk/src/bldprogs/scm.cpp

@@ -1092 +1092 @@
             pState->fFirst = true;
         }
-        if (pszFormat)
-        {
-            RTPrintf(pState
-                     ? "%s: info:   "
-                     : "%s: info: ",
-                     g_szProgName);
-            va_list va;
-            va_start(va, pszFormat);
-            RTPrintfV(pszFormat, va);
-            va_end(va);
-        }
+        RTPrintf(pState
+                 ? "%s: info:   "
+                 : "%s: info: ",
+                 g_szProgName);
+        va_list va;
+        va_start(va, pszFormat);
+        RTPrintfV(pszFormat, va);
+        va_end(va);
+    }
+}
+
+
+/**
+ * Prints the per file banner needed and the message level is high enough.
+ *
+ * @param   pState              The rewrite state.
+ * @param   iLevel              The required verbosity level.
+ */
+void ScmVerboseBanner(PSCMRWSTATE pState, int iLevel)
+{
+    if (iLevel <= g_iVerbosity && !pState->fFirst)
+    {
+        RTPrintf("%s: info: --= Rewriting '%s' =--\n", g_szProgName, pState->pszFilename);
+        pState->fFirst = true;
     }
 }
@@ -1207 +1220 @@
     if (ScmStreamIsText(&Stream1))
     {
-        ScmVerbose(pState, 3, NULL);
+        ScmVerboseBanner(pState, 3);
 
         /*
@@ -1275 +1288 @@
                                 else
                                 {
-                                    ScmVerbose(pState, 1, NULL);
+                                    ScmVerboseBanner(pState, 1);
                                     ScmDiffStreams(pszFilename, &Stream1, pIn, g_fDiffIgnoreEol,
                                                    g_fDiffIgnoreLeadingWS, g_fDiffIgnoreTrailingWS, g_fDiffSpecialChars,
@@ -1300 +1313 @@
 
                             if (!fModified && !pState->cSvnPropChanges)
-                                ScmVerbose(pState, 3, "no change\n", pszFilename);
+                                ScmVerbose(pState, 3, "%s: no change\n", pszFilename);
                         }
                         else

trunk/src/bldprogs/scm.h

@@ -340 +340 @@
 
 void ScmVerbose(PSCMRWSTATE pState, int iLevel, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(3, 4);
+void ScmVerboseBanner(PSCMRWSTATE pState, int iLevel);
 bool ScmError(PSCMRWSTATE pState, int rc, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(3, 4);