Merge changes from CUPS 1.5svn-r9313.

[thirdparty/cups.git] / cups / file.c

diff --git a/cups/file.c b/cups/file.c
index 68fb118928b1f7da71e38b52e519a1cb554bb019..b788b72393e7b32461b44d399f901ec10dd0cde5 100644 (file)
--- a/cups/file.c
+++ b/cups/file.c
@@ -494,7 +494,7 @@ cupsFileGetConf(cups_file_t *fp,    /* I  - CUPS file */
         // Strip the comment and any trailing whitespace...
        while (ptr > buf)
        {
-         if (!isspace(ptr[-1] & 255))
+         if (!_cups_isspace(ptr[-1]))
            break;
 
          ptr --;
@@ -508,7 +508,7 @@ cupsFileGetConf(cups_file_t *fp,    /* I  - CUPS file */
     * Strip leading whitespace...
     */
 
-    for (ptr = buf; isspace(*ptr & 255); ptr ++);
+    for (ptr = buf; _cups_isspace(*ptr); ptr ++);
 
     if (ptr > buf)
       _cups_strcpy(buf, ptr);
@@ -524,7 +524,7 @@ cupsFileGetConf(cups_file_t *fp,    /* I  - CUPS file */
       */
 
       for (ptr = buf; *ptr; ptr ++)
-        if (isspace(*ptr & 255))
+        if (_cups_isspace(*ptr))
          break;
 
       if (*ptr)
@@ -533,7 +533,7 @@ cupsFileGetConf(cups_file_t *fp,    /* I  - CUPS file */
         * Have a value, skip any other spaces...
        */
 
-        while (isspace(*ptr & 255))
+        while (_cups_isspace(*ptr))
          *ptr++ = '\0';
 
         if (*ptr)
@@ -557,7 +557,7 @@ cupsFileGetConf(cups_file_t *fp,    /* I  - CUPS file */
          return (buf);
        }
 
-        while (ptr > *value && isspace(*ptr & 255))
+        while (ptr > *value && _cups_isspace(*ptr))
          *ptr-- = '\0';
       }