Merge changes from CUPS 1.5b1-r9798.

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

diff --git a/cups/ipp.c b/cups/ipp.c
index 8f4360599a73d67e9ae81adb3931b74011e245b2..a04fb30a5aeca9da749765bfccb0be37781e33ad 100644 (file)
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -3,7 +3,7 @@
  *
  *   Internet Printing Protocol functions for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -423,7 +423,7 @@ ippAddString(ipp_t      *ipp,               /* I - IPP message */
   * Force value to be English for the POSIX locale...
   */
 
-  if (type == IPP_TAG_LANGUAGE && !strcasecmp(value, "C"))
+  if (type == IPP_TAG_LANGUAGE && !_cups_strcasecmp(value, "C"))
     value = "en";
 
  /*
@@ -513,7 +513,7 @@ ippAddStrings(
     {
       if ((int)type & IPP_TAG_COPY)
         value->string.text = (char *)values[i];
-      else if (type == IPP_TAG_LANGUAGE && !strcasecmp(values[i], "C"))
+      else if (type == IPP_TAG_LANGUAGE && !_cups_strcasecmp(values[i], "C"))
       {
        /*
        * Force language to be English for the POSIX locale...
@@ -930,7 +930,7 @@ ippFindNextAttribute(ipp_t      *ipp,       /* I - IPP message */
 
     value_tag = (ipp_tag_t)(attr->value_tag & IPP_TAG_MASK);
 
-    if (attr->name != NULL && strcasecmp(attr->name, name) == 0 &&
+    if (attr->name != NULL && _cups_strcasecmp(attr->name, name) == 0 &&
         (value_tag == type || type == IPP_TAG_ZERO ||
         (value_tag == IPP_TAG_TEXTLANG && type == IPP_TAG_TEXT) ||
         (value_tag == IPP_TAG_NAMELANG && type == IPP_TAG_NAME)))