Changeset 33464 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 26, 2010 12:27:50 PM (14 years ago)

Author:

vboxsync

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

67055

Message:

*: Fixes for incorrect RTStrAPrintf usage (it does NOT return an IPRT status code) and the odd bugs nearby.

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvHostBase.cpp (modified) (2 diffs)
• VBoxHDD.cpp (modified) (4 diffs)
• VmdkHDDCore.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

@@ -970 +970 @@
         rc = RTStrAPrintf(&pszPassthroughDevice, "/dev/%s%u",
                           DeviceCCB.cgdl.periph_name, DeviceCCB.cgdl.unit_number);
-        if (RT_SUCCESS(rc))
+        if (rc >= 0)
         {
             RTFILE PassthroughDevice;
@@ -1013 +1013 @@
             }
         }
+        else
+            rc = VERR_NO_STR_MEMORY;
     }
     else

trunk/src/VBox/Devices/Storage/VBoxHDD.cpp

@@ -2075 +2075 @@
 
     /* To get all entries with VBoxHDD as prefix. */
-    char *pszPluginFilter;
-    rc = RTStrAPrintf(&pszPluginFilter, "%s/%s*", szPath, VBOX_HDDFORMAT_PLUGIN_PREFIX);
-    if (RT_FAILURE(rc))
-    {
-        rc = VERR_NO_MEMORY;
-        return rc;
-    }
+    char *pszPluginFilter = RTPathJoinA(szPath, VBOX_HDDFORMAT_PLUGIN_PREFIX "*");
+    if (!pszPluginFilter)
+        return VERR_NO_STR_MEMORY;
 
     PRTDIRENTRYEX pPluginDirEntry = NULL;
@@ -2127 +2123 @@
 
         /* Prepend the path to the libraries. */
-        rc = RTStrAPrintf(&pszPluginPath, "%s/%s", szPath, pPluginDirEntry->szName);
-        if (RT_FAILURE(rc))
-        {
-            rc = VERR_NO_MEMORY;
+        pszPluginPath = RTPathJoinA(szPath, pPluginDirEntry->szName);
+        if (!pszPluginPath)
+        {
+            rc = VERR_NO_STR_MEMORY;
             break;
         }
@@ -2195 +2191 @@
 
     /* To get all entries with VBoxHDD as prefix. */
-    char *pszPluginFilter;
-    rc = RTStrAPrintf(&pszPluginFilter, "%s/%s*", szPath, VD_CACHEFORMAT_PLUGIN_PREFIX);
-    if (RT_FAILURE(rc))
-    {
-        rc = VERR_NO_MEMORY;
+    char *pszPluginFilter = RTPathJoinA(szPath, VD_CACHEFORMAT_PLUGIN_PREFIX "*");
+    if (!pszPluginFilter)
+    {
+        rc = VERR_NO_STR_MEMORY;
         return rc;
     }
@@ -2247 +2242 @@
 
         /* Prepend the path to the libraries. */
-        rc = RTStrAPrintf(&pszPluginPath, "%s/%s", szPath, pPluginDirEntry->szName);
-        if (RT_FAILURE(rc))
-        {
-            rc = VERR_NO_MEMORY;
+        pszPluginPath = RTPathJoinA(szPath, pPluginDirEntry->szName);
+        if (!pszPluginPath)
+        {
+            rc = VERR_NO_STR_MEMORY;
             break;
         }

trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

@@ -1700 +1700 @@
     char *pszValueQuoted;
 
-    int rc = RTStrAPrintf(&pszValueQuoted, "\"%s\"", pszValue);
-    if (RT_FAILURE(rc))
-        return rc;
-    rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDesc, pszKey,
-                        pszValueQuoted);
+    RTStrAPrintf(&pszValueQuoted, "\"%s\"", pszValue);
+    if (!pszValueQuoted)
+        return VERR_NO_STR_MEMORY;
+    int rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDesc, pszKey,
+                            pszValueQuoted);
     RTStrFree(pszValueQuoted);
     return rc;
@@ -1870 +1870 @@
     if (pszVal)
     {
-        rc = RTStrAPrintf(&pszValQuoted, "\"%s\"", pszVal);
-        if (RT_FAILURE(rc))
-            return rc;
+        RTStrAPrintf(&pszValQuoted, "\"%s\"", pszVal);
+        if (!pszValQuoted)
+            return VERR_NO_STR_MEMORY;
     }
     else
@@ -1888 +1888 @@
     char *pszUuid;
 
-    int rc = RTStrAPrintf(&pszUuid, "\"%RTuuid\"", pUuid);
-    if (RT_FAILURE(rc))
-        return rc;
-    rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDDB, pszKey,
-                        pszUuid);
+    RTStrAPrintf(&pszUuid, "\"%RTuuid\"", pUuid);
+    if (!pszUuid)
+        return VERR_NO_STR_MEMORY;
+    int rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDDB, pszKey,
+                            pszUuid);
     RTStrFree(pszUuid);
     return rc;
@@ -1902 +1902 @@
     char *pszValue;
 
-    int rc = RTStrAPrintf(&pszValue, "\"%d\"", uValue);
-    if (RT_FAILURE(rc))
-        return rc;
-    rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDDB, pszKey,
-                        pszValue);
+    RTStrAPrintf(&pszValue, "\"%d\"", uValue);
+    if (!pszValue)
+        return VERR_NO_STR_MEMORY;
+    int rc = vmdkDescSetStr(pImage, pDescriptor, pDescriptor->uFirstDDB, pszKey,
+                            pszValue);
     RTStrFree(pszValue);
     return rc;
@@ -3447 +3447 @@
                 else
                 {
-                    size_t cbDirname;
                     char *pszDirname = RTStrDup(pImage->pszFilename);
                     if (!pszDirname)
@@ -3455 +3454 @@
                     }
                     RTPathStripFilename(pszDirname);
-                    cbDirname = strlen(pszDirname);
-                    rc = RTStrAPrintf(&pszFullname, "%s%c%s", pszDirname,
-                                      RTPATH_SLASH, pExtent->pszBasename);
+                    pszFullname = RTPathJoinA(pszDirname, pExtent->pszBasename);
                     RTStrFree(pszDirname);
-                    if (RT_FAILURE(rc))
+                    if (!pszFullname)
+                    {
+                        rc = VERR_NO_STR_MEMORY;
                         goto out;
+                    }
                 }
                 pExtent->pszFullname = pszFullname;
@@ -3720 +3720 @@
 
                 /* Set up full name for partition extent. */
-                size_t cbDirname;
                 char *pszDirname = RTStrDup(pImage->pszFilename);
                 if (!pszDirname)
-                    return VERR_NO_MEMORY;
+                    return VERR_NO_STR_MEMORY;
                 RTPathStripFilename(pszDirname);
-                cbDirname = strlen(pszDirname);
-                char *pszFullname;
-                rc = RTStrAPrintf(&pszFullname, "%s%c%s", pszDirname,
-                                  RTPATH_SLASH, pExtent->pszBasename);
+                char *pszFullname = RTPathJoinA(pszDirname, pExtent->pszBasename);
                 RTStrFree(pszDirname);
-                if (RT_FAILURE(rc))
-                    return rc;
+                if (!pszDirname)
+                    return VERR_NO_STR_MEMORY;
                 pExtent->pszFullname = pszFullname;
                 pExtent->enmType = VMDKETYPE_FLAT;
@@ -3888 +3884 @@
             {
                 if (cExtents == 1)
-                    rc = RTStrAPrintf(&pszTmp, "%s-flat%s", pszBasenameBase,
-                                      pszBasenameExt);
+                    RTStrAPrintf(&pszTmp, "%s-flat%s", pszBasenameBase,
+                                 pszBasenameExt);
                 else
-                    rc = RTStrAPrintf(&pszTmp, "%s-f%03d%s", pszBasenameBase,
-                                      i+1, pszBasenameExt);
+                    RTStrAPrintf(&pszTmp, "%s-f%03d%s", pszBasenameBase,
+                                 i+1, pszBasenameExt);
             }
             else
-                rc = RTStrAPrintf(&pszTmp, "%s-s%03d%s", pszBasenameBase, i+1,
-                                  pszBasenameExt);
+                RTStrAPrintf(&pszTmp, "%s-s%03d%s", pszBasenameBase, i+1,
+                             pszBasenameExt);
             RTStrFree(pszBasenameBase);
-            if (RT_FAILURE(rc))
-                return rc;
+            if (!pszTmp)
+                return VERR_NO_STR_MEMORY;
             cbTmp = strlen(pszTmp) + 1;
             char *pszBasename = (char *)RTMemTmpAlloc(cbTmp);
@@ -3911 +3907 @@
         }
         char *pszBasedirectory = RTStrDup(pImage->pszFilename);
+        if (!pszBasedirectory)
+            return VERR_NO_STR_MEMORY;
         RTPathStripFilename(pszBasedirectory);
-        char *pszFullname;
-        rc = RTStrAPrintf(&pszFullname, "%s%c%s", pszBasedirectory,
-                          RTPATH_SLASH, pExtent->pszBasename);
+        char *pszFullname = RTPathJoinA(pszBasedirectory, pExtent->pszBasename);
         RTStrFree(pszBasedirectory);
-        if (RT_FAILURE(rc))
-            return rc;
+        if (!pszFullname)
+            return VERR_NO_STR_MEMORY;
         pExtent->pszFullname = pszFullname;
 
@@ -4110 +4106 @@
     char *pszBasedirectory = RTStrDup(pImage->pszFilename);
     RTPathStripFilename(pszBasedirectory);
-    char *pszFullname;
-    rc = RTStrAPrintf(&pszFullname, "%s%c%s", pszBasedirectory,
-                      RTPATH_SLASH, pExtent->pszBasename);
+    char *pszFullname = RTPathJoinA(pszBasedirectory, pExtent->pszBasename);
     RTStrFree(pszBasedirectory);
-    if (RT_FAILURE(rc))
-        return rc;
+    if (!pszFullname)
+        return VERR_NO_STR_MEMORY;
     pExtent->pszFullname = pszFullname;