Changeset 31925 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 24, 2010 1:39:38 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

65135

Message:

VBoxService/PropCache: Don't touch the properties flags/reset value when just updating the value. Now the interface should be consistent.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServicePropCache.cpp (modified) (3 diffs)
• VBoxServicePropCache.h (modified) (1 diff)

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

@@ -197 +197 @@
  */
 int VBoxServicePropCacheUpdate(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, const char *pszValueFormat, ...)
-{
-    char *pszValue = NULL;
-    int rc;
-    if (pszValueFormat)
-    {
-        va_list va;
-        va_start(va, pszValueFormat);
-        RTStrAPrintfV(&pszValue, pszValueFormat, va);
-        va_end(va);
-    }
-    rc = VBoxServicePropCacheUpdateEx(pCache, pszName, 0 /* Not used */, NULL /* Not used */, pszValue);
-    if (pszValue)
-        RTStrFree(pszValue);
-    return rc;
-}
-
-
-/**
- * Updates the local guest property cache and writes it to HGCM if outdated.
- *
- * @returns VBox status code.
- *
- * @param   pCache          The property cache.
- * @param   pszName         The property name.
- * @param   fFlags          The property flags to set.
- * @param   pszValueReset   The property reset value.
- * @param   pszValueFormat  The property format string.  If this is NULL then
- *                          the property will be deleted (if possible).
- * @param   ...             Format arguments.
- */
-int VBoxServicePropCacheUpdateEx(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, uint32_t fFlags,
-                                 const char *pszValueReset, const char *pszValueFormat, ...)
 {
     AssertPtr(pCache);
@@ -274 +242 @@
             {
                 /* Write the update. */
-                rc = vboxServicePropCacheWritePropF(pCache->uClientID, pNode->pszName, fFlags, pszValue);
+                rc = vboxServicePropCacheWritePropF(pCache->uClientID, pNode->pszName, pNode->fFlags, pszValue);
                 RTStrFree(pNode->pszValue);
                 pNode->pszValue = RTStrDup(pszValue);
@@ -296 +264 @@
         }
 
-        /* Update rest of the fields. */
-        if (pszValueReset)
-        {
-            if (pNode->pszValueReset)
-                RTStrFree(pNode->pszValueReset);
-            pNode->pszValueReset = RTStrDup(pszValueReset);
-        }
-        if (fFlags)
-            pNode->fFlags = fFlags;
-
         /* Release cache. */
-        int rc2 = RTCritSectLeave(&pCache->CritSect);
-        if (RT_SUCCESS(rc))
-            rc2 = rc;
+        RTCritSectLeave(&pCache->CritSect);
     }
 
     /* Delete temp stuff. */
     RTStrFree(pszValue);
-
     return rc;
 }

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.h

@@ -29 +29 @@
 int VBoxServicePropCacheUpdateEntry(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, uint32_t fFlags, const char *pszValueReset);
 int VBoxServicePropCacheUpdate(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, const char *pszValueFormat, ...);
-int VBoxServicePropCacheUpdateEx(PVBOXSERVICEVEPROPCACHE pCache, const char *pszName, uint32_t fFlags, const char *pszValueReset, const char *pszValueFormat, ...);
 int VBoxServicePropCacheUpdateByPath(PVBOXSERVICEVEPROPCACHE pCache, const char *pszValue, uint32_t fFlags, const char *pszPathFormat, ...);
 int VBoxServicePropCacheFlush(PVBOXSERVICEVEPROPCACHE pCache);