Changeset 34580 in vbox

Timestamp:

Dec 1, 2010 3:46:52 PM (14 years ago)

Author:

vboxsync

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

68375

Message:

cleanup fix.

File:

• trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp (modified) (3 diffs)

trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp

@@ -1349 +1349 @@
 
         /*
-         * Only directories which conform with our mangling and temporary
-         * install/uninstall naming scheme are candidates for cleaning.
+         * Only directories which conform with our temporary install/uninstall
+         * naming scheme are candidates for cleaning.
          */
         if (   RTFS_IS_DIRECTORY(Entry.Info.Attr.fMode)
@@ -1356 +1356 @@
             && strcmp(Entry.szName, "..") != 0)
         {
-            bool fTemporary = false;
-            bool fCandidate = VBoxExtPackIsValidMangledName(Entry.szName);
-            if (!fCandidate)
-            {
-                char *pszMarker = strstr(Entry.szName, "-_-");
-                if (   pszMarker
-                    && (   !strcmp(pszMarker, "-_-uninst")
-                        || !strncmp(pszMarker, "-_-inst", sizeof("-_-inst") - 1)))
-                {
-                    *pszMarker = '\0';
-                    fCandidate = VBoxExtPackIsValidMangledName(Entry.szName);
-                    *pszMarker = '-';
-                    fTemporary = true;
-                }
-            }
+            bool fCandidate = false;
+            char *pszMarker = strstr(Entry.szName, "-_-");
+            if (   pszMarker
+                && (   !strcmp(pszMarker, "-_-uninst")
+                    || !strncmp(pszMarker, "-_-inst", sizeof("-_-inst") - 1)))
+                fCandidate = VBoxExtPackIsValidMangledName(Entry.szName, pszMarker - &Entry.szName[0]);
             if (fCandidate)
             {
@@ -1380 +1371 @@
                 if (RT_SUCCESS(rc))
                 {
-                    RTEXITCODE rcExit2 = RemoveExtPackDir(szPath, fTemporary);
+                    RTEXITCODE rcExit2 = RemoveExtPackDir(szPath, true /*fTemporary*/);
                     if (rcExit2 == RTEXITCODE_SUCCESS)
                         RTMsgInfo("Successfully removed '%s'.", Entry.szName);