Changeset 76556 in vbox

Timestamp:

Jan 1, 2019 2:35:28 AM (6 years ago)

Author:

vboxsync

Message:

scm: Header guard fixes and more helpful output.

File:

• trunk/src/bldprogs/scmrw.cpp (modified) (2 diffs)

trunk/src/bldprogs/scmrw.cpp

@@ -2957 +2957 @@
                 if (szNormalized[0] != '\0')
                 {
-                    fRet = Guard.cch != cchNormalized || memcmp(Guard.psz, szNormalized, cchNormalized) != 0;
+                    if (   Guard.cch != cchNormalized
+                        || memcmp(Guard.psz, szNormalized, cchNormalized) != 0)
+                    {
+                        ScmVerbose(pState, 2, "guard changed from %.*s to %s\n", Guard.cch, Guard.psz, szNormalized);
+                        ScmVerbose(pState, 2, "grep -rw %.*s ${WCROOT} | grep -Fv %s\n",
+                                   Guard.cch, Guard.psz, pState->pszFilename);
+                        fRet = true;
+                    }
                     Guard.psz = szNormalized;
                     Guard.cch = cchNormalized;
@@ -3064 +3071 @@
         if (RT_FAILURE(rc))
             return ScmError(pState, rc, "seek error\n");
-        fRet = pSettings->fPragmaOnce;
+        fRet |= pSettings->fPragmaOnce;
         ScmVerbose(pState, 2, "Missing #pragma once\n");
     }