Import CUPS 1.4svn-r7464.

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

1 files changed, 1 insertions, 13 deletions

diff --git a/cups/globals.c b/cups/globals.c
index 53dcb0985..6849f424c 100644
--- a/cups/globals.c
+++ b/cups/globals.c
@@ -3,7 +3,7 @@
  *
  *   Global variable access routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -28,7 +28,6 @@
 
 #include "http-private.h"
 #include "globals.h"
-#include "debug.h"
 #include <stdlib.h>
 
 
@@ -93,8 +92,6 @@ _cupsGlobals(void)
   * Initialize the global data exactly once...
   */
 
-  DEBUG_printf(("_cupsGlobals(): globals_key_once=%d\n", globals_key_once));
-
   pthread_once(&globals_key_once, globals_init);
 
  /*
@@ -103,8 +100,6 @@ _cupsGlobals(void)
 
   if ((globals = (_cups_globals_t *)pthread_getspecific(globals_key)) == NULL)
   {
-    DEBUG_puts("_cupsGlobals: allocating memory for thread...");
-
    /*
     * No, allocate memory as set the pointer for the key...
     */
@@ -112,8 +107,6 @@ _cupsGlobals(void)
     globals = calloc(1, sizeof(_cups_globals_t));
     pthread_setspecific(globals_key, globals);
 
-    DEBUG_printf(("    globals=%p\n", globals));
-
    /*
     * Initialize variables that have non-zero values
     */
@@ -140,9 +133,6 @@ static void
 globals_init()
 {
   pthread_key_create(&globals_key, globals_destructor);
-
-  DEBUG_printf(("globals_init(): globals_key=%x(%u)\n", globals_key,
-                globals_key));
 }
 
 
@@ -157,8 +147,6 @@ globals_destructor(void *value)		/* I - Data to free */
   _cups_globals_t	*cg;		/* Global data */
 
 
-  DEBUG_printf(("globals_destructor(value=%p)\n", value));
-
   cg = (_cups_globals_t *)value;
 
   httpClose(cg->http);