Changeset 15809 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Jan 5, 2009 3:49:05 PM (16 years ago)

Author:

vboxsync

Message:

iprt: style.

File:

• trunk/src/VBox/Runtime/r3/win/path-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/win/path-win.cpp

@@ -122 +122 @@
     rc = GetFullPathNameW(pwszPath, RT_ELEMENTS(wsz), &wsz[0], &pwszFile);
     if (rc > 0 && rc < RT_ELEMENTS(wsz))
-        rc = RTUtf16ToUtf8Ex(&wsz[0], RTSTR_MAX, &pszAbsPath, cchAbsPath, NULL);
+    {
+        size_t cch;
+        rc = RTUtf16ToUtf8Ex(&wsz[0], RTSTR_MAX, &pszAbsPath, cchAbsPath, &cch);
+        if (RT_SUCCESS(rc))
+        {
+            /*
+             * Remove trailing slash if the path may be pointing to a directory.
+             * (See posix variant.)
+             */
+            if (    cch > 1
+                &&  RTPATH_IS_SLASH(pszAbsPath[cch - 1])
+                &&  !RTPATH_IS_VOLSEP(pszAbsPath[cch - 2])
+                &&  !RTPATH_IS_SLASH(pszAbsPath[cch - 2]))
+                pszAbsPath[cch - 1] = '\0';
+        }
+    }
     else if (rc <= 0)
         rc = RTErrConvertFromWin32(GetLastError());
@@ -129 +144 @@
 
     RTUtf16Free(pwszPath);
-
-    if (RT_SUCCESS(rc))
-    {
-        /*
-         * Remove trailing slash if the path may be pointing to a directory.
-         */
-        size_t cch = strlen(pszAbsPath);
-        if (    cch > 1
-            &&  RTPATH_IS_SLASH(pszAbsPath[cch - 1])
-            &&  !RTPATH_IS_VOLSEP(pszAbsPath[cch - 2])
-            &&  !RTPATH_IS_SLASH(pszAbsPath[cch - 2]))
-            pszAbsPath[cch - 1] = '\0';
-    }
-
     return rc;
 }