Changeset 74654 in vbox for trunk/src/VBox/Runtime/common/ldr/ldrVfsFile.cpp

Timestamp:

Oct 7, 2018 1:00:04 PM (6 years ago)

Author:

vboxsync

Message:

IPRT: More kStuff cleanup. bugref:9232

File:

• trunk/src/VBox/Runtime/common/ldr/ldrVfsFile.cpp (modified) (1 diff)

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

@@ -278 +278 @@
                                   PRTLDRMOD phLdrMod, uint32_t *poffError, PRTERRINFO pErrInfo)
 {
-#ifdef LDR_WITH_KLDR
-    LogFlow(("RTLdrOpenVfsChainkLdr: pszFilename=%p:{%s} fFlags=%#x enmArch=%d phLdrMod=%p\n",
-             pszFilename, pszFilename, fFlags, enmArch, phLdrMod));
-    AssertMsgReturn(!(fFlags & ~RTLDR_O_VALID_MASK), ("%#x\n", fFlags), VERR_INVALID_PARAMETER);
-
-    /*
-     * Create file reader & invoke worker which identifies and calls the image interpreter.
-     */
-    PRTLDRREADER pReader;
-    int rc = rtldrVfsFileCreate(pszFilename, &pReader, poffError, pErrInfo);
-    if (RT_SUCCESS(rc))
-    {
-        if (poffError)
-            *poffError = 0;
-        rc = rtldrkLdrOpen(pReader, fFlags, enmArch, phLdrMod, pErrInfo);
-        if (RT_SUCCESS(rc))
-        {
-            LogFlow(("RTLdrOpenkLdr: return %Rrc *phLdrMod=%p\n", rc, *phLdrMod));
-            return rc;
-        }
-        pReader->pfnDestroy(pReader);
-    }
-    *phLdrMod = NIL_RTLDRMOD;
-    LogFlow(("RTLdrOpenVfsChainkLdr: return %Rrc\n", rc));
-    return rc;
-
-#else
     return RTLdrOpenVfsChain(pszFilename, fFlags, enmArch, phLdrMod, poffError, pErrInfo);
-#endif
 }
 RT_EXPORT_SYMBOL(RTLdrOpenVfsChainkLdr);