Merge changes from CUPS 1.5svn-r9000.

[thirdparty/cups.git] / cups / globals.h

diff --git a/cups/globals.h b/cups/globals.h
index b78440bb1dcec9fbc123b0c68d8a2926fd37f899..1e07daac64f854d111ba0081f8e57cae19edac25 100644 (file)
--- a/cups/globals.h
+++ b/cups/globals.h
@@ -1,25 +1,16 @@
 /*
- * "$Id: globals.h 5319 2006-03-21 15:28:29Z mike $"
+ * "$Id: globals.h 7910 2008-09-06 00:25:17Z mike $"
  *
  *   Global variable definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  */
@@ -32,6 +23,7 @@
  */
 
 #  include "string.h"
+#  include "http-private.h"
 #  include "cups.h"
 #  include "i18n.h"
 
@@ -72,6 +64,10 @@ typedef struct _cups_globals_s               /**** CUPS global state data ****/
                                        /* Number of server settings */
   cups_option_t                *cupsd_settings;/* Server settings */
 
+  /* backend.c */
+  char                 resolved_uri[1024];
+                                       /* Buffer for cupsBackendDeviceURI */
+
   /* file.c */
   cups_file_t          *stdio_files[3];/* stdin, stdout, stderr */
 
@@ -85,9 +81,11 @@ typedef struct _cups_globals_s               /**** CUPS global state data ****/
 #  ifdef HAVE_GETADDRINFO
   char                 hostname[1024]; /* Hostname */
 #  endif /* HAVE_GETADDRINFO */
+  int                  need_res_init;  /* Need to reinitialize resolver? */
 
   /* ipp.c */
   ipp_uchar_t          ipp_date[11];   /* RFC-1903 date/time data */
+  _ipp_buffer_t                *ipp_buffers;   /* Buffer list */
 
   /* ipp-support.c */
   int                  ipp_port;       /* IPP port number */
@@ -95,14 +93,9 @@ typedef struct _cups_globals_s               /**** CUPS global state data ****/
                                        /* Unknown error statuses */
 
   /* language.c */
-  cups_lang_t          *lang_cache;    /* Language string cache */
   cups_lang_t          *lang_default;  /* Default language */
 #  ifdef __APPLE__
-#    ifdef HAVE_CF_LOCALE_ID
   char                 language[32];   /* Cached language */
-#    else
-  const char           *language;      /* Cached language */
-#    endif /* HAVE_CF_LOCALE_ID */
 #  endif /* __APPLE__ */
 
   /* ppd.c */
@@ -110,19 +103,25 @@ typedef struct _cups_globals_s            /**** CUPS global state data ****/
   int                  ppd_line;       /* Current line number */
   ppd_conform_t                ppd_conform;    /* Level of conformance required */
 
+  /* pwgmedia.c */
+  cups_array_t         *pwg_size_lut,  /* Lookup table for PWG names */
+                       *leg_size_lut;  /* Lookup table for legacy names */
+
+  /* snmp.c */
+  char                 snmp_community[255];
+                                       /* Default SNMP community name */
+  int                  snmp_debug;     /* Log SNMP IO to stderr? */
+
   /* tempfile.c */
   char                 tempfile[1024]; /* cupsTempFd/File buffer */
 
-  /* transcode.c */
-  _cups_cmap_t         *cmap_cache;    /* SBCS Charmap Cache */
-  _cups_vmap_t         *vmap_cache;    /* VBCS Charmap Cache */
-
   /* usersys.c */
   http_encryption_t    encryption;     /* Encryption setting */
   char                 user[65],       /* User name */
                        server[256],    /* Server address */
                        servername[256];/* Server hostname */
-  cups_password_cb_t   password_cb;    /* Password callback */
+  cups_password_cb2_t  password_cb;    /* Password callback */
+  void                 *password_data; /* Password user data */
 
   /* util.c */
   http_t               *http;          /* Current server connection */
@@ -134,9 +133,6 @@ typedef struct _cups_globals_s              /**** CUPS global state data ****/
                                        /* Default printer */
   char                 ppd_filename[HTTP_MAX_URI];
                                        /* PPD filename */
-
-  /* string.c */
-  cups_array_t         *stringpool;    /* String pool */
 } _cups_globals_t;
 
 
@@ -144,12 +140,16 @@ typedef struct _cups_globals_s            /**** CUPS global state data ****/
  * Prototypes...
  */
 
-extern void            _cupsCharmapFlush(_cups_globals_t *cg);
+extern http_t          *_cupsConnect(void);
+extern int             _cupsGet1284Values(const char *device_id,
+                                          cups_option_t **values);
 extern const char      *_cupsGetPassword(const char *prompt);
 extern _cups_globals_t *_cupsGlobals(void);
-extern void            _cupsLangFlush(_cups_globals_t *cg);
-extern void            _cupsSetError(ipp_status_t status, const char *message);
-extern void            _cupsStrFlush(_cups_globals_t *cg);
+extern void            _cupsSetDefaults(void);
+extern void            _cupsSetError(ipp_status_t status, const char *message,
+                                     int localize);
+extern void            _cupsSetHTTPError(http_status_t status);
+extern char            *_cupsUserDefault(char *name, size_t namesize);
 
 
 /*
@@ -162,5 +162,5 @@ extern void         _cupsStrFlush(_cups_globals_t *cg);
 #endif /* !_CUPS_GLOBALS_H_ */
 
 /*
- * End of "$Id: globals.h 5319 2006-03-21 15:28:29Z mike $".
+ * End of "$Id: globals.h 7910 2008-09-06 00:25:17Z mike $".
  */