Changeset 69753 in vbox for trunk/src/VBox/Runtime/include

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/include/internal

Files:

• dir.h (modified) (7 diffs)
• magics.h (modified) (1 diff)

trunk/src/VBox/Runtime/include/internal/dir.h

@@ -33 +33 @@
 
 
+/** Pointer to the data behind an open directory handle. */
+typedef struct RTDIRINTERNAL *PRTDIRINTERNAL;
+
 /**
  * Filter a the filename in the against a filter.
@@ -41 +44 @@
  * @param   pszName     The path to match to the filter.
  */
-typedef DECLCALLBACK(bool) FNRTDIRFILTER(PRTDIR pDir, const char *pszName);
+typedef DECLCALLBACK(bool) FNRTDIRFILTER(PRTDIRINTERNAL pDir, const char *pszName);
 /** Pointer to a filter function. */
 typedef FNRTDIRFILTER *PFNRTDIRFILTER;
@@ -49 +52 @@
  * Open directory.
  */
-typedef struct RTDIR
+typedef struct RTDIRINTERNAL
 {
     /** Magic value, RTDIR_MAGIC. */
@@ -138 +141 @@
 # endif
 #endif
-} RTDIR;
+} RTDIRINTERNAL;
+
 
 
@@ -146 +150 @@
  * @returns false if valid after having bitched about it first.
  */
-DECLINLINE(bool) rtDirValidHandle(PRTDIR pDir)
+DECLINLINE(bool) rtDirValidHandle(PRTDIRINTERNAL pDir)
 {
     AssertMsgReturn(VALID_PTR(pDir), ("%p\n", pDir), false);
@@ -169 +173 @@
  *                              we're to use (consume) hRelativeDir.
  */
-int rtDirNativeOpen(PRTDIR pDir, char *pszPathBuf, uintptr_t hRelativeDir, void *pvNativeRelative);
+int rtDirNativeOpen(PRTDIRINTERNAL pDir, char *pszPathBuf, uintptr_t hRelativeDir, void *pvNativeRelative);
 
 /**
@@ -180 +184 @@
 
 
-DECLHIDDEN(int) rtDirOpenRelativeOrHandle(PRTDIR *ppDir, const char *pszRelativeAndFilter, RTDIRFILTER enmFilter, uint32_t fFlags,
-                                          uintptr_t hRelativeDir, void *pvNativeRelative);
+DECLHIDDEN(int) rtDirOpenRelativeOrHandle(RTDIR *phDir, const char *pszRelativeAndFilter, RTDIRFILTER enmFilter,
+                                          uint32_t fFlags, uintptr_t hRelativeDir, void *pvNativeRelative);
 
 #endif

trunk/src/VBox/Runtime/include/internal/magics.h

@@ -47 +47 @@
 /** Magic value for RTDBGKRNLINFOINT::u32Magic. (John Carmack) */
 #define RTDBGKRNLINFO_MAGIC             UINT32_C(0x19700820)
-/** The value of RTDIR::u32Magic. (Michael Ende) */
+/** The value of RTDIRINTERNAL::u32Magic. (Michael Ende) */
 #define RTDIR_MAGIC                     UINT32_C(0x19291112)
-/** The value of RTDIR::u32Magic after RTDirClose().  */
+/** The value of RTDIRINTERNAL::u32Magic after RTDirClose().  */
 #define RTDIR_MAGIC_DEAD                UINT32_C(0x19950829)
 /** The value of RTDVMINTERNAL::u32Magic. (Dan Brown) */