Changeset 23634 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Oct 9, 2009 7:54:09 AM (15 years ago)

Author:

vboxsync

Message:

VBoxService: No need for RTStrCurrentCPToUtf8() anymore.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceExec.cpp (modified) (3 diffs)
• VBoxServiceUtils.cpp (modified) (1 diff)

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

@@ -139 +139 @@
     *ppszValue = NULL;
 
-    char *pszPropNameUTF8;
-    rc = RTStrCurrentCPToUtf8(&pszPropNameUTF8, pszPropName);
-    if (RT_FAILURE(rc))
-    {
-        VBoxServiceError("Exec: Failed to convert property name \"%s\" to UTF-8!\n", pszPropName);
-        return rc;
-    }
-
     for (unsigned cTries = 0; cTries < 10; cTries++)
     {
@@ -163 +155 @@
         char    *pszFlags;
         uint64_t uTimestamp;
-        rc = VbglR3GuestPropRead(g_uExecGuestPropSvcClientID, pszPropNameUTF8,
+        rc = VbglR3GuestPropRead(g_uExecGuestPropSvcClientID, pszPropName,
                                  pvBuf, cbBuf,
                                  &pszValue, &uTimestamp, &pszFlags, NULL);
@@ -208 +200 @@
     }
     RTMemFree(pvBuf);
-    RTStrFree(pszPropNameUTF8);
     return rc;
 }

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

@@ -39 +39 @@
 int VBoxServiceWritePropF(uint32_t u32ClientId, const char *pszName, const char *pszValueFormat, ...)
 {
-    char *pszNameUTF8;
-    int rc = RTStrCurrentCPToUtf8(&pszNameUTF8, pszName);
-    if (RT_SUCCESS(rc))
+    int rc;
+    if (pszValueFormat != NULL)
     {
-        if (pszValueFormat != NULL)
-        {
-            VBoxServiceVerbose(3, "Writing guest property \"%s\"\n", pszNameUTF8);
-            va_list va;
-            va_start(va, pszValueFormat);
-            rc = VbglR3GuestPropWriteValueV(u32ClientId, pszNameUTF8, pszValueFormat, va);
-            va_end(va);
-            if (RT_FAILURE(rc))
-                 VBoxServiceError("Error writing guest property \"%s\" (rc=%Rrc)\n", pszNameUTF8, rc);
-        }
-        else
-            rc = VbglR3GuestPropWriteValue(u32ClientId, pszNameUTF8, NULL);
-        RTStrFree(pszNameUTF8);
+        VBoxServiceVerbose(3, "Writing guest property \"%s\"\n", pszName);
+        va_list va;
+        va_start(va, pszValueFormat);
+        rc = VbglR3GuestPropWriteValueV(u32ClientId, pszName, pszValueFormat, va);
+        va_end(va);
+        if (RT_FAILURE(rc))
+             VBoxServiceError("Error writing guest property \"%s\" (rc=%Rrc)\n", pszName, rc);
     }
+    else
+        rc = VbglR3GuestPropWriteValue(u32ClientId, pszName, NULL);
     return rc;
 }