Changeset 21436 in vbox for trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

Timestamp:

Jul 9, 2009 12:24:28 PM (15 years ago)

Author:

vboxsync

Message:

Main: make HostHardwareLinux use MiniString instead of std::string; add exception handling to HostImpl bits

File:

• trunk/src/VBox/Main/linux/HostHardwareLinux.cpp (modified) (11 diffs)

trunk/src/VBox/Main/linux/HostHardwareLinux.cpp

@@ -54 +54 @@
 # include <errno.h>
 #endif /* RT_OS_LINUX */
-#include <string>
 #include <vector>
 
@@ -94 +93 @@
                                            const char *pszKey,
                                            const char *pszValue,
-                                           std::vector<std::string> *pMatches);
+                                           std::vector<iprt::MiniString> *pMatches);
 */
 static int halGetPropertyStrings (DBusConnection *pConnection,
@@ -104 +103 @@
                                         const char *pszUdi, size_t cProps,
                                         const char **papszKeys,
-                                        std::vector<std::string> *pMatches,
+                                        std::vector<iprt::MiniString> *pMatches,
                                         bool *pfMatches, bool *pfSuccess);
 */
@@ -111 +110 @@
 static int getUSBDeviceInfoFromHal(USBDeviceInfoList *pList, bool *pfSuccess);
 static int getOldUSBDeviceInfoFromHal(USBDeviceInfoList *pList, bool *pfSuccess);
-static int getUSBInterfacesFromHal(std::vector <std::string> *pList,
+static int getUSBInterfacesFromHal(std::vector <iprt::MiniString> *pList,
                                    const char *pcszUdi, bool *pfSuccess);
 static DBusHandlerResult dbusFilterFunction (DBusConnection *pConnection,
@@ -814 +813 @@
 /**
  * Find the UDIs of hal entries that contain Key=Value property and return the
- * result on the end of a vector of std::string.
+ * result on the end of a vector of iprt::MiniString.
  * @returns iprt status code.  If a non-fatal error occurs, we return success
  *          but set *pfSuccess to false.
@@ -820 +819 @@
  * @param   pszKey      the property key
  * @param   pszValue    the property value
- * @param   pMatches    pointer to an array of std::string to append the
+ * @param   pMatches    pointer to an array of iprt::MiniString to append the
  *                      results to.  NOT optional.
  * @param   pfSuccess   will be set to true if the operation succeeds
@@ -827 +826 @@
 int halFindDeviceStringMatchVector (DBusConnection *pConnection,
                                     const char *pszKey, const char *pszValue,
-                                    std::vector<std::string> *pMatches,
+                                    std::vector<iprt::MiniString> *pMatches,
                                     bool *pfSuccess)
 {
@@ -985 +984 @@
  * @param   cProps       the number of property values to look up
  * @param   papszKeys    the keys of the properties to be looked up
- * @param   pMatches     pointer to an empty array of std::string to append the
+ * @param   pMatches     pointer to an empty array of iprt::MiniString to append the
  *                       results to.  NOT optional.
  * @param   pfMatches    pointer to an array of boolean values indicating
@@ -997 +996 @@
                                  const char *pszUdi, size_t cProps,
                                  const char **papszKeys,
-                                 std::vector<std::string> *pMatches,
+                                 std::vector<iprt::MiniString> *pMatches,
                                  bool *pfMatches, bool *pfSuccess)
 {
@@ -1070 +1069 @@
     DBusMessageIter iterFind, iterUdis;
 
-    rc = halInit (&dbusConnection);
-    if (!dbusConnection)
-        halSuccess = false;
-    if (halSuccess && RT_SUCCESS (rc))
-    {
-        rc = halFindDeviceStringMatch (dbusConnection.get(), "storage.drive_type",
-                                       isDVD ? "cdrom" : "floppy", &replyFind);
-        if (!replyFind)
+    try
+    {
+        rc = halInit (&dbusConnection);
+        if (!dbusConnection)
             halSuccess = false;
-    }
-    if (halSuccess && RT_SUCCESS (rc))
-    {
-        dbus_message_iter_init (replyFind.get(), &iterFind);
-        if (dbus_message_iter_get_arg_type (&iterFind) != DBUS_TYPE_ARRAY)
-            halSuccess = false;
-    }
-    if (halSuccess && RT_SUCCESS (rc))
-        dbus_message_iter_recurse (&iterFind, &iterUdis);
-    for (;    halSuccess && RT_SUCCESS (rc)
-           && dbus_message_iter_get_arg_type (&iterUdis) == DBUS_TYPE_STRING;
-         dbus_message_iter_next(&iterUdis))
-    {
-        /* Now get all properties from the iterator */
-        const char *pszUdi;
-        dbus_message_iter_get_basic (&iterUdis, &pszUdi);
-        static const char *papszKeys[] =
-                { "block.device", "info.product", "info.vendor" };
-        char *papszValues[RT_ELEMENTS (papszKeys)];
-        rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys),
-                                    papszKeys, papszValues, &replyGet);
-        std::string description;
-        const char *pszDevice = papszValues[0], *pszProduct = papszValues[1],
-                   *pszVendor = papszValues[2];
-        if (!!replyGet && pszDevice == NULL)
-            halSuccess = false;
-        if (!!replyGet && pszDevice != NULL)
-        {
-            if ((pszVendor != NULL) && (pszVendor[0] != '\0'))
-                (description += pszVendor) += " ";
-            if ((pszProduct != NULL && pszProduct[0] != '\0'))
-                description += pszProduct;
-            try
+        if (halSuccess && RT_SUCCESS (rc))
+        {
+            rc = halFindDeviceStringMatch (dbusConnection.get(), "storage.drive_type",
+                                        isDVD ? "cdrom" : "floppy", &replyFind);
+            if (!replyFind)
+                halSuccess = false;
+        }
+        if (halSuccess && RT_SUCCESS (rc))
+        {
+            dbus_message_iter_init (replyFind.get(), &iterFind);
+            if (dbus_message_iter_get_arg_type (&iterFind) != DBUS_TYPE_ARRAY)
+                halSuccess = false;
+        }
+        if (halSuccess && RT_SUCCESS (rc))
+            dbus_message_iter_recurse (&iterFind, &iterUdis);
+        for (;    halSuccess && RT_SUCCESS (rc)
+            && dbus_message_iter_get_arg_type (&iterUdis) == DBUS_TYPE_STRING;
+            dbus_message_iter_next(&iterUdis))
+        {
+            /* Now get all properties from the iterator */
+            const char *pszUdi;
+            dbus_message_iter_get_basic (&iterUdis, &pszUdi);
+            static const char *papszKeys[] =
+                    { "block.device", "info.product", "info.vendor" };
+            char *papszValues[RT_ELEMENTS (papszKeys)];
+            rc = halGetPropertyStrings (dbusConnection.get(), pszUdi, RT_ELEMENTS (papszKeys),
+                                        papszKeys, papszValues, &replyGet);
+            iprt::MiniString description;
+            const char *pszDevice = papszValues[0], *pszProduct = papszValues[1],
+                    *pszVendor = papszValues[2];
+            if (!!replyGet && pszDevice == NULL)
+                halSuccess = false;
+            if (!!replyGet && pszDevice != NULL)
             {
+                if ((pszVendor != NULL) && (pszVendor[0] != '\0'))
+                {
+                    description.append(pszVendor);
+                    description.append(" ");
+                }
+                if ((pszProduct != NULL && pszProduct[0] != '\0'))
+                    description.append(pszProduct);
                 pList->push_back (DriveInfo (pszDevice, pszUdi, description));
             }
-            catch(std::bad_alloc &e)
-            {
-                rc = VERR_NO_MEMORY;
-            }
-        }
-    }
-    if (dbusError.HasName (DBUS_ERROR_NO_MEMORY))
+        }
+        if (dbusError.HasName (DBUS_ERROR_NO_MEMORY))
+            rc = VERR_NO_MEMORY;
+        if (pfSuccess != NULL)
+            *pfSuccess = halSuccess;
+    }
+    catch(std::bad_alloc &e)
+    {
         rc = VERR_NO_MEMORY;
-    if (pfSuccess != NULL)
-        *pfSuccess = halSuccess;
+    }
     LogFlow (("rc=%Rrc, halSuccess=%d\n", rc, halSuccess));
     dbusError.FlowLog();
@@ -1315 +1317 @@
  */
 /* static */
-int getUSBInterfacesFromHal(std::vector <std::string> *pList,
+int getUSBInterfacesFromHal(std::vector<iprt::MiniString> *pList,
                             const char *pcszUdi, bool *pfSuccess)
 {