Changeset 69753 in vbox for trunk/src/VBox/ValidationKit/utils/usb

Timestamp:

Nov 19, 2017 2:27:58 PM (7 years ago)

Author:

vboxsync

Message:

iprt/dir: Morphing PRTDIR into a handle named RTDIR. (Been wanting to correct this for years. Don't know why I makde it a pointer rather than an abstrct handle like everything else.)

Location:

trunk/src/VBox/ValidationKit/utils/usb

Files:

• UsbTest.cpp (modified) (9 diffs)
• UsbTestServicePlatform-linux.cpp (modified) (6 diffs)

trunk/src/VBox/ValidationKit/utils/usb/UsbTest.cpp

@@ -303 +303 @@
 #define USBTEST_USB_DEV_SYSFS "/sys/bus/usb/devices/"
 
-    PRTDIR pDirUsb = NULL;
-    int rc = RTDirOpen(&pDirUsb, USBTEST_USB_DEV_SYSFS);
+    RTDIR hDirUsb = NULL;
+    int rc = RTDirOpen(&hDirUsb, USBTEST_USB_DEV_SYSFS);
     if (RT_SUCCESS(rc))
     {
@@ -310 +310 @@
         {
             RTDIRENTRY DirUsbBus;
-            rc = RTDirRead(pDirUsb, &DirUsbBus, NULL);
+            rc = RTDirRead(hDirUsb, &DirUsbBus, NULL);
             if (   RT_SUCCESS(rc)
                 && RTStrNCmp(DirUsbBus.szName, "usb", 3)
@@ -368 +368 @@
             rc = VINF_SUCCESS;
 
-        RTDirClose(pDirUsb);
+        RTDirClose(hDirUsb);
     }
 
@@ -390 +390 @@
     char *pszDevPath = NULL;
 
-    PRTDIR pDirUsb = NULL;
-    int rc = RTDirOpen(&pDirUsb, "/dev/bus/usb");
+    RTDIR hDirUsb = NULL;
+    int rc = RTDirOpen(&hDirUsb, "/dev/bus/usb");
     if (RT_SUCCESS(rc))
     {
@@ -397 +397 @@
         {
             RTDIRENTRY DirUsbBus;
-            rc = RTDirRead(pDirUsb, &DirUsbBus, NULL);
+            rc = RTDirRead(hDirUsb, &DirUsbBus, NULL);
             if (RT_SUCCESS(rc))
             {
@@ -403 +403 @@
                 RTStrPrintf(&aszPath[0], RT_ELEMENTS(aszPath), "/dev/bus/usb/%s", DirUsbBus.szName);
 
-                PRTDIR pDirUsbBus = NULL;
-                rc = RTDirOpen(&pDirUsbBus, &aszPath[0]);
+                RTDIR hDirUsbBus = NULL;
+                rc = RTDirOpen(&hDirUsbBus, &aszPath[0]);
                 if (RT_SUCCESS(rc))
                 {
@@ -410 +410 @@
                     {
                         RTDIRENTRY DirUsbDev;
-                        rc = RTDirRead(pDirUsbBus, &DirUsbDev, NULL);
+                        rc = RTDirRead(hDirUsbBus, &DirUsbDev, NULL);
                         if (RT_SUCCESS(rc))
                         {
@@ -441 +441 @@
 
                     rc = VINF_SUCCESS;
-                    RTDirClose(pDirUsbBus);
+                    RTDirClose(hDirUsbBus);
                 }
             }
@@ -449 +449 @@
                  && !pszDevPath);
 
-        RTDirClose(pDirUsb);
+        RTDirClose(hDirUsb);
     }
 

trunk/src/VBox/ValidationKit/utils/usb/UsbTestServicePlatform-linux.cpp

@@ -125 +125 @@
         return VERR_BUFFER_OVERFLOW;
 
-    PRTDIR pDir = NULL;
-    rc = RTDirOpenFiltered(&pDir, aszPath, RTDIRFILTER_WINNT, 0 /*fFlags*/);
+    RTDIR hDir = NULL;
+    rc = RTDirOpenFiltered(&hDir, aszPath, RTDIRFILTER_WINNT, 0 /*fFlags*/);
     if (RT_SUCCESS(rc))
     {
@@ -132 +132 @@
         {
             RTDIRENTRY DirFolderContent;
-            rc = RTDirRead(pDir, &DirFolderContent, NULL);
+            rc = RTDirRead(hDir, &DirFolderContent, NULL);
             if (RT_SUCCESS(rc))
             {
@@ -182 +182 @@
             rc = VINF_SUCCESS;
 
-        RTDirClose(pDir);
+        RTDirClose(hDir);
     }
 
@@ -205 +205 @@
 
     /* Enumerate the available HCD and their bus numbers. */
-    PRTDIR pDir = NULL;
-    int rc = RTDirOpenFiltered(&pDir, aszPath, RTDIRFILTER_WINNT, 0 /*fFlags*/);
+    RTDIR hDir = NULL;
+    int rc = RTDirOpenFiltered(&hDir, aszPath, RTDIRFILTER_WINNT, 0 /*fFlags*/);
     if (RT_SUCCESS(rc))
     {
@@ -215 +215 @@
         {
             RTDIRENTRY DirFolderContent;
-            rc = RTDirRead(pDir, &DirFolderContent, NULL);
+            rc = RTDirRead(hDir, &DirFolderContent, NULL);
             if (RT_SUCCESS(rc))
             {
@@ -270 +270 @@
             rc = VINF_SUCCESS;
 
-        RTDirClose(pDir);
+        RTDirClose(hDir);
     }