Changeset 70090 in vbox for trunk/include/VBox

Timestamp:

Dec 12, 2017 5:53:44 PM (7 years ago)

Author:

vboxsync

Message:

Backed out r119634 + r119637 again.

File:

• trunk/include/VBox/HostServices/GuestPropertySvc.h (modified) (3 diffs)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -164 +164 @@
 /**
  * Write out flags to a string.
- *
  * @returns  IPRT status code
- * @param    fFlags    The flags to write out.
- * @param    pszFlags  Where to write the flags string.
- * @param    cbFlags   The size of the destination buffer (in bytes).
- */
-DECLINLINE(int) GuestPropWriteFlags(uint32_t fFlags, char* pszFlags, size_t cbFlags)
+ * @param    fFlags    the flags to write out
+ * @param    pszFlags  where to write the flags string.  This must point to
+ *                     a buffer of size (at least) MAX_FLAGS_LEN.
+ */
+DECLINLINE(int) GuestPropWriteFlags(uint32_t fFlags, char *pszFlags)
 {
     /* Putting READONLY before the other RDONLY flags keeps the result short. */
@@ -182 +181 @@
     if ((fFlags & ~GUEST_PROP_F_ALLFLAGS) == GUEST_PROP_F_NILFLAG)
     {
+        char *pszNext;
+        unsigned i;
+
         /* TRANSRESET implies TRANSIENT.  For compatability with old clients we
            always set TRANSIENT when TRANSRESET appears. */
@@ -195 +197 @@
             if (s_aFlagList[i] == (fFlags & s_aFlagList[i]))
             {
-                RTStrAAppend(&pszTemp, GuestPropFlagName(s_aFlagList[i]));
+                strcpy(pszNext, GuestPropFlagName(s_aFlagList[i]));
+                pszNext += GuestPropFlagNameLen(s_aFlagList[i]);
                 fFlags &= ~s_aFlagList[i];
                 if (fFlags != GUEST_PROP_F_NILFLAG)
-                    RTStrAAppend(&pszTemp, ", ");
+                {
+                    strcpy(pszNext, ", ");
+                    pszNext += 2;
+                }
             }
         }
-
-        if (   RT_SUCCESS(rc)
-            && pszTemp)
-            rc = RTStrCopy(pszFlags, cbFlags, pszTemp);
-
-        if (pszTemp)
-            RTStrFree(pszTemp);
+        *pszNext = '\0';
 
         Assert(fFlags == GUEST_PROP_F_NILFLAG); /* bad s_aFlagList */