Changeset 62854 in vbox for trunk

Timestamp:

Aug 1, 2016 10:36:01 PM (9 years ago)

Author:

vboxsync

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

109450

Message:

scm: warnings

Location:

trunk/src/bldprogs

Files:

• scm.cpp (modified) (2 diffs)
• scmrw.cpp (modified) (5 diffs)
• scmsubversion.cpp (modified) (3 diffs)

trunk/src/bldprogs/scm.cpp ¶

@@ -613 +613 @@
 {
     /** @todo Editor and SCM settings directives in documents.  */
+    RT_NOREF2(pBase, pStream);
     return VINF_SUCCESS;
 }
@@ -1474 +1475 @@
 
             PSCMSETTINGS pPopped = scmSettingsStackPop(&pSettingsStack);
-            Assert(pPopped == pSettings);
+            Assert(pPopped == pSettings); RT_NOREF_PV(pPopped);
             scmSettingsDestroy(pSettings);
         }

trunk/src/bldprogs/scmrw.cpp ¶

@@ -363 +363 @@
 bool rewrite_SvnNoExecutable(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
 {
+    RT_NOREF2(pIn, pOut);
     if (   !pSettings->fSetSvnExecutable
         || !ScmSvnIsInWorkingCopy(pState))
@@ -389 +390 @@
 bool rewrite_SvnKeywords(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
 {
+    RT_NOREF2(pIn, pOut);
     if (   !pSettings->fSetSvnKeywords
         || !ScmSvnIsInWorkingCopy(pState))
@@ -439 +441 @@
 bool rewrite_Makefile_kup(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
 {
+    RT_NOREF2(pOut, pSettings);
+
     /* These files should be zero bytes. */
     if (pIn->cb == 0)
@@ -462 +466 @@
 bool rewrite_Makefile_kmk(PSCMRWSTATE pState, PSCMSTREAM pIn, PSCMSTREAM pOut, PCSCMSETTINGSBASE pSettings)
 {
+    RT_NOREF4(pState, pIn, pOut, pSettings);
     return false;
 }
@@ -681 +686 @@
 {
 
+    RT_NOREF4(pState, pIn, pOut, pSettings);
     return false;
 }

trunk/src/bldprogs/scmsubversion.cpp ¶

@@ -394 +394 @@
              */
             RTPROCESS hProc;
-            rc = RTProcCreateEx(g_szSvnPath,
+            rc = RTProcCreateEx(pszExec,
                                 papszArgs,
-                                RTENV_DEFAULT,
+                                hEnv,
                                 0 /*fFlags*/,
                                 NULL /*phStdIn*/,
@@ -529 +529 @@
      * Create the process.
      */
-    RTPROCESS hProc;
+    RTPROCESS hProc = NIL_RTPROCESS;
     if (RT_SUCCESS(rc))
-        rc = RTProcCreateEx(g_szSvnPath,
+        rc = RTProcCreateEx(pszExec,
                             papszArgs,
-                            RTENV_DEFAULT,
+                            hEnv,
                             0 /*fFlags*/,
                             aph[0],
@@ -814 +814 @@
     {
         char *pszStripped = RTStrStrip(pszVersion);
-        if (RTStrVersionCompare(pszVersion, "1.8") >= 0)
+        if (RTStrVersionCompare(pszStripped, "1.8") >= 0)
             g_enmSvnVersion = kScmSvnVersion_1_8;
-        else if (RTStrVersionCompare(pszVersion, "1.7") >= 0)
+        else if (RTStrVersionCompare(pszStripped, "1.7") >= 0)
             g_enmSvnVersion = kScmSvnVersion_1_7;
-        else if (RTStrVersionCompare(pszVersion, "1.6") >= 0)
+        else if (RTStrVersionCompare(pszStripped, "1.6") >= 0)
             g_enmSvnVersion = kScmSvnVersion_1_6;
         else