Changeset 22863 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Sep 9, 2009 11:54:27 AM (15 years ago)

Author:

vboxsync

Message:

VBoxServiceExec.cpp: r=bird: Constant strings are UTF-8, no need to convert them.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceExec.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceExec.cpp

@@ -140 +140 @@
     *ppszValue = NULL;
 
-    char *pszPropNameUtf8;
-    rc = RTStrCurrentCPToUtf8(&pszPropNameUtf8, pszPropName);
-    if (RT_FAILURE(rc))
-    {
-        VBoxServiceError("Exec: Failed to convert property name %s to UTF-8: %Rrc",
-                         pszPropName, rc);
-        return rc;
-    }
-
     for (unsigned cTries = 0; cTries < 10; cTries++)
     {
@@ -165 +156 @@
         char    *pszFlags;
         uint64_t uTimestamp;
-        rc = VbglR3GuestPropRead(g_uExecGuestPropSvcClientID, pszPropNameUtf8,
+        rc = VbglR3GuestPropRead(g_uExecGuestPropSvcClientID, pszPropName,
                                  pvBuf, cbBuf,
                                  &pszValue, &uTimestamp, &pszFlags, NULL);
@@ -211 +202 @@
 
     RTMemFree(pvBuf);
-    RTStrFree(pszPropNameUtf8);
     return rc;
 }
@@ -295 +285 @@
             /* add it */
             papszArgs[cUsed] = RTStrDupN(pszArgs, (uintptr_t)pszEnd - (uintptr_t)pszArgs);
-            if (!papszArgs[cUsed++])
+            if (!papszArgs[cUsed])
                 break;
+            cUsed++;
 
             /* advance */
@@ -408 +399 @@
                                      * Store the result in Set return value so the host knows what happend.
                                      */
-                                    char* pszValueUtf8;
-                                    rc = RTStrCurrentCPToUtf8(&pszValueUtf8, "/VirtualBox/HostGuest/SysprepRet");
+                                    rc = VbglR3GuestPropWriteValueF(g_uExecGuestPropSvcClientID,
+                                                                    "/VirtualBox/HostGuest/SysprepRet",
+                                                                    "%d", Status.iStatus);
                                     if (RT_FAILURE(rc))
-                                    {
-                                        VBoxServiceError("Exec: Failed to convert SysprepVBoxRC name to UTF-8: rc=%Rrc\n", rc);
-                                    }
-                                    else
-                                    {
-                                        rc = VbglR3GuestPropWriteValueF(g_uExecGuestPropSvcClientID,
-                                                                        pszValueUtf8,
-                                                                        "%d", Status.iStatus);
-                                        if (RT_FAILURE(rc))
-                                            VBoxServiceError("Exec: Failed to write SysprepRet: rc=%Rrc\n", rc);
-                                        RTStrFree(pszValueUtf8);
-                                    }
+                                        VBoxServiceError("Exec: Failed to write SysprepRet: rc=%Rrc\n", rc);
                                 }
                                 else
@@ -456 +437 @@
             {
                 VBoxServiceVerbose(1, "Exec: Stopping sysprep processing (rc=%Rrc)\n", rc);
-
-                char* pszValueUtf8;
-                rc = RTStrCurrentCPToUtf8(&pszValueUtf8, "/VirtualBox/HostGuest/SysprepVBoxRC");
+                rc = VbglR3GuestPropWriteValueF(g_uExecGuestPropSvcClientID, "/VirtualBox/HostGuest/SysprepVBoxRC", "%d", rc);
                 if (RT_FAILURE(rc))
-                {
-                    VBoxServiceError("Exec: Failed to convert SysprepVBoxRC name to UTF-8: rc=%Rrc\n", rc);
-                }
-                else 
-                {
-                    rc = VbglR3GuestPropWriteValueF(g_uExecGuestPropSvcClientID, pszValueUtf8, "%d", rc);
-                    if (RT_FAILURE(rc))
-                        VBoxServiceError("Exec: Failed to write SysprepVBoxRC: rc=%Rrc\n", rc);
-                    RTStrFree(pszValueUtf8);
-                }
+                    VBoxServiceError("Exec: Failed to write SysprepVBoxRC: rc=%Rrc\n", rc);
                 fSysprepDone = true;
             }
         }
+
 #ifdef FULL_FEATURED_EXEC
         1. Read the command - value, timestamp and flags.