Merge changes from CUPS 1.5svn-r9000.

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

diff --git a/cups/globals.h b/cups/globals.h
index d58099548ba4ceae4c0f86688df1ef38854045d2..1e07daac64f854d111ba0081f8e57cae19edac25 100644 (file)
--- a/cups/globals.h
+++ b/cups/globals.h
@@ -1,9 +1,9 @@
 /*
- * "$Id: globals.h 7583 2008-05-16 17:47:16Z mike $"
+ * "$Id: globals.h 7910 2008-09-06 00:25:17Z mike $"
  *
  *   Global variable definitions for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   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
@@ -85,6 +85,7 @@ typedef struct _cups_globals_s                /**** CUPS global state data ****/
 
   /* 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 */
@@ -102,6 +103,10 @@ 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 */
@@ -115,7 +120,8 @@ typedef struct _cups_globals_s              /**** CUPS global state data ****/
   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 */
@@ -135,11 +141,15 @@ typedef struct _cups_globals_s            /**** CUPS global state data ****/
  */
 
 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            _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);
 
 
 /*
@@ -152,5 +162,5 @@ extern void         _cupsSetHTTPError(http_status_t status);
 #endif /* !_CUPS_GLOBALS_H_ */
 
 /*
- * End of "$Id: globals.h 7583 2008-05-16 17:47:16Z mike $".
+ * End of "$Id: globals.h 7910 2008-09-06 00:25:17Z mike $".
  */