Move debug printfs to internal usage only.

Also, old MD5 code is internal-only.

3 files changed, 52 insertions, 96 deletions

diff --git a/systemv/Dependencies b/systemv/Dependencies
index 369d56880..6d7a4d96f 100644
--- a/systemv/Dependencies
+++ b/systemv/Dependencies
@@ -1,86 +1,79 @@
 cancel.o: cancel.c ../cups/cups-private.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/versioning.h \
+  ../config.h ../cups/versioning.h ../cups/array-private.h \
+  ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/pwg.h \
+  ../cups/http-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/pwg-private.h ../cups/thread-private.h
+cupsaccept.o: cupsaccept.c ../cups/cups-private.h \
+  ../cups/string-private.h ../config.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
   ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \
   ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/thread-private.h
-cupsaccept.o: cupsaccept.c ../cups/cups-private.h \
-  ../cups/string-private.h ../config.h ../cups/debug-private.h \
-  ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
-  ../cups/ipp-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \
-  ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/thread-private.h
 cupsaddsmb.o: cupsaddsmb.c ../cups/cups-private.h \
-  ../cups/string-private.h ../config.h ../cups/debug-private.h \
-  ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
-  ../cups/ipp-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \
-  ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/thread-private.h ../cups/adminutil.h
-cupsctl.o: cupsctl.c ../cups/cups-private.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/versioning.h \
+  ../cups/string-private.h ../config.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
   ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \
   ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/thread-private.h ../cups/adminutil.h
-cupstestdsc.o: cupstestdsc.c ../cups/cups-private.h \
-  ../cups/string-private.h ../config.h ../cups/debug-private.h \
-  ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
-  ../cups/ipp-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \
-  ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/thread-private.h
-cupstestppd.o: cupstestppd.c ../cups/cups-private.h \
-  ../cups/string-private.h ../config.h ../cups/debug-private.h \
-  ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
-  ../cups/ipp-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \
-  ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/thread-private.h ../cups/dir.h ../cups/ppd-private.h \
-  ../cups/ppd.h ../cups/raster.h
-lp.o: lp.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
-  ../cups/debug-private.h ../cups/versioning.h ../cups/array-private.h \
+cupsctl.o: cupsctl.c ../cups/cups-private.h ../cups/string-private.h \
+  ../config.h ../cups/versioning.h ../cups/array-private.h \
   ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/file.h \
   ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/pwg.h \
   ../cups/http-private.h ../cups/language-private.h ../cups/transcode.h \
-  ../cups/pwg-private.h ../cups/thread-private.h
-lpadmin.o: lpadmin.c ../cups/cups-private.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/versioning.h \
+  ../cups/pwg-private.h ../cups/thread-private.h ../cups/adminutil.h
+cupstestdsc.o: cupstestdsc.c ../cups/cups-private.h \
+  ../cups/string-private.h ../config.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
   ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \
   ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/thread-private.h ../cups/ppd-private.h ../cups/ppd.h \
-  ../cups/raster.h
-lpinfo.o: lpinfo.c ../cups/cups-private.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/versioning.h \
+  ../cups/thread-private.h
+cupstestppd.o: cupstestppd.c ../cups/cups-private.h \
+  ../cups/string-private.h ../config.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
   ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \
   ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/thread-private.h ../cups/adminutil.h
-lpmove.o: lpmove.c ../cups/cups-private.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/versioning.h \
-  ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \
-  ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
+  ../cups/thread-private.h ../cups/dir.h ../cups/ppd-private.h \
+  ../cups/ppd.h ../cups/raster.h
+lp.o: lp.c ../cups/cups-private.h ../cups/string-private.h ../config.h \
+  ../cups/versioning.h ../cups/array-private.h ../cups/array.h \
+  ../cups/ipp-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \
+  ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
   ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
   ../cups/thread-private.h
+lpadmin.o: lpadmin.c ../cups/cups-private.h ../cups/string-private.h \
+  ../config.h ../cups/versioning.h ../cups/array-private.h \
+  ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/pwg.h \
+  ../cups/http-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/pwg-private.h ../cups/thread-private.h ../cups/ppd-private.h \
+  ../cups/ppd.h ../cups/raster.h
+lpinfo.o: lpinfo.c ../cups/cups-private.h ../cups/string-private.h \
+  ../config.h ../cups/versioning.h ../cups/array-private.h \
+  ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/pwg.h \
+  ../cups/http-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/pwg-private.h ../cups/thread-private.h ../cups/adminutil.h
+lpmove.o: lpmove.c ../cups/cups-private.h ../cups/string-private.h \
+  ../config.h ../cups/versioning.h ../cups/array-private.h \
+  ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/pwg.h \
+  ../cups/http-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/pwg-private.h ../cups/thread-private.h
 lpoptions.o: lpoptions.c ../cups/cups-private.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/versioning.h \
-  ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \
-  ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/thread-private.h ../cups/ppd-private.h ../cups/ppd.h \
-  ../cups/raster.h
+  ../config.h ../cups/versioning.h ../cups/array-private.h \
+  ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/pwg.h \
+  ../cups/http-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/pwg-private.h ../cups/thread-private.h ../cups/ppd-private.h \
+  ../cups/ppd.h ../cups/raster.h
 lpstat.o: lpstat.c ../cups/cups-private.h ../cups/string-private.h \
-  ../config.h ../cups/debug-private.h ../cups/versioning.h \
-  ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
-  ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \
-  ../cups/language.h ../cups/pwg.h ../cups/http-private.h \
-  ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \
-  ../cups/thread-private.h
+  ../config.h ../cups/versioning.h ../cups/array-private.h \
+  ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/file.h \
+  ../cups/ipp.h ../cups/http.h ../cups/language.h ../cups/pwg.h \
+  ../cups/http-private.h ../cups/language-private.h ../cups/transcode.h \
+  ../cups/pwg-private.h ../cups/thread-private.h
diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c
index 2f406425c..3e2e1ff0e 100644
--- a/systemv/lpadmin.c
+++ b/systemv/lpadmin.c
@@ -704,9 +704,6 @@ add_printer_to_class(http_t *http,	/* I - Server connection */
   char		uri[HTTP_MAX_URI];	/* URI for printer/class */
 
 
-  DEBUG_printf(("add_printer_to_class(%p, \"%s\", \"%s\")\n", http,
-                printer, pclass));
-
  /*
   * Build an IPP_OP_GET_PRINTER_ATTRIBUTES request, which requires the following
   * attributes:
@@ -825,8 +822,6 @@ default_printer(http_t *http,		/* I - Server connection */
   char		uri[HTTP_MAX_URI];	/* URI for printer/class */
 
 
-  DEBUG_printf(("default_printer(%p, \"%s\")\n", http, printer));
-
  /*
   * Build a CUPS-Set-Default request, which requires the following
   * attributes:
@@ -876,8 +871,6 @@ delete_printer(http_t *http,		/* I - Server connection */
   char		uri[HTTP_MAX_URI];	/* URI for printer/class */
 
 
-  DEBUG_printf(("delete_printer(%p, \"%s\")\n", http, printer));
-
  /*
   * Build a CUPS-Delete-Printer request, which requires the following
   * attributes:
@@ -932,9 +925,6 @@ delete_printer_from_class(
   char		uri[HTTP_MAX_URI];	/* URI for printer/class */
 
 
-  DEBUG_printf(("delete_printer_from_class(%p, \"%s\", \"%s\")\n", http,
-                printer, pclass));
-
  /*
   * Build an IPP_OP_GET_PRINTER_ATTRIBUTES request, which requires the following
   * attributes:
@@ -1132,8 +1122,6 @@ enable_printer(http_t *http,		/* I - Server connection */
   char		uri[HTTP_MAX_URI];	/* URI for printer/class */
 
 
-  DEBUG_printf(("enable_printer(%p, \"%s\")\n", http, printer));
-
  /*
   * Send IPP_OP_ENABLE_PRINTER and IPP_OP_RESUME_PRINTER requests, which
   * require the following attributes:
@@ -1370,10 +1358,6 @@ set_printer_options(
 		copied_options = 0;	/* Copied options? */
 
 
-  DEBUG_printf(("set_printer_options(http=%p, printer=\"%s\", num_options=%d, "
-                "options=%p, file=\"%s\")\n", http, printer, num_options,
-		options, file));
-
  /*
   * Build a CUPS-Add-Modify-Printer or CUPS-Add-Modify-Class request,
   * which requires the following attributes:
diff --git a/systemv/lpstat.c b/systemv/lpstat.c
index 96d4acc85..d6aa45e78 100644
--- a/systemv/lpstat.c
+++ b/systemv/lpstat.c
@@ -688,8 +688,6 @@ show_accepting(const char  *printers,	/* I - Destinations */
 		};
 
 
-  DEBUG_printf(("show_accepting(printers=\"%s\")\n", printers));
-
   if (printers != NULL && !strcmp(printers, "all"))
     printers = NULL;
 
@@ -736,8 +734,6 @@ show_accepting(const char  *printers,	/* I - Destinations */
 
   if (response)
   {
-    DEBUG_puts("show_accepting: request succeeded...");
-
    /*
     * Loop through the printers returned in the list and display
     * their devices...
@@ -872,8 +868,6 @@ show_classes(const char *dests)		/* I - Destinations */
 		};
 
 
-  DEBUG_printf(("show_classes(dests=\"%s\")\n", dests));
-
   if (dests != NULL && !strcmp(dests, "all"))
     dests = NULL;
 
@@ -920,8 +914,6 @@ show_classes(const char *dests)		/* I - Destinations */
 
   if (response)
   {
-    DEBUG_puts("show_classes: request succeeded...");
-
     if (response->request.status.status_code > IPP_OK_CONFLICT)
     {
       _cupsLangPrintf(stderr, "lpstat: %s", cupsLastErrorString());
@@ -1133,8 +1125,6 @@ show_devices(const char  *printers,	/* I - Destinations */
 		};
 
 
-  DEBUG_printf(("show_devices(printers=\"%s\")\n", printers));
-
   if (printers != NULL && !strcmp(printers, "all"))
     printers = NULL;
 
@@ -1181,8 +1171,6 @@ show_devices(const char  *printers,	/* I - Destinations */
 
   if (response)
   {
-    DEBUG_puts("show_devices: request succeeded...");
-
    /*
     * Loop through the printers returned in the list and display
     * their devices...
@@ -1321,10 +1309,6 @@ show_jobs(const char *dests,		/* I - Destinations */
 		};
 
 
-  DEBUG_printf(("show_jobs(dests=\"%s\", users=\"%s\", long_status=%d, "
-                "ranking=%d, which=\"%s\")\n", dests, users, long_status,
-		ranking, which));
-
   if (dests != NULL && !strcmp(dests, "all"))
     dests = NULL;
 
@@ -1570,9 +1554,6 @@ show_printers(const char  *printers,	/* I - Destinations */
 		};
 
 
-  DEBUG_printf(("show_printers(printers=\"%s\", num_dests=%d, dests=%p, "
-                "long_status=%d)\n", printers, num_dests, dests, long_status));
-
   if (printers != NULL && !strcmp(printers, "all"))
     printers = NULL;
 
@@ -1619,8 +1600,6 @@ show_printers(const char  *printers,	/* I - Destinations */
 
   if (response)
   {
-    DEBUG_puts("show_printers: request succeeded...");
-
    /*
     * Loop through the printers returned in the list and display
     * their status...