Merge changes from CUPS 1.6svn-r9939.

[thirdparty/cups.git] / filter / error.c

diff --git a/filter/error.c b/filter/error.c
index f4e8c39837211a1e2479483d71efd3569d1b6793..a73186926826148e965f4af97121b2f58cf5d485 100644 (file)
--- a/filter/error.c
+++ b/filter/error.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: error.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: error.c 7460 2008-04-16 02:19:54Z mike $"
  *
- *   Raster error handling for the Common UNIX Printing System (CUPS).
+ *   Raster error handling for CUPS.
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2011 by Apple Inc.
  *   Copyright 2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -28,8 +28,7 @@
  * Include necessary headers...
  */
 
-#include "image-private.h"
-#include <stdarg.h>
+#include <cups/raster-private.h>
 
 
 /*
@@ -78,7 +77,7 @@ _cupsRasterAddError(const char *f,    /* I - Printf-style error message */
   if (bytes >= sizeof(s))
     return;
 
-  if (bytes > (buf->end - buf->current))
+  if (bytes > (size_t)(buf->end - buf->current))
   {
    /*
     * Allocate more memory...
@@ -139,7 +138,7 @@ _cupsRasterClearError(void)
  *
  * If there are no recent errors, NULL is returned.
  *
- * @since CUPS 1.3@
+ * @since CUPS 1.3/Mac OS X 10.5@
  */
 
 const char *                           /* O - Last error */
@@ -192,12 +191,11 @@ get_error_buffer(void)
   _cups_raster_error_t *buf;           /* Pointer to error buffer */
 
 
- /* 
+ /*
   * Initialize the global data exactly once...
   */
 
-  DEBUG_printf(("get_error_buffer(): raster_key_once=%d\n",
-                raster_key_once));
+  DEBUG_puts("get_error_buffer()");
 
   pthread_once(&raster_key_once, raster_init);
 
@@ -237,8 +235,8 @@ raster_init(void)
 {
   pthread_key_create(&raster_key, raster_destructor);
 
-  DEBUG_printf(("raster_init(): raster_key=%x(%u)\n", raster_key,
-                raster_key));
+  DEBUG_printf(("raster_init(): raster_key=%x(%u)\n", (unsigned)raster_key,
+                (unsigned)raster_key));
 }
 
 
@@ -284,5 +282,5 @@ get_error_buffer(void)
 
 
 /*
- * End of "$Id: error.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: error.c 7460 2008-04-16 02:19:54Z mike $".
  */