Changeset 35191 in vbox for trunk/src/VBox/Runtime

Timestamp:

Dec 16, 2010 3:25:20 PM (14 years ago)

Author:

vboxsync

Message:

Some cleanup. Pass RTLDRLOAD_FLAGS_LOCAL instead of 0, since it's defined.

Location:

trunk/src/VBox/Runtime

Files:

• common/ldr/ldrNative.cpp (modified) (2 diffs)
• r3/posix/ldrNative-posix.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/common/ldr/ldrNative.cpp

@@ -96 +96 @@
 RTDECL(int) RTLdrLoad(const char *pszFilename, PRTLDRMOD phLdrMod)
 {
-    return RTLdrLoadEx(pszFilename, phLdrMod, 0 /*fFlags*/, NULL);
+    return RTLdrLoadEx(pszFilename, phLdrMod, RTLDRLOAD_FLAGS_LOCAL, NULL);
 }
 RT_EXPORT_SYMBOL(RTLdrLoad);
@@ -111 +111 @@
     AssertPtrReturn(pszFilename, VERR_INVALID_POINTER);
     AssertPtrReturn(phLdrMod, VERR_INVALID_POINTER);
+    AssertReturn(!(fFlags & ~RTLDRLOAD_FLAGS_VALID_MASK), VERR_INVALID_PARAMETER);
 
     /*

trunk/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp

@@ -70 +70 @@
      */
     int fFlagsNative = RTLD_NOW;
-    if (fFlags & RTLDRFLAGS_GLOBAL)
+    if (fFlags & RTLDRLOAD_FLAGS_GLOBAL)
         fFlagsNative |= RTLD_GLOBAL;
     else