Changeset 75986 in vbox

Timestamp:

Dec 5, 2018 5:40:31 PM (6 years ago)

Author:

vboxsync

Message:

GuestProperties: Another parameter that should be passed by reference rather than copy.

File:

• trunk/src/VBox/HostServices/GuestProperties/service.cpp (modified) (3 diffs)

trunk/src/VBox/HostServices/GuestProperties/service.cpp

@@ -430 +430 @@
     int getNotification(uint32_t u32ClientId, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int getOldNotificationInternal(const char *pszPattern, uint64_t nsTimestamp, Property *pProp);
-    int getNotificationWriteOut(uint32_t cParms, VBOXHGCMSVCPARM paParms[], Property prop);
+    int getNotificationWriteOut(uint32_t cParms, VBOXHGCMSVCPARM paParms[], Property const &prop);
     int doNotifications(const char *pszProperty, uint64_t nsTimestamp);
     int notifyHost(const char *pszName, const char *pszValue, uint64_t nsTimestamp, const char *pszFlags);
@@ -1079 +1079 @@
 
 /** Helper query used by getNotification */
-int Service::getNotificationWriteOut(uint32_t cParms, VBOXHGCMSVCPARM paParms[], Property prop)
+int Service::getNotificationWriteOut(uint32_t cParms, VBOXHGCMSVCPARM paParms[], Property const &rProp)
 {
     AssertReturn(cParms == 4, VERR_INVALID_PARAMETER); /* Basic sanity checking. */
@@ -1090 +1090 @@
     {
         char szFlags[GUEST_PROP_MAX_FLAGS_LEN];
-        rc = GuestPropWriteFlags(prop.mFlags, szFlags);
+        rc = GuestPropWriteFlags(rProp.mFlags, szFlags);
         if (RT_SUCCESS(rc))
         {
-            HGCMSvcSetU64(&paParms[1], prop.mTimestamp);
+            HGCMSvcSetU64(&paParms[1], rProp.mTimestamp);
 
             size_t const cbFlags  = strlen(szFlags) + 1;
-            size_t const cbName   = prop.mName.length() + 1;
-            size_t const cbValue  = prop.mValue.length() + 1;
+            size_t const cbName   = rProp.mName.length() + 1;
+            size_t const cbValue  = rProp.mValue.length() + 1;
             size_t const cbNeeded = cbName + cbValue + cbFlags;
             HGCMSvcSetU32(&paParms[3], (uint32_t)cbNeeded);
             if (cbNeeded <= cbBuf)
             {
-                memcpy(pchBuf, prop.mName.c_str(), cbName);
+                memcpy(pchBuf, rProp.mName.c_str(), cbName);
                 pchBuf += cbName;
-                memcpy(pchBuf, prop.mValue.c_str(), cbValue);
+                memcpy(pchBuf, rProp.mValue.c_str(), cbValue);
                 pchBuf += cbValue;
                 memcpy(pchBuf, szFlags, cbFlags);