Changeset 73218 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 18, 2018 4:19:08 PM (7 years ago)

Author:

vboxsync

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

123823

Message:

CloudUserProfileManager::getProfilesByProvider: Use IPRT for building paths correctly. Pointed out a whole bunch of error code blunders.

Location:

trunk/src/VBox/Main/src-server

Files:

• CloudUserProfileListImpl.cpp (modified) (8 diffs)
• CloudUserProfileManagerImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/CloudUserProfileListImpl.cpp

@@ -149 +149 @@
     HRESULT hrc = S_OK;
     if (aSectionName.isEmpty())
-        hrc = VERR_INVALID_PARAMETER;
+        hrc = VERR_INVALID_PARAMETER; /** @todo r=bird: You're mixing error codes... */
     else
         mSections.insert(make_pair(aSectionName, section));
@@ -408 +408 @@
             if (FAILED(hrc))
             {
-                throw hrc;
+                throw hrc; /** @todo r=bird: WTF? Try return it! */
             }
             LogRel(("Successfully parsed %d profiles\n", mpProfiles->getNumberOfSections()));
@@ -416 +416 @@
     {
         LogRel(("Empty path to config file\n"));
-        hrc = VERR_INVALID_PARAMETER;
+        hrc = VERR_INVALID_PARAMETER; /** @todo r=bird: You're mixing error codes... */
     }
 
@@ -464 +464 @@
     }
     else
-        hrc = VERR_NOT_FOUND;
+        hrc = VERR_NOT_FOUND; /** @todo r=bird: You're mixing error codes... */
 
     return hrc;
@@ -474 +474 @@
     aProfilesNames = mpProfiles->getSectionsNames();
     if (aProfilesNames.empty())
-        hrc = VERR_NOT_FOUND;
+        hrc = VERR_NOT_FOUND; /** @todo r=bird: You're mixing error codes... */
 
     return hrc;
@@ -503 +503 @@
     }
     else
-        hrc = VERR_NOT_FOUND;
+        hrc = VERR_NOT_FOUND; /** @todo r=bird: You're mixing error codes... */
 
     return hrc;
@@ -545 +545 @@
         hrc = mpProfiles->updateSection(aProfileName, aProfile);
     else
-        hrc = VERR_NOT_FOUND;
+        hrc = VERR_NOT_FOUND; /** @todo r=bird: You're mixing error codes... */
 
     return hrc;
@@ -572 +572 @@
         aProfile = reqProfile;
     else
-        hrc = VERR_NOT_FOUND;
-
-    return hrc;
-}
-
+        hrc = VERR_NOT_FOUND; /** @todo r=bird: You're mixing error codes... */
+
+    return hrc;
+}
+

trunk/src/VBox/Main/src-server/CloudUserProfileManagerImpl.cpp

@@ -128 +128 @@
                 if (SUCCEEDED(hrc))
                 {
-                    char szHomeDir[RTPATH_MAX];
-                    int vrc = RTPathUserHome(szHomeDir, sizeof(szHomeDir));
+                    char szOciConfigPath[RTPATH_MAX];
+                    int vrc = RTPathUserHome(szOciConfigPath, sizeof(szOciConfigPath));
+                    if (RT_SUCCESS(vrc))
+                        vrc = RTPathAppend(szOciConfigPath, sizeof(szOciConfigPath), ".oci" RTPATH_SLASH_STR "config");
                     if (RT_SUCCESS(vrc))
                     {
-                        Utf8Str strConfigPath(szHomeDir);
-                        strConfigPath.append(RTPATH_SLASH_STR)
-                                     .append(".oci")
-                                     .append(RTPATH_SLASH_STR)
-                                     .append("config");
-                        LogRel(("config = %s\n", strConfigPath.c_str()));
-                        if (RTFileExists(strConfigPath.c_str()))
+                        LogRel(("config = %s\n", szOciConfigPath));
+                        if (RTFileExists(szOciConfigPath))
                         {
-                            hrc = ptrOCIUserProfileList->readProfiles(strConfigPath);
+                            hrc = ptrOCIUserProfileList->readProfiles(szOciConfigPath);
                             if (SUCCEEDED(hrc))
-                            {
-                                LogRel(("Reading profiles from %s has been done\n", strConfigPath.c_str()));
-                            }
+                                LogRel(("Reading profiles from %s has been done\n", szOciConfigPath));
                             else
-                            {
-                                LogRel(("Reading profiles from %s hasn't been done\n", strConfigPath.c_str()));
-                            }
+                                LogRel(("Reading profiles from %s hasn't been done\n", szOciConfigPath));
 
                             ptrCloudUserProfileList = ptrOCIUserProfileList;
@@ -154 +147 @@
                         }
                         else
-                        {
-                            hrc = setError(VERR_FILE_NOT_FOUND, tr("Could not locate the config file '%s'"),
-                                           strConfigPath.c_str());
-                        }
+                            /** @todo r=bird: You are constantly mixing up status codes.
+                             * VERR_FILE_NOT_FOUND, VERR_INVALID_PARAMETER and VERR_NOT_FOUND are all VBox
+                             * status codes.  They don't work for HRESULT types, because that's for
+                             * COM/XPCOM status codes.   Here you should use setErrorBoth or setErrorVrc. */
+                            hrc = setError(VERR_FILE_NOT_FOUND, tr("Could not locate the config file '%s'"), szOciConfigPath);
                     }
                     else