Changeset 31644 in vbox for trunk/src/VBox/Main/testcase

Timestamp:

Aug 13, 2010 12:47:07 PM (14 years ago)

Author:

vboxsync

Message:

Main/HostHardwareLinux: switch the stl vectors to a C implementation

File:

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

trunk/src/VBox/Main/testcase/tstHostHardwareLinux.cpp

@@ -92 +92 @@
 #ifdef VBOX_USB_WITH_SYSFS
     VBoxMainUSBDeviceInfo deviceInfo;
-    rc = deviceInfo.UpdateDevices();
+    AssertReturn(VBoxMainUSBDevInfoInit(&deviceInfo), 1);
+    rc = USBDevInfoUpdateDevices(&deviceInfo);
     if (RT_FAILURE(rc))
     {
@@ -100 +101 @@
     }
     RTPrintf ("Listing USB devices detected:\n");
-    for (USBDeviceInfoList::const_iterator it = deviceInfo.DevicesBegin();
-         it != deviceInfo.DevicesEnd(); ++it)
+    USBDeviceInfoList_iterator it;
+    USBDeviceInfoList_iter_init(&it, USBDevInfoBegin(&deviceInfo));
+    for (; !USBDeviceInfoList_iter_eq(&it, USBDevInfoEnd(&deviceInfo));
+           USBDeviceInfoList_iter_incr(&it))
     {
         char szProduct[1024];
+        USBDeviceInfo *pInfo = USBDeviceInfoList_iter_target(&it);
         if (RTLinuxSysFsReadStrFile(szProduct, sizeof(szProduct),
-                                    "%s/product", it->mSysfsPath.c_str()) == -1)
+                                    "%s/product", pInfo->mSysfsPath) == -1)
         {
             if (errno != ENOENT)
             {
                 RTPrintf ("Failed to get the product name for device %s: error %s\n",
-                          it->mDevice.c_str(), strerror(errno));
+                          pInfo->mDevice, strerror(errno));
                 return 1;
             }
@@ -116 +120 @@
                 szProduct[0] = '\0';
         }
-        RTPrintf ("  device: %s (%s), sysfs path: %s\n", szProduct, it->mDevice.c_str(),
-                  it->mSysfsPath.c_str());
+        RTPrintf ("  device: %s (%s), sysfs path: %s\n", szProduct, pInfo->mDevice,
+                  pInfo->mSysfsPath);
         RTPrintf ("    interfaces:\n");
-        for (USBInterfaceList::const_iterator it2 = it->mInterfaces.begin();
-             it2 != it->mInterfaces.end(); ++it2)
+        USBInterfaceList_iterator it2;
+        USBInterfaceList_iter_init(&it2, USBInterfaceList_begin(&pInfo->mInterfaces));
+        for (; !USBInterfaceList_iter_eq(&it2, USBInterfaceList_end(&pInfo->mInterfaces));
+               USBInterfaceList_iter_incr(&it2))
         {
             char szDriver[RTPATH_MAX];
+            char *pszIf = *USBInterfaceList_iter_target(&it2);
             strcpy(szDriver, "none");
             ssize_t size = RTLinuxSysFsGetLinkDest(szDriver, sizeof(szDriver),
-                                                   "%s/driver", it2->c_str());
+                                                   "%s/driver", pszIf);
             if (size == -1 && errno != ENOENT)
             {
                 RTPrintf ("Failed to get the driver for interface %s of device %s: error %s\n",
-                          it2->c_str(), it->mDevice.c_str(), strerror(errno));
+                          pszIf, pInfo->mDevice, strerror(errno));
                 return 1;
             }
-            if (RTLinuxSysFsExists("%s/driver", it2->c_str()) != (size != -1))
+            if (RTLinuxSysFsExists("%s/driver", pszIf) != (size != -1))
             {
                 RTPrintf ("RTLinuxSysFsExists did not return the expected value for the driver link of interface %s of device %s.\n",
-                          it2->c_str(), it->mDevice.c_str());
+                          pszIf, pInfo->mDevice);
                 return 1;
             }
             uint64_t u64InterfaceClass;
             u64InterfaceClass = RTLinuxSysFsReadIntFile(16, "%s/bInterfaceClass",
-                                                        it2->c_str());
+                                                        pszIf);
             RTPrintf ("      sysfs path: %s, driver: %s, interface class: 0x%x\n",
-                      it2->c_str(), szDriver, u64InterfaceClass);
+                      pszIf, szDriver, u64InterfaceClass);
         }
     }