Changeset 69753 in vbox for trunk/src/VBox/Main/src-all

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.)

File:

• trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp

@@ -1965 +1965 @@
      */
     HRESULT hrc = S_OK;
-    PRTDIR pDir;
-    int vrc = RTDirOpen(&pDir, szBaseDir);
+    RTDIR   hDir;
+    int vrc = RTDirOpen(&hDir, szBaseDir);
     if (RT_SUCCESS(vrc))
     {
@@ -1972 +1972 @@
         {
             RTDIRENTRYEX Entry;
-            vrc = RTDirReadEx(pDir, &Entry, NULL /*pcbDirEntry*/, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
+            vrc = RTDirReadEx(hDir, &Entry, NULL /*pcbDirEntry*/, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
             if (RT_FAILURE(vrc))
             {
@@ -2013 +2013 @@
             }
         }
-        RTDirClose(pDir);
+        RTDirClose(hDir);
     }
     /* else: ignore, the directory probably does not exist or something. */
@@ -2541 +2541 @@
         if (!fExists)
         {
-            PRTDIR pDir;
-            vrc = RTDirOpen(&pDir, m->strBaseDir.c_str());
+            RTDIR hDir;
+            vrc = RTDirOpen(&hDir, m->strBaseDir.c_str());
             if (RT_SUCCESS(vrc))
             {
@@ -2548 +2548 @@
                 for (;;)
                 {
-                    vrc = RTDirReadEx(pDir, &Entry, NULL /*pcbDirEntry*/, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
+                    vrc = RTDirReadEx(hDir, &Entry, NULL /*pcbDirEntry*/, RTFSOBJATTRADD_NOTHING, RTPATH_F_ON_LINK);
                     if (RT_FAILURE(vrc))
                     {
@@ -2562 +2562 @@
                          */
                         vrc = RTPathJoin(szDir, sizeof(szDir), m->strBaseDir.c_str(), Entry.szName); /* not really necessary */
-                        AssertLogRelRCReturnStmt(vrc, RTDirClose(pDir), E_UNEXPECTED);
+                        AssertLogRelRCReturnStmt(vrc, RTDirClose(hDir), E_UNEXPECTED);
                         a_pszName = Entry.szName;
                         fExists   = true;
@@ -2568 +2568 @@
                     }
                 }
-                RTDirClose(pDir);
+                RTDirClose(hDir);
             }
         }