Changeset 69753 in vbox for trunk/src/VBox/Frontends/VBoxBugReport

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/Frontends/VBoxBugReport/VBoxBugReport.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxBugReport/VBoxBugReport.cpp

@@ -120 +120 @@
 {
 public:
-    VBRDir(const char *pcszPath)
-        {
-            int rc = RTDirOpenFiltered(&m_pDir, pcszPath, RTDIRFILTER_WINNT, 0);
-            if (RT_FAILURE(rc))
-                throw RTCError(com::Utf8StrFmt("Failed to open directory '%s'\n", pcszPath));
-        };
+    VBRDir(const char *pcszPath) : m_hDir(NIL_RTDIR)
+    {
+        int rc = RTDirOpenFiltered(&m_hDir, pcszPath, RTDIRFILTER_WINNT, 0);
+        if (RT_FAILURE(rc))
+            throw RTCError(com::Utf8StrFmt("Failed to open directory '%s'\n", pcszPath));
+    };
     ~VBRDir()
-        {
-            int rc = RTDirClose(m_pDir);
-            AssertRC(rc);
-        };
+    {
+        int rc = RTDirClose(m_hDir);
+        AssertRC(rc);
+    };
     const char *next(void)
-        {
-            int rc = RTDirRead(m_pDir, &m_DirEntry, NULL);
-            if (RT_SUCCESS(rc))
-                return m_DirEntry.szName;
-            else if (rc == VERR_NO_MORE_FILES)
-                return NULL;
-            throw RTCError("Failed to read directory element\n");
-        };
+    {
+        int rc = RTDirRead(m_hDir, &m_DirEntry, NULL);
+        if (RT_SUCCESS(rc))
+            return m_DirEntry.szName;
+        if (rc == VERR_NO_MORE_FILES)
+            return NULL;
+        throw RTCError("Failed to read directory element\n");
+    };
 
 private:
-    PRTDIR m_pDir;
+    RTDIR m_hDir;
     RTDIRENTRY m_DirEntry;
 };