Changeset 49040 in vbox for trunk/src/VBox/Runtime/common/ldr

Timestamp:

Oct 10, 2013 6:36:15 PM (11 years ago)

Author:

vboxsync

Message:

More ext -> suff corrections.

File:

• trunk/src/VBox/Runtime/common/ldr/ldrNative.cpp (modified) (6 diffs)

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

@@ -183 +183 @@
     *phLdrMod = NIL_RTLDRMOD;
     AssertPtrReturn(pszFilename, VERR_INVALID_PARAMETER);
-    AssertMsgReturn(!RTPathHavePath(pszFilename), ("%s\n", pszFilename), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(!RTPathHasPath(pszFilename), ("%s\n", pszFilename), VERR_INVALID_PARAMETER);
 
     /*
@@ -191 +191 @@
     AssertMsgReturn(cchFilename < (RTPATH_MAX / 4) * 3, ("%zu\n", cchFilename), VERR_INVALID_PARAMETER);
 
-    const char *pszExt = "";
-    if (!RTPathHaveExt(pszFilename))
-        pszExt = RTLdrGetSuff();
+    const char *pszSuffix = "";
+    if (!RTPathHasSuffix(pszFilename))
+        pszSuffix = RTLdrGetSuff();
 
     /*
      * Let the platform specific code do the rest.
      */
-    int rc = rtldrNativeLoadSystem(pszFilename, pszExt, fNoUnload ? RTLDRLOAD_FLAGS_NO_UNLOAD : 0, phLdrMod);
+    int rc = rtldrNativeLoadSystem(pszFilename, pszSuffix, fNoUnload ? RTLDRLOAD_FLAGS_NO_UNLOAD : 0, phLdrMod);
     LogFlow(("RTLdrLoadSystem: returns %Rrc\n", rc));
     return rc;
@@ -240 +240 @@
     *phLdrMod = NIL_RTLDRMOD;
     AssertPtrReturn(pszFilename, VERR_INVALID_PARAMETER);
-    AssertMsgReturn(!RTPathHavePath(pszFilename), ("%s\n", pszFilename), VERR_INVALID_PARAMETER);
+    AssertMsgReturn(!RTPathHasPath(pszFilename), ("%s\n", pszFilename), VERR_INVALID_PARAMETER);
 
     /*
@@ -248 +248 @@
     AssertMsgReturn(cchFilename < (RTPATH_MAX / 4) * 3, ("%zu\n", cchFilename), VERR_INVALID_PARAMETER);
 
-    const char *pszExt = "";
-    size_t cchExt = 0;
-    if (!RTPathHaveExt(pszFilename))
+    const char *pszSuffix = "";
+    size_t cchSuffix = 0;
+    if (!RTPathHasSuffix(pszFilename))
     {
-        pszExt = RTLdrGetSuff();
-        cchExt = strlen(pszExt);
+        pszSuffix = RTLdrGetSuff();
+        cchSuffix = strlen(pszSuffix);
     }
 
@@ -260 +260 @@
      */
     char szPath[RTPATH_MAX];
-    int rc = RTPathAppPrivateArch(szPath, sizeof(szPath) - 1 - cchExt - cchFilename);
+    int rc = RTPathAppPrivateArch(szPath, sizeof(szPath) - 1 - cchSuffix - cchFilename);
     AssertRCReturn(rc, rc);
 
@@ -267 +267 @@
     memcpy(psz, pszFilename, cchFilename);
     psz += cchFilename;
-    memcpy(psz, pszExt, cchExt + 1);
+    memcpy(psz, pszSuffix, cchSuffix + 1);
 
     if (!RTPathExists(szPath))