Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / berkeley / lpq.c

diff --git a/berkeley/lpq.c b/berkeley/lpq.c
index dbdcbab13019f937a9fd63d41080111e552994b6..db089867eb69d0804abdbc091a75689e0836390f 100644 (file)
--- a/berkeley/lpq.c
+++ b/berkeley/lpq.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: lpq.c 181 2006-06-22 20:01:18Z jlovell $"
+ * "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $"
  *
  *   "lpq" command for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   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/".
  *
  * Contents:
  *
@@ -76,9 +67,10 @@ main(int  argc,                              /* I - Number of command-line arguments */
                longstatus;             /* Show file details */
   int          num_dests;              /* Number of destinations */
   cups_dest_t  *dests;                 /* Destinations */
-  cups_lang_t  *language;              /* Language */
 
 
+  _cupsSetLocale(argv);
+
  /*
   * Check for command-line options...
   */
@@ -90,8 +82,8 @@ main(int  argc,                               /* I - Number of command-line arguments */
   interval   = 0;
   longstatus = 0;
   all        = 0;
-  language   = cupsLangDefault();
   num_dests  = 0;
+  dests      = NULL;
 
   for (i = 1; i < argc; i ++)
     if (argv[i][0] == '+')
@@ -363,8 +355,8 @@ show_jobs(const char *command,              /* I - Command name */
                };
 
 
-  DEBUG_printf(("show_jobs(%08x, %08x, %08x, %d, %d)\n", http, dest, user, id,
-                longstatus));
+  DEBUG_printf(("show_jobs(http=%p, dest=%p, user=%p, id=%d, longstatus%d)\n",
+                http, dest, user, id, longstatus));
 
   if (http == NULL)
     return (0);
@@ -675,5 +667,5 @@ usage(void)
 
 
 /*
- * End of "$Id: lpq.c 181 2006-06-22 20:01:18Z jlovell $".
+ * End of "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $".
  */