Merge changes from CUPS 1.5svn-r9374.

[thirdparty/cups.git] / cups / testadmin.c

diff --git a/cups/testadmin.c b/cups/testadmin.c
index 4a927a8926a6dfc88420525379a93a57fa78c39b..a16025c3e06e93b4d2362411082b61978c8ae75a 100644 (file)
--- a/cups/testadmin.c
+++ b/cups/testadmin.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: testadmin.c 177 2006-06-21 00:20:03Z jlovell $"
+ * "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $"
  *
- *   Admin function test program for the Common UNIX Printing System (CUPS).
+ *   Admin function test program for CUPS.
  *
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 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/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
@@ -34,7 +25,7 @@
  */
 
 #include "adminutil.h"
-#include "string.h"
+#include "string-private.h"
 
 
 /*
@@ -70,10 +61,10 @@ main(int  argc,                             /* I - Number of command-line args */
 
   if (argc > 1)
   {
-    for (i = 1, num_settings = 0; i < argc; i ++)
+    for (i = 1, num_settings = 0, settings = NULL; i < argc; i ++)
       num_settings = cupsParseOptions(argv[i], num_settings, &settings);
 
-    if (_cupsAdminSetServerSettings(http, num_settings, settings))
+    if (cupsAdminSetServerSettings(http, num_settings, settings))
     {
       puts("New server settings:");
       cupsFreeOptions(num_settings, settings);
@@ -91,7 +82,7 @@ main(int  argc,                               /* I - Number of command-line args */
   * Get the current configuration...
   */
 
-  if (_cupsAdminGetServerSettings(http, &num_settings, &settings))
+  if (cupsAdminGetServerSettings(http, &num_settings, &settings))
   {
     show_settings(num_settings, settings);
     cupsFreeOptions(num_settings, settings);
@@ -125,5 +116,5 @@ show_settings(
 
 
 /*
- * End of "$Id: testadmin.c 177 2006-06-21 00:20:03Z jlovell $".
+ * End of "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $".
  */