Fix source file header text duplication text duplication.

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

diff --git a/cups/testadmin.c b/cups/testadmin.c
index 09aaa324c9b508ff76563b3d5c4b56368b2d2fb2..69b5efbf448f77b018bd28047da8685e13263485 100644 (file)
--- a/cups/testadmin.c
+++ b/cups/testadmin.c
@@ -1,23 +1,16 @@
 /*
- * "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $"
+ * Admin function test program for CUPS.
  *
- *   Admin function test program for the Common UNIX Printing System (CUPS).
+ * Copyright 2007-2013 by Apple Inc.
+ * Copyright 2006 by Easy Software Products.
  *
- *   Copyright 2007-2008 by Apple Inc.
- *   Copyright 2006 by Easy Software Products.
+ * These coded instructions, statements, and computer programs are the
+ * 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
+ * missing or damaged, see the license at "http://www.cups.org/".
  *
- *   These coded instructions, statements, and computer programs are the
- *   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.
- *
- * Contents:
- *
- *   main()          - Main entry.
- *   show_settings() - Show settings in the array...
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -25,7 +18,7 @@
  */
 
 #include "adminutil.h"
-#include "string.h"
+#include "string-private.h"
 
 
 /*
@@ -53,7 +46,8 @@ main(int  argc,                               /* I - Number of command-line args */
   * Connect to the server using the defaults...
   */
 
-  http = httpConnectEncrypt(cupsServer(), ippPort(), cupsEncryption());
+  http = httpConnect2(cupsServer(), ippPort(), NULL, AF_UNSPEC,
+                      cupsEncryption(), 1, 30000, NULL);
 
  /*
   * Set the current configuration if we have anything on the command-line...
@@ -113,8 +107,3 @@ show_settings(
     num_settings --;
   }
 }
-
-
-/*
- * End of "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $".
- */