Merge changes from CUPS 1.5svn-r9049 (private header support)

[thirdparty/cups.git] / systemv / cupsctl.c

diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c
index 1cd6fc8326ebdd8ae6a2f0b284a349eeee29d08b..1ba1641ed6e243408721684322b2019d510a5806 100644 (file)
--- a/systemv/cupsctl.c
+++ b/systemv/cupsctl.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: cupsctl.c 6379 2007-03-21 14:57:22Z mike $"
+ * "$Id$"
  *
- *   CUPS control program for the Common UNIX Printing System (CUPS).
+ *   Scheduler control program for CUPS.
  *
- *   Copyright 2007-2008 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 2006-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -24,10 +24,8 @@
  * Include necessary headers...
  */
 
+#include <cups/cups-private.h>
 #include <cups/adminutil.h>
-#include <cups/string.h>
-#include <cups/i18n.h>
-#include <errno.h>
 
 
 /*
@@ -193,9 +191,9 @@ usage(const char *opt)                      /* I - Option character/string */
   if (opt)
   {
     if (*opt == '-')
-      _cupsLangPrintf(stderr, _("cupsctl: Unknown option \"%s\"!\n"), opt);
+      _cupsLangPrintf(stderr, _("cupsctl: Unknown option \"%s\"\n"), opt);
     else
-      _cupsLangPrintf(stderr, _("cupsctl: Unknown option \"-%c\"!\n"), *opt);
+      _cupsLangPrintf(stderr, _("cupsctl: Unknown option \"-%c\"\n"), *opt);
   }
 
   _cupsLangPuts(stdout,
@@ -222,5 +220,5 @@ usage(const char *opt)                      /* I - Option character/string */
 
 
 /*
- * End of "$Id: cupsctl.c 6379 2007-03-21 14:57:22Z mike $".
+ * End of "$Id$".
  */