Changeset 32469 in vbox

Timestamp:

Sep 14, 2010 10:01:17 AM (14 years ago)

Author:

vboxsync

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

65842

Message:

Main/USB/linux: minor fixes to USBGetDevides

Location:

trunk/src/VBox/Main

Files:

• include/USBGetDevices.h (modified) (2 diffs)
• linux/USBGetDevices.cpp (modified) (2 diffs)

trunk/src/VBox/Main/include/USBGetDevices.h

@@ -57 +57 @@
 
 /**
+ * Free a linked list of USB devices created by the Linux enumeration code.
+ * @param  pHead  Pointer to the first device in the linked list
+ */
+static inline void deviceListFree(PUSBDEVICE *ppHead)
+{
+    PUSBDEVICE pHead, pNext;
+    pHead = *ppHead;
+    while (pHead)
+    {
+        pNext = pHead->pNext;
+        deviceFree(pHead);
+        pHead = pNext;
+    }
+    *ppHead = NULL;
+}
+
+RT_C_DECLS_BEGIN
+
+/**
  * Check whether @a pcszDevices is a valid usbfs devices file for checking
  * whether usbfs is supported or not.
@@ -73 +92 @@
 extern PUSBDEVICE USBProxyLinuxGetDevices(const char *pcszUsbfsRoot);
 
+RT_C_DECLS_END
+
 #endif /* ___USBGetDevices_h */

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

@@ -536 +536 @@
 {
     PUSBDEVICE pFirst = NULL;
-    FILE *pFile;
+    FILE *pFile = NULL;
     int rc;
     rc = openDevicesFile(pcszUsbfsRoot, &pFile);
@@ -1379 +1379 @@
     }
     if (RT_FAILURE(rc))
-        while (pFirst)
-        {
-            PUSBDEVICE pNext = pFirst->pNext;
-            deviceFree(pFirst);
-            pFirst = pNext;
-        }
+        deviceListFree(&pFirst);
 
     VEC_CLEANUP_OBJ(&vecDevInfo);