Changeset 12812 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib

Timestamp:

Sep 29, 2008 4:27:32 PM (17 years ago)

Author:

vboxsync

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

37166

Message:

VbglR3GuestPropDelTree -> VbglR3GuestPropDelSet, added missing docs and make some adjustments. Fixed the missing 'const'-ness of the enumeration API.

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp

@@ -523 +523 @@
  * @param   ppszFlags       Where to store the first flags value on success.
  *                          Should not be freed.
- *
- * @todo    Make papszPatterns char const * const *, and cPatterns size_t (so we
- *          can use RT_ELEMENTS without getting warnings on Windows).
- *          Most of the returns should also be made char const * to discourage
- *          changes and encourage compiler optimizations.
  */
 VBGLR3DECL(int) VbglR3GuestPropEnum(uint32_t u32ClientId,
-                                    char **papszPatterns,
-                                    int cPatterns,
+                                    char const * const *papszPatterns,
+                                    size_t cPatterns,
                                     PVBGLR3GUESTPROPENUM *ppHandle,
-                                    char **ppszName,
-                                    char **ppszValue,
+                                    char const **ppszName,
+                                    char const **ppszValue,
                                     uint64_t *pu64Timestamp,
-                                    char **ppszFlags)
+                                    char const **ppszFlags)
 {
     int rc = VINF_SUCCESS;
     RTMemAutoPtr<VBGLR3GUESTPROPENUM, VbglR3GuestPropEnumFree> Handle;
-    Handle = (PVBGLR3GUESTPROPENUM) RTMemAllocZ(sizeof(VBGLR3GUESTPROPENUM));
+    Handle = (PVBGLR3GUESTPROPENUM)RTMemAllocZ(sizeof(VBGLR3GUESTPROPENUM));
     if (!Handle)
         rc = VERR_NO_MEMORY;
@@ -546 +541 @@
     /* Get the length of the pattern string, including the final terminator. */
     uint32_t cchPatterns = 1;
-    for (int i = 0; i < cPatterns; ++i)
+    for (unsigned i = 0; i < cPatterns; ++i)
         cchPatterns += strlen(papszPatterns[i]) + 1;
+
     /* Pack the pattern array */
     RTMemAutoPtr<char> Patterns;
-    Patterns = (char *) RTMemAlloc(cchPatterns);
+    Patterns = (char *)RTMemAlloc(cchPatterns);
     size_t iOffs = 0;
-    for (int i = 0; i < cPatterns; ++i)
+    for (size_t i = 0; i < cPatterns; ++i)
     {
         size_t cb = strlen(papszPatterns[i]) + 1;
@@ -619 +615 @@
  *                       set to NULL if there are no more properties to
  *                       enumerate.  This pointer should not be freed.
- *
- * @todo return char const *.
  */
 VBGLR3DECL(int) VbglR3GuestPropEnumNext(PVBGLR3GUESTPROPENUM pHandle,
-                                        char **ppszName,
-                                        char **ppszValue,
+                                        char const **ppszName,
+                                        char const **ppszValue,
                                         uint64_t *pu64Timestamp,
-                                        char **ppszFlags)
+                                        char const **ppszFlags)
 {
     uint32_t iBuf = pHandle->iBuf;
     char *pszName = pHandle->pchBuf + iBuf;
-    /** @todo replace these with safe memchr's and return an error if needed. */
+    /** @todo replace these with safe memchr's and return an error if needed. A
+     *        PLEASE add a comment about the layout because this is rather
+     *        unreadable. */
     iBuf += strlen(pszName) + 1;
     char *pszValue = pHandle->pchBuf + iBuf;
@@ -680 +676 @@
 {
     PVBGLR3GUESTPROPENUM pHandle;
-    char *pszName;
-    char *pszValue;
+    char const *pszName, *pszValue, *pszFlags;
     uint64_t pu64Timestamp;
-    char *pszFlags;
     int rc = VbglR3GuestPropEnum(u32ClientId,
                                  (char **)papszPatterns, /** @todo fix this cast. */