Changeset 5971 in vbox for trunk/src/VBox/Runtime

Timestamp:

Dec 5, 2007 7:25:00 PM (17 years ago)

Author:

vboxsync

Message:

Use the new RT_C_* stuff in iprt/ctype.h. Made VBOX_LOG='*usb*=~0' work (case problem).

File:

• trunk/src/VBox/Runtime/common/log/log.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/common/log/log.cpp

@@ -39 +39 @@
 #include <iprt/stdarg.h>
 #include <iprt/string.h>
+#include <iprt/ctype.h>
 #ifdef IN_RING3
-# include <iprt/ctype.h>
 # include <iprt/alloca.h>
 # include <stdio.h>
-#else
-# define isspace(ch) ( (ch) == ' ' || (ch) == '\t' )
-#endif
-
-
-
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
-/** Ascii to lower macro. */
-#define CHLOWER(ch)     (((unsigned char)(ch) < (unsigned char)'A') || ((unsigned char)(ch) > (unsigned char)'Z') ? (ch) : (ch) + ('a' - 'A'))
+#endif
 
 
@@ -274 +264 @@
                     {
                         /* skip blanks. */
-                        while (isspace(*pszVar) || *pszVar == '\n' || *pszVar == '\r')
+                        while (RT_C_IS_SPACE(*pszVar))
                             pszVar++;
                         if (!*pszVar)
@@ -317 +307 @@
 
                                 /* check for value. */
-                                while (isspace(*pszVar) || *pszVar == '\n' || *pszVar == '\r')
+                                while (RT_C_IS_SPACE(*pszVar))
                                     pszVar++;
                                 if (*pszVar == '=' || *pszVar == ':')
@@ -366 +356 @@
 
                         /* skip blanks and delimiters. */
-                        while (isspace(*pszVar) || *pszVar == '\n' || *pszVar == '\r' || *pszVar == ';')
+                        while (RT_C_IS_SPACE(*pszVar) || *pszVar == ';')
                             pszVar++;
                     } /* while more environment variable value left */
@@ -888 +878 @@
     for (;;)
     {
-        if (CHLOWER(*pszGrp) != CHLOWER(*pachMask))
+        if (RT_C_TO_LOWER(*pszGrp) != RT_C_TO_LOWER(*pachMask))
         {
             /*
@@ -907 +897 @@
 
             /* do extremely minimal matching (fixme) */
-            pszGrp = strchr(pszGrp, *pachMask);
-            if (!pszGrp)
+            const char *pszTmp = strchr(pszGrp, RT_C_TO_LOWER(*pachMask));
+            if (!pszTmp)
+                pszTmp = strchr(pszGrp, RT_C_TO_UPPER(*pachMask));
+            if (!pszTmp)
                 return false;
+            pszGrp = pszTmp;
             continue;
         }
@@ -1104 +1097 @@
             const char *psz1 = aFlags[i].pszFlag;
             const char *psz2 = psz;
-            while (*psz1 == CHLOWER(*psz2))
+            while (*psz1 == RT_C_TO_LOWER(*psz2))
             {
                 psz1++;
@@ -1170 +1163 @@
     {
         /* skip blanks. */
-        while (isspace(*pszVar) || *pszVar == '\n' || *pszVar == '\r')
+        while (RT_C_IS_SPACE(*pszVar))
             pszVar++;
         if (!*pszVar)
@@ -1254 +1247 @@
 
         /* skip blanks and delimiters. */
-        while (isspace(*pszVar) || *pszVar == '\n' || *pszVar == '\r' || *pszVar == ';')
+        while (RT_C_IS_SPACE(*pszVar) || *pszVar == ';')
             pszVar++;
     } /* while more environment variable value left */