Fix source file header text duplication text duplication.

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

diff --git a/cups/getdevices.c b/cups/getdevices.c
index 0d539785851df02f4d332241c2afc38e07ec156d..0f303ba52556645a28d11d0f604fc170941f2b63 100644 (file)
--- a/cups/getdevices.c
+++ b/cups/getdevices.c
@@ -1,21 +1,15 @@
 /*
- * "$Id$"
+ * cupsGetDevices implementation for CUPS.
  *
- *   cupsGetDevices implementation for CUPS.
+ * Copyright 2008-2016 by Apple Inc.
  *
- *   Copyright 2008-2013 by Apple Inc.
+ * 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:
- *
- *   cupsGetDevices() - Get available printer devices.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -23,6 +17,7 @@
  */
 
 #include "cups-private.h"
+#include "adminutil.h"
 
 
 /*
@@ -34,7 +29,7 @@
  * parameters provide comma-delimited lists of backends to include or omit from
  * the request respectively.
  *
- * @since CUPS 1.4/OS X 10.6@
+ * @since CUPS 1.4/macOS 10.6@
  */
 
 ipp_status_t                           /* O - Request status - @code IPP_OK@ on success. */
@@ -65,10 +60,7 @@ cupsGetDevices(
   * Range check input...
   */
 
-  DEBUG_printf(("cupsGetDevices(http=%p, timeout=%d, include_schemes=\"%s\", "
-                "exclude_schemes=\"%s\", callback=%p, user_data=%p)", http,
-               timeout, include_schemes, exclude_schemes, callback,
-               user_data));
+  DEBUG_printf(("cupsGetDevices(http=%p, timeout=%d, include_schemes=\"%s\", exclude_schemes=\"%s\", callback=%p, user_data=%p)", (void *)http, timeout, include_schemes, exclude_schemes, (void *)callback, user_data));
 
   if (!callback)
     return (IPP_STATUS_ERROR_INTERNAL);
@@ -190,8 +182,7 @@ cupsGetDevices(
     if ((state = ippRead(http, response)) == IPP_STATE_ERROR)
       break;
 
-    DEBUG_printf(("2cupsGetDevices: state=%d, response->last=%p", state,
-                  response->last));
+    DEBUG_printf(("2cupsGetDevices: state=%d, response->last=%p", state, (void *)response->last));
 
     if (!response->attrs)
       continue;
@@ -243,8 +234,7 @@ cupsGetDevices(
   }
   while (state != IPP_STATE_DATA);
 
-  DEBUG_printf(("2cupsGetDevices: state=%d, response->last=%p", state,
-               response->last));
+  DEBUG_printf(("2cupsGetDevices: state=%d, response->last=%p", state, (void *)response->last));
 
   if (device_class && device_id && device_info && device_make_and_model &&
       device_uri)
@@ -277,8 +267,3 @@ cupsGetDevices(
 
   return (cupsLastError());
 }
-
-
-/*
- * End of "$Id$".
- */