Changeset 76555 in vbox

Timestamp:

Jan 1, 2019 2:08:55 AM (6 years ago)

Author:

vboxsync

Message:

scm: made header guard #endif massaging configurable and for the time being optional.

Location:

trunk/src/bldprogs

Files:

• scm.cpp (modified) (5 diffs)
• scm.h (modified) (1 diff)
• scmrw.cpp (modified) (1 diff)

trunk/src/bldprogs/scm.cpp

@@ -79 +79 @@
     SCMOPT_PRAGMA_ONCE,
     SCMOPT_NO_PRAGMA_ONCE,
+    SCMOPT_FIX_HEADER_GUARD_ENDIF,
+    SCMOPT_NO_FIX_HEADER_GUARD_ENDIF,
     SCMOPT_ENDIF_GUARD_COMMENT,
     SCMOPT_NO_ENDIF_GUARD_COMMENT,
@@ -185 +187 @@
     /* .fFixHeaderGuards = */                       true,
     /* .fPragmaOnce = */                            true,
+    /* .fFixHeaderGuardEndif = */                   false,
     /* .fEndifGuardComment = */                     true,
     /* .pszGuardPrefix = */                         (char *)"VBOX_INCLUDED_",
@@ -232 +235 @@
     { "--pragma-once",                      SCMOPT_PRAGMA_ONCE,                     RTGETOPT_REQ_NOTHING },
     { "--no-pragma-once",                   SCMOPT_NO_PRAGMA_ONCE,                  RTGETOPT_REQ_NOTHING },
+    { "--fix-header-guard-endif",           SCMOPT_FIX_HEADER_GUARD_ENDIF,          RTGETOPT_REQ_NOTHING },
+    { "--no-fix-header-guard-endif",        SCMOPT_NO_FIX_HEADER_GUARD_ENDIF,       RTGETOPT_REQ_NOTHING },
     { "--endif-guard-comment",              SCMOPT_ENDIF_GUARD_COMMENT,             RTGETOPT_REQ_NOTHING },
     { "--no-endif-guard-comment",           SCMOPT_NO_ENDIF_GUARD_COMMENT,          RTGETOPT_REQ_NOTHING },
@@ -1060 +1065 @@
         case SCMOPT_NO_PRAGMA_ONCE:
             pSettings->fPragmaOnce = false;
+            return VINF_SUCCESS;
+
+        case SCMOPT_FIX_HEADER_GUARD_ENDIF:
+            pSettings->fFixHeaderGuardEndif = true;
+            return VINF_SUCCESS;
+        case SCMOPT_NO_FIX_HEADER_GUARD_ENDIF:
+            pSettings->fFixHeaderGuardEndif = false;
             return VINF_SUCCESS;
 
@@ -2775 +2787 @@
                 RTPrintf("      Whether to include #pragma once with the header guard.  Default: %RTbool\n", g_Defaults.fPragmaOnce);
                 break;
+            case SCMOPT_FIX_HEADER_GUARD_ENDIF:
+                RTPrintf("      Whether to fix the #endif of a header guard.  Default: %RTbool\n", g_Defaults.fFixHeaderGuardEndif);
+                break;
             case SCMOPT_ENDIF_GUARD_COMMENT:
                 RTPrintf("      Put a comment on the header guard #endif or not.  Default: %RTbool\n", g_Defaults.fEndifGuardComment);

trunk/src/bldprogs/scm.h

@@ -338 +338 @@
     /** Whether to include a pragma once statement with the header guard. */
     bool            fPragmaOnce;
+    /** Whether to fix the \#endif part of a header guard. */
+    bool            fFixHeaderGuardEndif;
     /** Whether to add a comment on the \#endif part of the header guard. */
     bool            fEndifGuardComment;

trunk/src/bldprogs/scmrw.cpp

@@ -3128 +3128 @@
      * right kind of comment following it.
      */
-#if 0
-    if (iEndIfOut == 0)
-        return ScmError(pState, VERR_PARSE_ERROR, "Expected '#endif' at the end of the file...\n");
-    rc = ScmStreamSeekByLine(pIn, iEndIfIn);
-    if (RT_FAILURE(rc))
-        return false;
-    rc = ScmStreamSeekByLine(pOut, iEndIfOut);
-    if (RT_FAILURE(rc))
-        return false;
-
-    pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol);
-    if (!pchLine)
-        return ScmError(pState, VERR_INTERNAL_ERROR, "ScmStreamGetLine failed re-reading #endif!\n");
-
-    char   szTmp[64 + sizeof(szNormalized)];
-    size_t cchTmp;
-    if (pSettings->fEndifGuardComment)
-        cchTmp = RTStrPrintf(szTmp, sizeof(szTmp), "#endif /* !%.*s */", Guard.cch, Guard.psz);
-    else
-        cchTmp = RTStrPrintf(szTmp, sizeof(szTmp), "#endif"); /* lazy bird */
-    fRet |= cchTmp != cchLine || memcmp(szTmp, pchLine, cchTmp) != 0;
-    rc = ScmStreamPutLine(pOut, szTmp, cchTmp, enmEol);
-    if (RT_FAILURE(rc))
-        return false;
-
-    /* Copy out the remaining lines (assumes no #pragma once here). */
-    while ((pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol)) != NULL)
-    {
-        rc = ScmStreamPutLine(pOut, pchLine, cchLine, enmEol);
+    if (pSettings->fFixHeaderGuardEndif)
+    {
+        if (iEndIfOut == 0)
+            return ScmError(pState, VERR_PARSE_ERROR, "Expected '#endif' at the end of the file...\n");
+        rc = ScmStreamSeekByLine(pIn, iEndIfIn);
         if (RT_FAILURE(rc))
             return false;
-    }
-#else
-    RT_NOREF(iEndIfOut, iEndIfIn);
-#endif
+        rc = ScmStreamSeekByLine(pOut, iEndIfOut);
+        if (RT_FAILURE(rc))
+            return false;
+
+        pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol);
+        if (!pchLine)
+            return ScmError(pState, VERR_INTERNAL_ERROR, "ScmStreamGetLine failed re-reading #endif!\n");
+
+        char   szTmp[64 + sizeof(szNormalized)];
+        size_t cchTmp;
+        if (pSettings->fEndifGuardComment)
+            cchTmp = RTStrPrintf(szTmp, sizeof(szTmp), "#endif /* !%.*s */", Guard.cch, Guard.psz);
+        else
+            cchTmp = RTStrPrintf(szTmp, sizeof(szTmp), "#endif"); /* lazy bird */
+        fRet |= cchTmp != cchLine || memcmp(szTmp, pchLine, cchTmp) != 0;
+        rc = ScmStreamPutLine(pOut, szTmp, cchTmp, enmEol);
+        if (RT_FAILURE(rc))
+            return false;
+
+        /* Copy out the remaining lines (assumes no #pragma once here). */
+        while ((pchLine = ScmStreamGetLine(pIn, &cchLine, &enmEol)) != NULL)
+        {
+            rc = ScmStreamPutLine(pOut, pchLine, cchLine, enmEol);
+            if (RT_FAILURE(rc))
+                return false;
+        }
+    }
 
     return fRet;