Changeset 69753 in vbox for trunk/src/VBox/Runtime/r3/linux

Timestamp:

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

Author:

vboxsync

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

119153

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/Runtime/r3/linux

Files:

• RTProcIsRunningByName-linux.cpp (modified) (2 diffs)
• krnlmod-linux.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp

@@ -54 +54 @@
      * Enumerate /proc.
      */
-    PRTDIR pDir;
-    int rc = RTDirOpen(&pDir, "/proc");
+    RTDIR hDir;
+    int rc = RTDirOpen(&hDir, "/proc");
     AssertMsgRCReturn(rc, ("RTDirOpen on /proc failed: rc=%Rrc\n", rc), false);
     if (RT_SUCCESS(rc))
     {
         RTDIRENTRY DirEntry;
-        while (RT_SUCCESS(RTDirRead(pDir, &DirEntry, NULL)))
+        while (RT_SUCCESS(RTDirRead(hDir, &DirEntry, NULL)))
         {
             /*
@@ -104 +104 @@
                     {
                         /* Found it! */
-                        RTDirClose(pDir);
+                        RTDirClose(hDir);
                         return true;
                     }

trunk/src/VBox/Runtime/r3/linux/krnlmod-linux.cpp

@@ -172 +172 @@
     uint32_t cKmodsLoaded = 0;
 
-    PRTDIR pDir = NULL;
-    int rc = RTDirOpen(&pDir, "/sys/module");
+    RTDIR hDir = NULL;
+    int rc = RTDirOpen(&hDir, "/sys/module");
     if (RT_SUCCESS(rc))
     {
         RTDIRENTRY DirEnt;
-        rc = RTDirRead(pDir, &DirEnt, NULL);
+        rc = RTDirRead(hDir, &DirEnt, NULL);
         while (RT_SUCCESS(rc))
         {
-            if (   RTStrCmp(DirEnt.szName, ".")
-                && RTStrCmp(DirEnt.szName, ".."))
+            if (!RTDirEntryIsStdDotLink(&DirEntry))
                 cKmodsLoaded++;
-            rc = RTDirRead(pDir, &DirEnt, NULL);
+            rc = RTDirRead(hDir, &DirEnt, NULL);
         }
 
-        RTDirClose(pDir);
+        RTDirClose(hDir);
     }
 
@@ -207 +206 @@
     }
 
-    PRTDIR pDir = NULL;
+    RTDIR hDir = NULL;
     int rc = RTDirOpen(&pDir, "/sys/module");
     if (RT_SUCCESS(rc))
@@ -214 +213 @@
         RTDIRENTRY DirEnt;
 
-        rc = RTDirRead(pDir, &DirEnt, NULL);
+        rc = RTDirRead(hDir, &DirEnt, NULL);
         while (RT_SUCCESS(rc))
         {
-            if (   RTStrCmp(DirEnt.szName, ".")
-                && RTStrCmp(DirEnt.szName, ".."))
+            if (!RTDirEntryIsStdDotLink(&DirEnt))
             {
                 rc = rtKrnlModLinuxInfoCreate(DirEnt.szName, &pahKrnlModInfo[idxKrnlModInfo]);
@@ -226 +224 @@
 
             if (RT_SUCCESS(rc))
-                rc = RTDirRead(pDir, &DirEnt, NULL);
+                rc = RTDirRead(hDir, &DirEnt, NULL);
         }
 
@@ -241 +239 @@
             *pcEntries = cKmodsLoaded;
 
-        RTDirClose(pDir);
+        RTDirClose(hDir);
     }