Don't need to load a message catalog when loading a PPD.

Make _cupsGSSServiceName() private API condition based on HAVE_GSSAPI.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9736 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups/ppd.c b/cups/ppd.c
index 1b4c0b5cd7ca29f42d74e23fd02c39f18048aff5..9daf875babdc9a075c32fa37a123289e93e98b07 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -483,7 +483,6 @@ ppdOpen2(cups_file_t *fp)           /* I - File to read from */
   ppd_section_t                section;        /* Order dependency section */
   ppd_profile_t                *profile;       /* Pointer to color profile */
   char                 **filter;       /* Pointer to filter */
-  cups_lang_t          *language;      /* Default language */
   struct lconv         *loc;           /* Locale data */
   int                  ui_keyword;     /* Is this line a UI keyword? */
   cups_encoding_t      encoding;       /* Encoding of PPD file */
@@ -627,13 +626,6 @@ ppdOpen2(cups_file_t *fp)          /* I - File to read from */
   ppd->coptions       = cupsArrayNew((cups_array_func_t)ppd_compare_coptions,
                                      NULL);
 
- /*
-  * Get the default language for the user...
-  */
-
-  language = cupsLangDefault();
-  loc      = localeconv();
-
  /*
   * Read lines from the PPD file and add them to the file record...
   */
@@ -644,6 +636,7 @@ ppdOpen2(cups_file_t *fp)           /* I - File to read from */
   choice     = NULL;
   ui_keyword = 0;
   encoding   = CUPS_ISO8859_1;
+  loc        = localeconv();
 
   while ((mask = ppd_read(fp, &line, keyword, name, text, &string, 1, cg)) != 0)
   {
@@ -1951,8 +1944,6 @@ ppdOpen2(cups_file_t *fp)         /* I - File to read from */
   * Reset language preferences...
   */
 
-  cupsLangFree(language);
-
 #ifdef DEBUG
   if (!cupsFileEOF(fp))
     DEBUG_printf(("1ppdOpen2: Premature EOF at %lu...\n",
@@ -2023,8 +2014,6 @@ ppdOpen2(cups_file_t *fp)         /* I - File to read from */
 
   ppdClose(ppd);
 
-  cupsLangFree(language);
-
   return (NULL);
 }
 

diff --git a/cups/usersys.c b/cups/usersys.c
index fe05e736f37c50a614ffc870e74c0287f0b3f516..b925bea7dd9ab6ff33b63d27ce076b7e5bb5877d 100644 (file)
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -512,6 +512,7 @@ _cupsGetPassword(const char *prompt)        /* I - Prompt string */
 }
 
 
+#ifdef HAVE_GSSAPI
 /*
  * '_cupsGSSServiceName()' - Get the GSS (Kerberos) service name.
  */
@@ -527,6 +528,7 @@ _cupsGSSServiceName(void)
 
   return (cg->gss_service_name);
 }
+#endif /* HAVE_GSSAPI */
 
 
 /*