Changeset 13928 in vbox

Timestamp:

Nov 6, 2008 6:23:34 PM (16 years ago)

Author:

vboxsync

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

38951

Message:

HostServices/GuestProperties: clean-up

File:

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

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -37 +37 @@
 #include <VBox/log.h>
 #include <iprt/assert.h>
-
-#include <string.h>
-
-#ifdef RT_OS_WINDOWS
-# define strncasecmp strnicmp
-#endif
+#include <iprt/string.h>
 
 /** Everything defined in this file lives in this namespace. */
@@ -129 +124 @@
 DECLINLINE(int) validateFlags(const char *pcszFlags, uint32_t *pfFlags)
 {
-    static uint32_t flagList[] =
+    const static uint32_t sFlagList[] =
     {
         TRANSIENT, READONLY, RDONLYGUEST, RDONLYHOST
@@ -143 +138 @@
     {
         unsigned i = 0;
-        for (; i < RT_ELEMENTS(flagList); ++i)
-            if (strncasecmp(pcszNext, flagName(flagList[i]),
-                            flagNameLen(flagList[i])
+        for (; i < RT_ELEMENTS(sFlagList); ++i)
+            if (RTStrNICmp(pcszNext, flagName(sFlagList[i]),
+                           flagNameLen(sFlagList[i])
                            ) == 0
                )
                 break;
-        if (RT_ELEMENTS(flagList) == i)
+        if (RT_ELEMENTS(sFlagList) == i)
              rc = VERR_PARSE_ERROR;
         else
         {
-            fFlags |= flagList[i];
-            pcszNext += flagNameLen(flagList[i]);
+            fFlags |= sFlagList[i];
+            pcszNext += flagNameLen(sFlagList[i]);
             while (' ' == *pcszNext)
                 ++pcszNext;
@@ -179 +174 @@
 DECLINLINE(int) writeFlags(uint32_t fFlags, char *pszFlags)
 {
-    static uint32_t flagList[] =
+    const static uint32_t sFlagList[] =
     {
         TRANSIENT, READONLY, RDONLYGUEST, RDONLYHOST
@@ -191 +186 @@
     {
         unsigned i = 0;
-        for (; i < RT_ELEMENTS(flagList); ++i)
+        for (; i < RT_ELEMENTS(sFlagList); ++i)
         {
-            if (flagList[i] == (fFlags & flagList[i]))
+            if (sFlagList[i] == (fFlags & sFlagList[i]))
             {
-                strcpy(pszNext, flagName(flagList[i]));
-                pszNext += flagNameLen(flagList[i]);
-                fFlags &= ~flagList[i];
+                strcpy(pszNext, flagName(sFlagList[i]));
+                pszNext += flagNameLen(sFlagList[i]);
+                fFlags &= ~sFlagList[i];
                 if (fFlags != NILFLAG)
                 {