commit e07d4801f9846b9155d4c63872f51b18d8537d01
author msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> Wed Apr 22 17:28:12 2009 +0000
committer msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> Wed Apr 22 17:28:12 2009 +0000
tree 5d86f7517a23788405e78b36d0a91c6898d3390d
parent 38e73f87814ea3029636fb1850b0483884b3cbbe

Merge changes from CUPS 1.4svn-r8540.



git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1432 a1ca3aef-8c08-0410-bb20-df032aa958be

cups/string.c

diff --git a/cups/string.c b/cups/string.c
index 9b185f9..2d93eb8 100644
--- a/cups/string.c
+++ b/cups/string.c
@@ -119,8 +119,8 @@
     item->ref_count ++;
 
 #ifdef DEBUG_GUARDS
-    DEBUG_printf(("_cupsStrAlloc: Using string %p(%s) for \"%s\", guard=%08x, "
-                  "ref_count=%d\n", item, item->str, s, item->guard,
+    DEBUG_printf(("5_cupsStrAlloc: Using string %p(%s) for \"%s\", guard=%08x, "
+                  "ref_count=%d", item, item->str, s, item->guard,
 		  item->ref_count));
 
     if (item->guard != _CUPS_STR_GUARD)
@@ -154,8 +154,8 @@
 #ifdef DEBUG_GUARDS
   item->guard = _CUPS_STR_GUARD;
 
-  DEBUG_printf(("_cupsStrAlloc: Created string %p(%s) for \"%s\", guard=%08x, "
-		"ref_count=%d\n", item, item->str, s, item->guard,
+  DEBUG_printf(("5_cupsStrAlloc: Created string %p(%s) for \"%s\", guard=%08x, "
+		"ref_count=%d", item, item->str, s, item->guard,
 		item->ref_count));
 #endif /* DEBUG_GUARDS */
 
@@ -183,7 +183,7 @@
   _cups_sp_item_t	*item;		/* Current item */
 
 
-  DEBUG_printf(("_cupsStrFlush: %d strings in array\n",
+  DEBUG_printf(("4_cupsStrFlush: %d strings in array",
                 cupsArrayCount(stringpool)));
 
 #ifdef HAVE_PTHREAD_H
@@ -326,8 +326,8 @@
 #ifdef DEBUG_GUARDS
   if (key->guard != _CUPS_STR_GUARD)
   {
-    DEBUG_printf(("_cupsStrFree: Freeing string %p(%s), guard=%08x, "
-                  "ref_count=%d\n", key, key->str, key->guard, key->ref_count));
+    DEBUG_printf(("5_cupsStrFree: Freeing string %p(%s), guard=%08x, "
+                  "ref_count=%d", key, key->str, key->guard, key->ref_count));
     abort();
   }
 #endif /* DEBUG_GUARDS */
@@ -368,7 +368,7 @@
  */
 
 char *					/* O - Pointer to string */
-_cupsStrRetain(char *s)			/* I - String to retain */
+_cupsStrRetain(const char *s)		/* I - String to retain */
 {
   _cups_sp_item_t	*item;		/* Pointer to string pool item */
 
@@ -380,8 +380,8 @@
 #ifdef DEBUG_GUARDS
     if (item->guard != _CUPS_STR_GUARD)
     {
-      DEBUG_printf(("_cupsStrRetain: Retaining string %p(%s), guard=%08x, "
-                    "ref_count=%d\n", item, s, item->guard, item->ref_count));
+      DEBUG_printf(("5_cupsStrRetain: Retaining string %p(%s), guard=%08x, "
+                    "ref_count=%d", item, s, item->guard, item->ref_count));
       abort();
     }
 #endif /* DEBUG_GUARDS */
@@ -397,7 +397,7 @@
 #endif /* HAVE_PTHREAD_H */
   }
 
-  return (s);
+  return ((char *)s);
 }