diff options
89 files changed, 975 insertions, 1042 deletions
diff --git a/backend/Dependencies b/backend/Dependencies index 9dd3c5e1c..ca6ad4023 100644 --- a/backend/Dependencies +++ b/backend/Dependencies @@ -1,8 +1,8 @@ ipp.o: ipp.c backend-private.h ../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/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/snmp-private.h ../cups/backend.h \ ../cups/sidechannel.h ../cups/ppd-private.h ../cups/ppd.h \ @@ -11,23 +11,23 @@ lpd.o: lpd.c ../cups/http-private.h ../config.h ../cups/language.h \ ../cups/array.h ../cups/versioning.h ../cups/http.h \ ../cups/ipp-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \ ../cups/pwg.h backend-private.h ../cups/cups-private.h \ - ../cups/string-private.h ../cups/debug-private.h \ - ../cups/array-private.h ../cups/language-private.h ../cups/transcode.h \ - ../cups/pwg-private.h ../cups/thread-private.h ../cups/snmp-private.h \ - ../cups/backend.h ../cups/sidechannel.h + ../cups/string-private.h ../cups/array-private.h \ + ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \ + ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h \ + ../cups/sidechannel.h dnssd.o: dnssd.c backend-private.h ../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/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/snmp-private.h ../cups/backend.h \ ../cups/sidechannel.h snmp.o: snmp.c backend-private.h ../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/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/snmp-private.h ../cups/backend.h \ ../cups/sidechannel.h @@ -35,13 +35,13 @@ socket.o: socket.c ../cups/http-private.h ../config.h ../cups/language.h \ ../cups/array.h ../cups/versioning.h ../cups/http.h \ ../cups/ipp-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \ ../cups/pwg.h backend-private.h ../cups/cups-private.h \ - ../cups/string-private.h ../cups/debug-private.h \ - ../cups/array-private.h ../cups/language-private.h ../cups/transcode.h \ - ../cups/pwg-private.h ../cups/thread-private.h ../cups/snmp-private.h \ - ../cups/backend.h ../cups/sidechannel.h -test1284.o: test1284.c ../cups/string-private.h ../config.h ieee1284.c \ - backend-private.h ../cups/cups-private.h ../cups/debug-private.h \ - ../cups/versioning.h ../cups/array-private.h ../cups/array.h \ + ../cups/string-private.h ../cups/array-private.h \ + ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \ + ../cups/thread-private.h ../cups/snmp-private.h ../cups/backend.h \ + ../cups/sidechannel.h +test1284.o: test1284.c ../cups/string-private.h ../config.h \ + ../cups/versioning.h ieee1284.c backend-private.h \ + ../cups/cups-private.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 \ @@ -49,23 +49,24 @@ test1284.o: test1284.c ../cups/string-private.h ../config.h ieee1284.c \ ../cups/sidechannel.h ../cups/ppd-private.h ../cups/ppd.h \ ../cups/raster.h testbackend.o: testbackend.c ../cups/string-private.h ../config.h \ - ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \ + ../cups/versioning.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \ ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \ ../cups/sidechannel.h testsupplies.o: testsupplies.c backend-private.h ../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/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/snmp-private.h ../cups/backend.h \ ../cups/sidechannel.h usb.o: usb.c backend-private.h ../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/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/snmp-private.h ../cups/backend.h \ - ../cups/sidechannel.h usb-darwin.c ../cups/file-private.h \ - ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h + ../cups/sidechannel.h usb-darwin.c ../cups/debug-private.h \ + ../cups/file-private.h ../cups/ppd-private.h ../cups/ppd.h \ + ../cups/raster.h diff --git a/backend/ieee1284.c b/backend/ieee1284.c index 5f7719b6c..821315ff3 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -55,19 +55,12 @@ backendGetDeviceID( char *ptr; /* Pointer into device ID */ - DEBUG_printf(("backendGetDeviceID(fd=%d, device_id=%p, device_id_size=%d, " - "make_model=%p, make_model_size=%d, scheme=\"%s\", " - "uri=%p, uri_size=%d)\n", fd, device_id, device_id_size, - make_model, make_model_size, scheme ? scheme : "(null)", - uri, uri_size)); - /* * Range check input... */ if (!device_id || device_id_size < 32) { - DEBUG_puts("backendGetDeviceID: Bad args!"); return (-1); } @@ -211,8 +204,6 @@ backendGetDeviceID( } else { - DEBUG_printf(("backendGetDeviceID: ioctl failed - %s\n", - strerror(errno))); *device_id = '\0'; } # endif /* __linux */ @@ -234,11 +225,6 @@ backendGetDeviceID( else device_id[device_id_size - 1] = '\0'; } -# ifdef DEBUG - else - DEBUG_printf(("backendGetDeviceID: ioctl failed - %s\n", - strerror(errno))); -# endif /* DEBUG */ # endif /* __sun && ECPPIOC_GETDEVID */ } @@ -252,14 +238,10 @@ backendGetDeviceID( *ptr = ' '; else if ((*ptr & 255) < ' ' || *ptr == 127) { - DEBUG_printf(("backendGetDeviceID: Bad device_id character %d.", - *ptr & 255)); *device_id = '\0'; break; } - DEBUG_printf(("backendGetDeviceID: device_id=\"%s\"\n", device_id)); - if (scheme && uri) *uri = '\0'; @@ -365,17 +347,12 @@ backendGetMakeModel( *des; /* Description string */ - DEBUG_printf(("backendGetMakeModel(device_id=\"%s\", make_model=%p, make_model_size=" CUPS_LLFMT ")\n", device_id, make_model, CUPS_LLCAST make_model_size)); - /* * Range check input... */ if (!device_id || !*device_id || !make_model || make_model_size < 32) - { - DEBUG_puts("backendGetMakeModel: Bad args!"); return (-1); - } *make_model = '\0'; diff --git a/berkeley/Dependencies b/berkeley/Dependencies index b115953ba..acb7bd1fd 100644 --- a/berkeley/Dependencies +++ b/berkeley/Dependencies @@ -1,25 +1,24 @@ lpc.o: lpc.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/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 lpq.o: lpq.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/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 lpr.o: lpr.c ../cups/cups-private.h ../cups/string-private.h ../config.h \ - ../cups/debug-private.h ../cups/versioning.h ../cups/array-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 +lprm.o: lprm.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 -lprm.o: lprm.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 diff --git a/berkeley/lpc.c b/berkeley/lpc.c index bfa3c1c40..7ab43ea12 100644 --- a/berkeley/lpc.c +++ b/berkeley/lpc.c @@ -230,8 +230,6 @@ show_status(http_t *http, /* I - HTTP connection to server */ }; - DEBUG_printf(("show_status(http=%p, dests=\"%s\")\n", http, dests)); - if (http == NULL) return; @@ -255,8 +253,6 @@ show_status(http_t *http, /* I - HTTP connection to server */ if ((response = cupsDoRequest(http, request, "/")) != NULL) { - DEBUG_puts("show_status: request succeeded..."); - /* * Loop through the printers returned in the list and display * their status... diff --git a/berkeley/lpq.c b/berkeley/lpq.c index 47220f5d7..7392d59ca 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -348,9 +348,6 @@ show_jobs(const char *command, /* I - Command name */ }; - DEBUG_printf(("show_jobs(http=%p, dest=%p, user=%p, id=%d, longstatus%d)\n", - http, dest, user, id, longstatus)); - if (http == NULL) return (0); diff --git a/cgi-bin/Dependencies b/cgi-bin/Dependencies index 900d59402..d50230446 100644 --- a/cgi-bin/Dependencies +++ b/cgi-bin/Dependencies @@ -1,66 +1,66 @@ help-index.o: help-index.c cgi-private.h cgi.h ../cups/cups.h \ ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \ ../cups/array.h ../cups/language.h ../cups/pwg.h help-index.h \ - ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h \ - ../cups/string-private.h ../config.h ../cups/ipp-private.h \ + ../cups/debug-private.h ../cups/language-private.h ../config.h \ + ../cups/transcode.h ../cups/string-private.h ../cups/ipp-private.h \ ../cups/dir.h html.o: html.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ - ../cups/language-private.h ../cups/transcode.h \ - ../cups/string-private.h ../config.h ../cups/ipp-private.h + ../cups/language-private.h ../config.h ../cups/transcode.h \ + ../cups/string-private.h ../cups/ipp-private.h ipp-var.o: ipp-var.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ - ../cups/language-private.h ../cups/transcode.h \ - ../cups/string-private.h ../config.h ../cups/ipp-private.h + ../cups/language-private.h ../config.h ../cups/transcode.h \ + ../cups/string-private.h ../cups/ipp-private.h search.o: search.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ - ../cups/language-private.h ../cups/transcode.h \ - ../cups/string-private.h ../config.h ../cups/ipp-private.h + ../cups/language-private.h ../config.h ../cups/transcode.h \ + ../cups/string-private.h ../cups/ipp-private.h template.o: template.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ - ../cups/language-private.h ../cups/transcode.h \ - ../cups/string-private.h ../config.h ../cups/ipp-private.h + ../cups/language-private.h ../config.h ../cups/transcode.h \ + ../cups/string-private.h ../cups/ipp-private.h var.o: var.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ - ../cups/language-private.h ../cups/transcode.h \ - ../cups/string-private.h ../config.h ../cups/ipp-private.h + ../cups/language-private.h ../config.h ../cups/transcode.h \ + ../cups/string-private.h ../cups/ipp-private.h admin.o: admin.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ - ../cups/language-private.h ../cups/transcode.h \ - ../cups/string-private.h ../config.h ../cups/ipp-private.h \ - ../cups/http-private.h ../cups/ppd-private.h ../cups/ppd.h \ - ../cups/raster.h ../cups/pwg-private.h ../cups/adminutil.h + ../cups/language-private.h ../config.h ../cups/transcode.h \ + ../cups/string-private.h ../cups/ipp-private.h ../cups/http-private.h \ + ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h \ + ../cups/pwg-private.h ../cups/adminutil.h classes.o: classes.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ - ../cups/language-private.h ../cups/transcode.h \ - ../cups/string-private.h ../config.h ../cups/ipp-private.h + ../cups/language-private.h ../config.h ../cups/transcode.h \ + ../cups/string-private.h ../cups/ipp-private.h help.o: help.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ - ../cups/language-private.h ../cups/transcode.h \ - ../cups/string-private.h ../config.h ../cups/ipp-private.h + ../cups/language-private.h ../config.h ../cups/transcode.h \ + ../cups/string-private.h ../cups/ipp-private.h jobs.o: jobs.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ - ../cups/language-private.h ../cups/transcode.h \ - ../cups/string-private.h ../config.h ../cups/ipp-private.h + ../cups/language-private.h ../config.h ../cups/transcode.h \ + ../cups/string-private.h ../cups/ipp-private.h makedocset.o: makedocset.c cgi-private.h cgi.h ../cups/cups.h \ ../cups/file.h ../cups/versioning.h ../cups/ipp.h ../cups/http.h \ ../cups/array.h ../cups/language.h ../cups/pwg.h help-index.h \ - ../cups/debug-private.h ../cups/language-private.h ../cups/transcode.h \ - ../cups/string-private.h ../config.h ../cups/ipp-private.h + ../cups/debug-private.h ../cups/language-private.h ../config.h \ + ../cups/transcode.h ../cups/string-private.h ../cups/ipp-private.h printers.o: printers.c cgi-private.h cgi.h ../cups/cups.h ../cups/file.h \ ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h ../cups/debug-private.h \ - ../cups/language-private.h ../cups/transcode.h \ - ../cups/string-private.h ../config.h ../cups/ipp-private.h + ../cups/language-private.h ../config.h ../cups/transcode.h \ + ../cups/string-private.h ../cups/ipp-private.h testcgi.o: testcgi.c cgi.h ../cups/cups.h ../cups/file.h \ ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h help-index.h diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c index 5f76d7aa5..a49536d6a 100644 --- a/cgi-bin/help-index.c +++ b/cgi-bin/help-index.c @@ -150,8 +150,6 @@ helpDeleteIndex(help_index_t *hi) /* I - Help index */ help_node_t *node; /* Current node */ - DEBUG_printf(("helpDeleteIndex(hi=%p)", hi)); - if (!hi) return; @@ -182,9 +180,6 @@ helpFindNode(help_index_t *hi, /* I - Index */ help_node_t key; /* Search key */ - DEBUG_printf(("helpFindNode(hi=%p, filename=\"%s\", anchor=\"%s\")", - hi, filename, anchor)); - /* * Range check input... */ @@ -232,9 +227,6 @@ helpLoadIndex(const char *hifile, /* I - Index filename */ help_word_t *word; /* Current word */ - DEBUG_printf(("helpLoadIndex(hifile=\"%s\", directory=\"%s\")", - hifile, directory)); - /* * Create a new, empty index. */ @@ -437,8 +429,6 @@ helpSaveIndex(help_index_t *hi, /* I - Index */ help_word_t *word; /* Current word */ - DEBUG_printf(("helpSaveIndex(hi=%p, hifile=\"%s\")", hi, hifile)); - /* * Try creating a new index file... */ @@ -518,9 +508,6 @@ helpSearchIndex(help_index_t *hi, /* I - Index */ int matches; /* Number of matches */ - DEBUG_printf(("helpSearchIndex(hi=%p, query=\"%s\", filename=\"%s\")", - hi, query, filename)); - /* * Range check... */ @@ -642,8 +629,6 @@ help_add_word(help_node_t *n, /* I - Node */ key; /* Search key */ - DEBUG_printf(("2help_add_word(n=%p, text=\"%s\")", n, text)); - /* * Create the words array as needed... */ @@ -695,8 +680,6 @@ help_delete_node(help_node_t *n) /* I - Node */ help_word_t *w; /* Current word */ - DEBUG_printf(("2help_delete_node(n=%p)", n)); - if (!n) return; @@ -730,8 +713,6 @@ help_delete_node(help_node_t *n) /* I - Node */ static void help_delete_word(help_word_t *w) /* I - Word */ { - DEBUG_printf(("2help_delete_word(w=%p)", w)); - if (!w) return; @@ -761,9 +742,6 @@ help_load_directory( help_node_t *node; /* Current node */ - DEBUG_printf(("2help_load_directory(hi=%p, directory=\"%s\", relative=\"%s\")", - hi, directory, relative)); - /* * Open the directory and scan it... */ @@ -873,9 +851,6 @@ help_load_file( int wordlen; /* Length of word */ - DEBUG_printf(("2help_load_file(hi=%p, filename=\"%s\", relative=\"%s\", " - "mtime=%ld)", hi, filename, relative, (long)mtime)); - if ((fp = cupsFileOpen(filename, "r")) == NULL) return (-1); @@ -1207,10 +1182,6 @@ help_new_node(const char *filename, /* I - Filename */ help_node_t *n; /* Node */ - DEBUG_printf(("2help_new_node(filename=\"%s\", anchor=\"%s\", text=\"%s\", " - "mtime=%ld, offset=%ld, length=%ld)", filename, anchor, text, - (long)mtime, (long)offset, (long)length)); - n = (help_node_t *)calloc(1, sizeof(help_node_t)); if (!n) return (NULL); @@ -1238,10 +1209,6 @@ help_sort_by_name(help_node_t *n1, /* I - First node */ int diff; /* Difference */ - DEBUG_printf(("2help_sort_by_name(n1=%p(%s#%s), n2=%p(%s#%s)", - n1, n1->filename, n1->anchor, - n2, n2->filename, n2->anchor)); - if ((diff = strcmp(n1->filename, n2->filename)) != 0) return (diff); @@ -1267,11 +1234,6 @@ help_sort_by_score(help_node_t *n1, /* I - First node */ int diff; /* Difference */ - DEBUG_printf(("2help_sort_by_score(n1=%p(%d \"%s\" \"%s\"), " - "n2=%p(%d \"%s\" \"%s\")", - n1, n1->score, n1->section, n1->text, - n2, n2->score, n2->section, n2->text)); - if (n1->score != n2->score) return (n2->score - n1->score); @@ -1295,8 +1257,5 @@ static int /* O - Difference */ help_sort_words(help_word_t *w1, /* I - Second word */ help_word_t *w2) /* I - Second word */ { - DEBUG_printf(("2help_sort_words(w1=%p(\"%s\"), w2=%p(\"%s\"))", - w1, w1->text, w2, w2->text)); - return (_cups_strcasecmp(w1->text, w2->text)); } diff --git a/cgi-bin/search.c b/cgi-bin/search.c index ad1f5ed0e..8dc5b32d5 100644 --- a/cgi-bin/search.c +++ b/cgi-bin/search.c @@ -36,8 +36,6 @@ cgiCompileSearch(const char *query) /* I - Query string */ char *lword; /* Last word in query */ - DEBUG_printf(("cgiCompileSearch(query=\"%s\")\n", query)); - /* * Range check input... */ @@ -293,8 +291,6 @@ cgiCompileSearch(const char *query) /* I - Query string */ * Compile the regular expression... */ - DEBUG_printf((" s=\"%s\"\n", s)); - if (regcomp(re, s, REG_EXTENDED | REG_ICASE)) { free(re); diff --git a/cgi-bin/var.c b/cgi-bin/var.c index bf0d98007..316b67f05 100644 --- a/cgi-bin/var.c +++ b/cgi-bin/var.c @@ -222,14 +222,6 @@ cgiGetVariable(const char *name) /* I - Name of variable */ var = cgi_find_variable(name); -#ifdef DEBUG - if (var == NULL) - DEBUG_printf(("cgiGetVariable(\"%s\") is returning NULL...\n", name)); - else - DEBUG_printf(("cgiGetVariable(\"%s\") is returning \"%s\"...\n", name, - var->values[var->nvalues - 1])); -#endif /* DEBUG */ - return ((var == NULL) ? NULL : _cupsStrRetain(var->values[var->nvalues - 1])); } @@ -534,9 +526,6 @@ cgi_add_variable(const char *name, /* I - Variable name */ if (name == NULL || value == NULL || element < 0 || element > 100000) return; - DEBUG_printf(("cgi_add_variable: Adding variable \'%s\' with value " - "\'%s\'...\n", name, value)); - if (form_count >= form_alloc) { _cgi_var_t *temp_vars; /* Temporary form pointer */ @@ -715,8 +704,6 @@ cgi_initialize_get(void) char *data; /* Pointer to form data string */ - DEBUG_puts("cgi_initialize_get: Initializing variables using GET method..."); - /* * Check to see if there is anything for us to read... */ @@ -756,8 +743,6 @@ cgi_initialize_multipart( size_t blen; /* Length of boundary string */ - DEBUG_printf(("cgi_initialize_multipart(boundary=\"%s\")\n", boundary)); - /* * Read multipart form data until we run out... */ @@ -970,8 +955,6 @@ cgi_initialize_post(void) int status; /* Return status */ - DEBUG_puts("cgi_initialize_post: Initializing variables using POST method..."); - /* * Check to see if there is anything for us to read... */ @@ -1234,26 +1217,11 @@ cgi_set_sid(void) static void cgi_sort_variables(void) { -#ifdef DEBUG - int i; - - - DEBUG_puts("cgi_sort_variables: Sorting variables..."); -#endif /* DEBUG */ - if (form_count < 2) return; qsort(form_vars, (size_t)form_count, sizeof(_cgi_var_t), (int (*)(const void *, const void *))cgi_compare_variables); - -#ifdef DEBUG - DEBUG_puts("cgi_sort_variables: Sorted variable list is:"); - for (i = 0; i < form_count; i ++) - DEBUG_printf(("cgi_sort_variables: %d: %s (%d) = \"%s\" ...\n", i, - form_vars[i].name, form_vars[i].nvalues, - form_vars[i].values[0])); -#endif /* DEBUG */ } diff --git a/cups/Dependencies b/cups/Dependencies index 485db0be8..7f71eaa25 100644 --- a/cups/Dependencies +++ b/cups/Dependencies @@ -1,327 +1,403 @@ adminutil.o: adminutil.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h ppd.h raster.h adminutil.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h ppd.h cups.h raster.h adminutil.h array.o: array.c ../cups/cups.h file.h versioning.h ipp.h http.h array.h \ - language.h pwg.h string-private.h ../config.h debug-private.h \ - array-private.h + language.h pwg.h string-private.h ../config.h ../cups/versioning.h \ + debug-internal.h debug-private.h array-private.h ../cups/array.h auth.o: auth.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h backchannel.o: backchannel.c cups.h file.h versioning.h ipp.h http.h \ array.h language.h pwg.h backend.o: backend.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h backend.h ppd.h raster.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + backend.h ppd.h cups.h raster.h debug.o: debug.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h dest.o: dest.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h dest-job.o: dest-job.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h dest-localization.o: dest-localization.c cups-private.h string-private.h \ - ../config.h debug-private.h ../cups/versioning.h array-private.h \ - ../cups/array.h ipp-private.h ../cups/cups.h file.h ipp.h http.h \ - language.h pwg.h http-private.h language-private.h ../cups/transcode.h \ - pwg-private.h thread-private.h + ../config.h ../cups/versioning.h array-private.h ../cups/array.h \ + versioning.h ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h \ + language.h pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h dest-options.o: dest-options.c cups-private.h string-private.h \ - ../config.h debug-private.h ../cups/versioning.h array-private.h \ - ../cups/array.h ipp-private.h ../cups/cups.h file.h ipp.h http.h \ - language.h pwg.h http-private.h language-private.h ../cups/transcode.h \ - pwg-private.h thread-private.h -dir.o: dir.c string-private.h ../config.h debug-private.h \ - ../cups/versioning.h dir.h + ../config.h ../cups/versioning.h array-private.h ../cups/array.h \ + versioning.h ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h \ + language.h pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h +dir.o: dir.c string-private.h ../config.h ../cups/versioning.h \ + debug-internal.h debug-private.h dir.h versioning.h encode.o: encode.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h file.o: file.c file-private.h cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h getdevices.o: getdevices.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h adminutil.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h adminutil.h cups.h getifaddrs.o: getifaddrs.c http-private.h ../config.h ../cups/language.h \ array.h versioning.h ../cups/http.h ipp-private.h ../cups/cups.h \ - file.h ipp.h pwg.h + file.h ipp.h http.h language.h pwg.h getputfile.o: getputfile.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h globals.o: globals.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h hash.o: hash.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h http.o: http.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h http-addr.o: http-addr.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h http-addrlist.o: http-addrlist.c cups-private.h string-private.h \ - ../config.h debug-private.h ../cups/versioning.h array-private.h \ - ../cups/array.h ipp-private.h ../cups/cups.h file.h ipp.h http.h \ - language.h pwg.h http-private.h language-private.h ../cups/transcode.h \ - pwg-private.h thread-private.h + ../config.h ../cups/versioning.h array-private.h ../cups/array.h \ + versioning.h ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h \ + language.h pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h http-support.o: http-support.c cups-private.h string-private.h \ - ../config.h debug-private.h ../cups/versioning.h array-private.h \ - ../cups/array.h ipp-private.h ../cups/cups.h file.h ipp.h http.h \ - language.h pwg.h http-private.h language-private.h ../cups/transcode.h \ - pwg-private.h thread-private.h -ipp.o: ipp.c cups-private.h string-private.h ../config.h debug-private.h \ - ../cups/versioning.h array-private.h ../cups/array.h ipp-private.h \ - ../cups/cups.h file.h ipp.h http.h language.h pwg.h http-private.h \ - language-private.h ../cups/transcode.h pwg-private.h thread-private.h + ../config.h ../cups/versioning.h array-private.h ../cups/array.h \ + versioning.h ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h \ + language.h pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h +ipp.o: ipp.c cups-private.h string-private.h ../config.h \ + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h ipp-file.o: ipp-file.c ipp-private.h ../cups/cups.h file.h versioning.h \ ipp.h http.h array.h language.h pwg.h string-private.h ../config.h \ - debug-private.h + ../cups/versioning.h debug-internal.h debug-private.h ipp-vars.o: ipp-vars.c ../cups/cups.h file.h versioning.h ipp.h http.h \ - array.h language.h pwg.h ipp-private.h string-private.h ../config.h + array.h language.h pwg.h ipp-private.h string-private.h ../config.h \ + ../cups/versioning.h debug-internal.h debug-private.h ipp-support.o: ipp-support.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h langprintf.o: langprintf.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h language.o: language.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h -md5.o: md5.c md5-private.h string-private.h ../config.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h +md5.o: md5.c md5-internal.h ../cups/versioning.h string-private.h \ + ../config.h md5passwd.o: md5passwd.c ../cups/cups.h file.h versioning.h ipp.h http.h \ - array.h language.h pwg.h http-private.h ../config.h ipp-private.h \ - string-private.h + array.h language.h pwg.h http-private.h ../config.h ../cups/language.h \ + ../cups/http.h ipp-private.h string-private.h ../cups/versioning.h notify.o: notify.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h options.o: options.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h -ppd.o: ppd.c cups-private.h string-private.h ../config.h debug-private.h \ - ../cups/versioning.h array-private.h ../cups/array.h ipp-private.h \ - ../cups/cups.h file.h ipp.h http.h language.h pwg.h http-private.h \ - language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ - ppd-private.h ../cups/ppd.h raster.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h +ppd.o: ppd.c cups-private.h string-private.h ../config.h \ + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + ppd-private.h ../cups/ppd.h cups.h raster.h debug-internal.h \ + debug-private.h ppd-attr.o: ppd-attr.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h ppd-private.h ../cups/ppd.h raster.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + ppd-private.h ../cups/ppd.h cups.h raster.h debug-internal.h \ + debug-private.h ppd-cache.o: ppd-cache.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h ppd-private.h ../cups/ppd.h raster.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + ppd-private.h ../cups/ppd.h cups.h raster.h debug-internal.h \ + debug-private.h ppd-conflicts.o: ppd-conflicts.c cups-private.h string-private.h \ - ../config.h debug-private.h ../cups/versioning.h array-private.h \ - ../cups/array.h ipp-private.h ../cups/cups.h file.h ipp.h http.h \ - language.h pwg.h http-private.h language-private.h ../cups/transcode.h \ - pwg-private.h thread-private.h ppd-private.h ../cups/ppd.h raster.h + ../config.h ../cups/versioning.h array-private.h ../cups/array.h \ + versioning.h ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h \ + language.h pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + ppd-private.h ../cups/ppd.h cups.h raster.h debug-internal.h \ + debug-private.h ppd-custom.o: ppd-custom.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h ppd-private.h ../cups/ppd.h raster.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + ppd-private.h ../cups/ppd.h cups.h raster.h debug-internal.h \ + debug-private.h ppd-emit.o: ppd-emit.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h ppd.h raster.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h ppd.h cups.h raster.h ppd-localize.o: ppd-localize.c cups-private.h string-private.h \ - ../config.h debug-private.h ../cups/versioning.h array-private.h \ - ../cups/array.h ipp-private.h ../cups/cups.h file.h ipp.h http.h \ - language.h pwg.h http-private.h language-private.h ../cups/transcode.h \ - pwg-private.h thread-private.h ppd-private.h ../cups/ppd.h raster.h + ../config.h ../cups/versioning.h array-private.h ../cups/array.h \ + versioning.h ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h \ + language.h pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + ppd-private.h ../cups/ppd.h cups.h raster.h debug-internal.h \ + debug-private.h ppd-mark.o: ppd-mark.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h ppd-private.h ../cups/ppd.h raster.h -ppd-page.o: ppd-page.c string-private.h ../config.h debug-private.h \ - ../cups/versioning.h ppd.h cups.h file.h ipp.h http.h array.h \ - language.h pwg.h raster.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + ppd-private.h ../cups/ppd.h cups.h raster.h debug-internal.h \ + debug-private.h +ppd-page.o: ppd-page.c string-private.h ../config.h ../cups/versioning.h \ + debug-internal.h debug-private.h ppd.h cups.h file.h versioning.h \ + ipp.h http.h array.h language.h pwg.h raster.h ppd-util.o: ppd-util.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h ppd-private.h ../cups/ppd.h raster.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + ppd-private.h ../cups/ppd.h cups.h raster.h debug-internal.h \ + debug-private.h pwg-media.o: pwg-media.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h +raster-error.o: raster-error.c cups-private.h string-private.h \ + ../config.h ../cups/versioning.h array-private.h ../cups/array.h \ + versioning.h ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h \ + language.h pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + raster-private.h raster.h cups.h ../cups/debug-private.h \ + ../cups/string-private.h debug-internal.h debug-private.h +raster-interpret.o: raster-interpret.c ../cups/raster-private.h raster.h \ + cups.h file.h versioning.h ipp.h http.h array.h language.h pwg.h \ + ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h \ + ../cups/string-private.h ../config.h ../cups/ppd-private.h \ + ../cups/ppd.h pwg-private.h debug-internal.h debug-private.h +raster-stream.o: raster-stream.c raster-private.h raster.h cups.h file.h \ + versioning.h ipp.h http.h array.h language.h pwg.h ../cups/cups.h \ + ../cups/debug-private.h ../cups/versioning.h ../cups/string-private.h \ + ../config.h debug-internal.h debug-private.h request.o: request.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h sidechannel.o: sidechannel.c sidechannel.h versioning.h cups-private.h \ - string-private.h ../config.h debug-private.h array-private.h \ + string-private.h ../config.h ../cups/versioning.h array-private.h \ ../cups/array.h ipp-private.h ../cups/cups.h file.h ipp.h http.h \ - language.h pwg.h http-private.h language-private.h ../cups/transcode.h \ - pwg-private.h thread-private.h + array.h language.h pwg.h http-private.h ../cups/language.h \ + ../cups/http.h language-private.h ../cups/transcode.h pwg-private.h \ + thread-private.h debug-internal.h debug-private.h snmp.o: snmp.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h snmp-private.h -snprintf.o: snprintf.c string-private.h ../config.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + snmp-private.h debug-internal.h debug-private.h +snprintf.o: snprintf.c string-private.h ../config.h ../cups/versioning.h string.o: string.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h tempfile.o: tempfile.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h thread.o: thread.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h -tls.o: tls.c cups-private.h string-private.h ../config.h debug-private.h \ - ../cups/versioning.h array-private.h ../cups/array.h ipp-private.h \ - ../cups/cups.h file.h ipp.h http.h language.h pwg.h http-private.h \ - language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ - tls-darwin.c + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h +tls.o: tls.c cups-private.h string-private.h ../config.h \ + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h tls-darwin.c transcode.o: transcode.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h usersys.o: usersys.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h util.o: util.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h -error.o: error.c ../cups/raster-private.h raster.h cups.h file.h \ - versioning.h ipp.h http.h array.h language.h pwg.h \ - ../cups/debug-private.h ../cups/string-private.h ../config.h -interpret.o: interpret.c ../cups/raster-private.h raster.h cups.h file.h \ - versioning.h ipp.h http.h array.h language.h pwg.h \ - ../cups/debug-private.h ../cups/string-private.h ../config.h \ - ../cups/ppd.h -raster.o: raster.c ../cups/raster-private.h raster.h cups.h file.h \ - versioning.h ipp.h http.h array.h language.h pwg.h \ - ../cups/debug-private.h ../cups/string-private.h ../config.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + debug-internal.h debug-private.h +raster-interstub.o: raster-interstub.c ../cups/ppd-private.h \ + ../cups/cups.h file.h versioning.h ipp.h http.h array.h language.h \ + pwg.h ../cups/ppd.h cups.h raster.h pwg-private.h +raster-stubs.o: raster-stubs.c raster-private.h raster.h cups.h file.h \ + versioning.h ipp.h http.h array.h language.h pwg.h ../cups/cups.h \ + ../cups/debug-private.h ../cups/versioning.h ../cups/string-private.h \ + ../config.h rasterbench.o: rasterbench.c ../config.h ../cups/raster.h cups.h file.h \ versioning.h ipp.h http.h array.h language.h pwg.h testadmin.o: testadmin.c adminutil.h cups.h file.h versioning.h ipp.h \ - http.h array.h language.h pwg.h string-private.h ../config.h -testarray.o: testarray.c string-private.h ../config.h debug-private.h \ - ../cups/versioning.h array-private.h ../cups/array.h dir.h + http.h array.h language.h pwg.h string-private.h ../config.h \ + ../cups/versioning.h +testarray.o: testarray.c string-private.h ../config.h \ + ../cups/versioning.h debug-private.h array-private.h ../cups/array.h \ + versioning.h dir.h testcache.o: testcache.c ppd-private.h ../cups/cups.h file.h versioning.h \ - ipp.h http.h array.h language.h pwg.h ../cups/ppd.h raster.h \ + ipp.h http.h array.h language.h pwg.h ../cups/ppd.h cups.h raster.h \ pwg-private.h file-private.h cups-private.h string-private.h \ - ../config.h debug-private.h array-private.h ipp-private.h \ - http-private.h language-private.h ../cups/transcode.h thread-private.h -testclient.o: testclient.c ../cups/cups.h file.h versioning.h ipp.h \ - http.h array.h language.h pwg.h ../cups/raster.h \ - ../cups/string-private.h ../config.h ../cups/thread-private.h + ../config.h ../cups/versioning.h array-private.h ../cups/array.h \ + ipp-private.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h thread-private.h +testclient.o: testclient.c ../config.h ../cups/cups.h file.h versioning.h \ + ipp.h http.h array.h language.h pwg.h ../cups/raster.h cups.h \ + ../cups/string-private.h ../cups/versioning.h ../cups/thread-private.h testconflicts.o: testconflicts.c cups.h file.h versioning.h ipp.h http.h \ - array.h language.h pwg.h ppd.h raster.h string-private.h ../config.h + array.h language.h pwg.h ppd.h raster.h string-private.h ../config.h \ + ../cups/versioning.h testcreds.o: testcreds.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h testcups.o: testcups.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h ppd.h raster.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + ppd.h cups.h raster.h testdest.o: testdest.c cups.h file.h versioning.h ipp.h http.h array.h \ language.h pwg.h -testfile.o: testfile.c string-private.h ../config.h debug-private.h \ - ../cups/versioning.h file.h +testfile.o: testfile.c string-private.h ../config.h ../cups/versioning.h \ + debug-private.h file.h versioning.h testgetdests.o: testgetdests.c cups.h file.h versioning.h ipp.h http.h \ array.h language.h pwg.h testhttp.o: testhttp.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h -testi18n.o: testi18n.c string-private.h ../config.h language-private.h \ - ../cups/transcode.h language.h array.h versioning.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h +testi18n.o: testi18n.c string-private.h ../config.h ../cups/versioning.h \ + language-private.h ../cups/transcode.h language.h array.h versioning.h testipp.o: testipp.c file.h versioning.h string-private.h ../config.h \ - ipp-private.h ../cups/cups.h ipp.h http.h array.h language.h pwg.h + ../cups/versioning.h ipp-private.h ../cups/cups.h ipp.h http.h array.h \ + language.h pwg.h testoptions.o: testoptions.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h testlang.o: testlang.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h ppd-private.h ../cups/ppd.h raster.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + ppd-private.h ../cups/ppd.h cups.h raster.h testppd.o: testppd.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h ppd-private.h ../cups/ppd.h raster.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + ppd-private.h ../cups/ppd.h cups.h raster.h raster-private.h \ + ../cups/debug-private.h ../cups/string-private.h testpwg.o: testpwg.c ppd-private.h ../cups/cups.h file.h versioning.h \ - ipp.h http.h array.h language.h pwg.h ../cups/ppd.h raster.h \ + ipp.h http.h array.h language.h pwg.h ../cups/ppd.h cups.h raster.h \ pwg-private.h file-private.h cups-private.h string-private.h \ - ../config.h debug-private.h array-private.h ipp-private.h \ - http-private.h language-private.h ../cups/transcode.h thread-private.h + ../config.h ../cups/versioning.h array-private.h ../cups/array.h \ + ipp-private.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h thread-private.h testraster.o: testraster.c ../cups/raster-private.h raster.h cups.h \ file.h versioning.h ipp.h http.h array.h language.h pwg.h \ - ../cups/debug-private.h ../cups/string-private.h ../config.h \ - ../cups/ppd.h + ../cups/cups.h ../cups/debug-private.h ../cups/versioning.h \ + ../cups/string-private.h ../config.h testsnmp.o: testsnmp.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h snmp-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h \ + snmp-private.h tlscheck.o: tlscheck.c cups-private.h string-private.h ../config.h \ - debug-private.h ../cups/versioning.h array-private.h ../cups/array.h \ - ipp-private.h ../cups/cups.h file.h ipp.h http.h language.h pwg.h \ - http-private.h language-private.h ../cups/transcode.h pwg-private.h \ - thread-private.h + ../cups/versioning.h array-private.h ../cups/array.h versioning.h \ + ipp-private.h ../cups/cups.h file.h ipp.h http.h array.h language.h \ + pwg.h http-private.h ../cups/language.h ../cups/http.h \ + language-private.h ../cups/transcode.h pwg-private.h thread-private.h diff --git a/cups/adminutil.c b/cups/adminutil.c index 8970a06ac..97df57977 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -12,6 +12,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include "ppd.h" #include "adminutil.h" #include <fcntl.h> diff --git a/cups/array.c b/cups/array.c index b2ec00104..860cb4636 100644 --- a/cups/array.c +++ b/cups/array.c @@ -13,7 +13,7 @@ #include <cups/cups.h> #include "string-private.h" -#include "debug-private.h" +#include "debug-internal.h" #include "array-private.h" diff --git a/cups/auth.c b/cups/auth.c index 499950d22..4c509bbc7 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -15,6 +15,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <fcntl.h> #include <sys/stat.h> #if defined(_WIN32) || defined(__EMX__) diff --git a/cups/cups-private.h b/cups/cups-private.h index 451254ba4..2b363e6d6 100644 --- a/cups/cups-private.h +++ b/cups/cups-private.h @@ -16,7 +16,6 @@ */ # include "string-private.h" -# include "debug-private.h" # include "array-private.h" # include "ipp-private.h" # include "http-private.h" @@ -240,7 +239,7 @@ extern void _cupsAppleSetUseLastPrinter(int uselast) _CUPS_PRIVATE; extern char *_cupsBufferGet(size_t size) _CUPS_PRIVATE; extern void _cupsBufferRelease(char *b) _CUPS_PRIVATE; -extern http_t *_cupsConnect(void) _CUPS_INTERNAL; +extern http_t *_cupsConnect(void) _CUPS_PRIVATE; extern char *_cupsCreateDest(const char *name, const char *info, const char *device_id, const char *device_uri, char *uri, size_t urisize) _CUPS_PRIVATE; extern ipp_attribute_t *_cupsEncodeOption(ipp_t *ipp, ipp_tag_t group_tag, _ipp_option_t *map, const char *name, const char *value) _CUPS_PRIVATE; extern int _cupsGet1284Values(const char *device_id, cups_option_t **values) _CUPS_PRIVATE; diff --git a/cups/debug-internal.h b/cups/debug-internal.h new file mode 100644 index 000000000..2b57854e9 --- /dev/null +++ b/cups/debug-internal.h @@ -0,0 +1,84 @@ +/* + * Internal debugging macros for CUPS. + * + * Copyright © 2007-2018 by Apple Inc. + * Copyright © 1997-2005 by Easy Software Products. + * + * Licensed under Apache License v2.0. See the file "LICENSE" for more + * information. + */ + +#ifndef _CUPS_DEBUG_INTERNAL_H_ +# define _CUPS_DEBUG_INTERNAL_H_ + + +/* + * Include necessary headers... + */ + +# include "debug-private.h" + + +/* + * C++ magic... + */ + +# ifdef __cplusplus +extern "C" { +# endif /* __cplusplus */ + + +/* + * The debug macros are used if you compile with DEBUG defined. + * + * Usage: + * + * DEBUG_puts("string") + * DEBUG_printf(("format string", arg, arg, ...)); + * + * Note the extra parenthesis around the DEBUG_printf macro... + * + * Newlines are not required on the end of messages, as both add one when + * writing the output. + * + * If the first character is a digit, then it represents the "log level" of the + * message from 0 to 9. The default level is 1. The following defines the + * current levels we use: + * + * 0 = public APIs, other than value accessor functions + * 1 = return values for public APIs + * 2 = public value accessor APIs, progress for public APIs + * 3 = return values for value accessor APIs + * 4 = private APIs, progress for value accessor APIs + * 5 = return values for private APIs + * 6 = progress for private APIs + * 7 = static functions + * 8 = return values for static functions + * 9 = progress for static functions + */ + +# ifdef DEBUG +# define DEBUG_puts(x) _cups_debug_puts(x) +# define DEBUG_printf(x) _cups_debug_printf x +# else +# define DEBUG_puts(x) +# define DEBUG_printf(x) +# endif /* DEBUG */ + + +/* + * Prototypes... + */ + +# ifdef DEBUG +extern int _cups_debug_fd _CUPS_INTERNAL; +extern int _cups_debug_level _CUPS_INTERNAL; +extern void _cups_debug_printf(const char *format, ...) _CUPS_FORMAT(1,2) _CUPS_INTERNAL; +extern void _cups_debug_puts(const char *s) _CUPS_INTERNAL; +# endif /* DEBUG */ + +# ifdef __cplusplus +} +# endif /* __cplusplus */ + +#endif /* !_CUPS_DEBUG_INTERNAL_H_ */ diff --git a/cups/debug-private.h b/cups/debug-private.h index 8d58e224b..fb84a2f74 100644 --- a/cups/debug-private.h +++ b/cups/debug-private.h @@ -1,5 +1,5 @@ /* - * Private debugging macros for CUPS. + * Private debugging APIs for CUPS. * * Copyright © 2007-2018 by Apple Inc. * Copyright © 1997-2005 by Easy Software Products. @@ -33,42 +33,17 @@ extern "C" { * * Usage: * - * DEBUG_puts("string") - * DEBUG_printf(("format string", arg, arg, ...)); - * - * Note the extra parenthesis around the DEBUG_printf macro... - * - * Newlines are not required on the end of messages, as both add one when - * writing the output. - * - * If the first character is a digit, then it represents the "log level" of the - * message from 0 to 9. The default level is 1. The following defines the - * current levels we use: - * - * 0 = public APIs, other than value accessor functions - * 1 = return values for public APIs - * 2 = public value accessor APIs, progress for public APIs - * 3 = return values for value accessor APIs - * 4 = private APIs, progress for value accessor APIs - * 5 = return values for private APIs - * 6 = progress for private APIs - * 7 = static functions - * 8 = return values for static functions - * 9 = progress for static functions + * DEBUG_set("logfile", "level", "filter", 1) * * The DEBUG_set macro allows an application to programmatically enable (or * disable) debug logging. The arguments correspond to the CUPS_DEBUG_LOG, - * CUPS_DEBUG_LEVEL, and CUPS_DEBUG_FILTER environment variables. + * CUPS_DEBUG_LEVEL, and CUPS_DEBUG_FILTER environment variables. The 1 on the + * end forces the values to override the environment. */ # ifdef DEBUG -# define DEBUG_puts(x) _cups_debug_puts(x) -# define DEBUG_printf(x) _cups_debug_printf x # define DEBUG_set(logfile,level,filter) _cups_debug_set(logfile,level,filter,1) # else -# define DLLExport -# define DEBUG_puts(x) -# define DEBUG_printf(x) # define DEBUG_set(logfile,level,filter) # endif /* DEBUG */ @@ -77,14 +52,7 @@ extern "C" { * Prototypes... */ -# ifdef DEBUG -extern int _cups_debug_fd _CUPS_PRIVATE; -extern int _cups_debug_level _CUPS_PRIVATE; -extern void _cups_debug_printf(const char *format, ...) _CUPS_FORMAT(1,2) _CUPS_PRIVATE; -extern void _cups_debug_puts(const char *s) _CUPS_PRIVATE; extern void _cups_debug_set(const char *logfile, const char *level, const char *filter, int force) _CUPS_PRIVATE; -# endif /* DEBUG */ - # ifdef _WIN32 extern int _cups_gettimeofday(struct timeval *tv, void *tz) _CUPS_PRIVATE; # define gettimeofday(a,b) _cups_gettimeofday(a, b) diff --git a/cups/debug.c b/cups/debug.c index 372c3a391..b18953dab 100644 --- a/cups/debug.c +++ b/cups/debug.c @@ -1,9 +1,10 @@ /* * Debugging functions for CUPS. * - * Copyright 2008-2015 by Apple Inc. + * Copyright © 2008-2018 by Apple Inc. * - * Licensed under Apache License v2.0. See the file "LICENSE" for more information. + * Licensed under Apache License v2.0. See the file "LICENSE" for more + * information. */ /* @@ -11,6 +12,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include "thread-private.h" #ifdef _WIN32 # include <sys/timeb.h> diff --git a/cups/dest-job.c b/cups/dest-job.c index 403a1cf9a..f4e5b335c 100644 --- a/cups/dest-job.c +++ b/cups/dest-job.c @@ -11,6 +11,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" /* diff --git a/cups/dest-localization.c b/cups/dest-localization.c index de272e1e7..67d01f496 100644 --- a/cups/dest-localization.c +++ b/cups/dest-localization.c @@ -11,6 +11,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" /* diff --git a/cups/dest-options.c b/cups/dest-options.c index e31339158..308ee3359 100644 --- a/cups/dest-options.c +++ b/cups/dest-options.c @@ -12,6 +12,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" /* diff --git a/cups/dest.c b/cups/dest.c index 951ebf120..9b7ccbd33 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -13,6 +13,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <sys/stat.h> #ifdef HAVE_NOTIFY_H diff --git a/cups/dir.c b/cups/dir.c index 798e4e8b9..184aa7c19 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -14,7 +14,7 @@ */ #include "string-private.h" -#include "debug-private.h" +#include "debug-internal.h" #include "dir.h" diff --git a/cups/encode.c b/cups/encode.c index 04058b565..bda910be7 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -13,6 +13,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" /* diff --git a/cups/file.c b/cups/file.c index 759f6dc5d..324abe26d 100644 --- a/cups/file.c +++ b/cups/file.c @@ -18,6 +18,7 @@ */ #include "file-private.h" +#include "debug-internal.h" #include <sys/stat.h> #include <sys/types.h> diff --git a/cups/getdevices.c b/cups/getdevices.c index 4981fd896..de2186f5f 100644 --- a/cups/getdevices.c +++ b/cups/getdevices.c @@ -11,6 +11,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include "adminutil.h" diff --git a/cups/getputfile.c b/cups/getputfile.c index 4e9589315..818d5e9f6 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -13,6 +13,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <fcntl.h> #include <sys/stat.h> #if defined(_WIN32) || defined(__EMX__) diff --git a/cups/hash.c b/cups/hash.c index bbaddd4d0..68c9d4e25 100644 --- a/cups/hash.c +++ b/cups/hash.c @@ -17,7 +17,7 @@ #elif defined(HAVE_GNUTLS) # include <gnutls/crypto.h> #else -# include "md5-private.h" +# include "md5-internal.h" #endif /* __APPLE__ */ diff --git a/cups/http-addr.c b/cups/http-addr.c index e4deed34e..677c7a682 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -12,6 +12,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <sys/stat.h> #ifdef HAVE_RESOLV_H # include <resolv.h> diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index ea2021ce6..485c6f43d 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -13,6 +13,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #ifdef HAVE_RESOLV_H # include <resolv.h> #endif /* HAVE_RESOLV_H */ diff --git a/cups/http-support.c b/cups/http-support.c index eebba9906..6d8607140 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -13,6 +13,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #ifdef HAVE_DNSSD # include <dns_sd.h> # ifdef _WIN32 diff --git a/cups/http.c b/cups/http.c index 734f9027a..df9b7bdd6 100644 --- a/cups/http.c +++ b/cups/http.c @@ -16,6 +16,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <fcntl.h> #include <math.h> #ifdef _WIN32 diff --git a/cups/ipp-file.c b/cups/ipp-file.c index 8fd53dc2a..a0b2bb0c3 100644 --- a/cups/ipp-file.c +++ b/cups/ipp-file.c @@ -14,7 +14,7 @@ #include "ipp-private.h" #include "string-private.h" -#include "debug-private.h" +#include "debug-internal.h" /* diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 23646e348..d45ec0c9c 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -13,6 +13,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" /* diff --git a/cups/ipp-vars.c b/cups/ipp-vars.c index 8d2ed7aa9..58efaaddf 100644 --- a/cups/ipp-vars.c +++ b/cups/ipp-vars.c @@ -15,6 +15,7 @@ #include <cups/cups.h> #include "ipp-private.h" #include "string-private.h" +#include "debug-internal.h" /* diff --git a/cups/ipp.c b/cups/ipp.c index 06fdc69b3..d96f77404 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -13,6 +13,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <regex.h> #ifdef _WIN32 # include <io.h> diff --git a/cups/langprintf.c b/cups/langprintf.c index ff07eea69..bbcbb8916 100644 --- a/cups/langprintf.c +++ b/cups/langprintf.c @@ -12,6 +12,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" /* diff --git a/cups/language-private.h b/cups/language-private.h index 285ad19f8..dba1d8511 100644 --- a/cups/language-private.h +++ b/cups/language-private.h @@ -63,7 +63,7 @@ extern const char *_cupsAppleLanguage(const char *locale, char *language, size_t extern const char *_cupsAppleLocale(CFStringRef languageName, char *locale, size_t localesize) _CUPS_PRIVATE; # endif /* __APPLE__ */ extern void _cupsCharmapFlush(void) _CUPS_INTERNAL; -extern const char *_cupsEncodingName(cups_encoding_t encoding) _CUPS_INTERNAL; +extern const char *_cupsEncodingName(cups_encoding_t encoding) _CUPS_PRIVATE; extern void _cupsLangPrintError(const char *prefix, const char *message) _CUPS_PRIVATE; extern int _cupsLangPrintFilter(FILE *fp, const char *prefix, const char *message, ...) _CUPS_FORMAT(3, 4) _CUPS_PRIVATE; extern int _cupsLangPrintf(FILE *fp, const char *message, ...) _CUPS_FORMAT(2, 3) _CUPS_PRIVATE; diff --git a/cups/language.c b/cups/language.c index 7c848c09c..6638ebc78 100644 --- a/cups/language.c +++ b/cups/language.c @@ -12,6 +12,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #ifdef HAVE_LANGINFO_H # include <langinfo.h> #endif /* HAVE_LANGINFO_H */ diff --git a/cups/md5-private.h b/cups/md5-internal.h index d98132ff8..2cbf78b0e 100644 --- a/cups/md5-private.h +++ b/cups/md5-internal.h @@ -44,8 +44,8 @@ 1999-05-03 lpd Original version. */ -#ifndef _CUPS_MD5_PRIVATE_H_ -# define _CUPS_MD5_PRIVATE_H_ +#ifndef _CUPS_MD5_INTERNAL_H_ +# define _CUPS_MD5_INTERNAL_H_ # include <cups/versioning.h> @@ -61,15 +61,15 @@ extern "C" { # endif /* __cplusplus */ /* Initialize the algorithm. */ -void _cupsMD5Init(_cups_md5_state_t *pms) _CUPS_PRIVATE; +void _cupsMD5Init(_cups_md5_state_t *pms) _CUPS_INTERNAL; /* Append a string to the message. */ -void _cupsMD5Append(_cups_md5_state_t *pms, const unsigned char *data, int nbytes) _CUPS_PRIVATE; +void _cupsMD5Append(_cups_md5_state_t *pms, const unsigned char *data, int nbytes) _CUPS_INTERNAL; /* Finish the message and return the digest. */ -void _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]) _CUPS_PRIVATE; +void _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]) _CUPS_INTERNAL; # ifdef __cplusplus } /* end extern "C" */ # endif /* __cplusplus */ -#endif /* !_CUPS_MD5_PRIVATE_H_ */ +#endif /* !_CUPS_MD5_INTERNAL_H_ */ diff --git a/cups/md5.c b/cups/md5.c index d5057bf19..c3b2768dd 100644 --- a/cups/md5.c +++ b/cups/md5.c @@ -40,7 +40,7 @@ 1999-05-03 lpd Original version. */ -#include "md5-private.h" +#include "md5-internal.h" #include "string-private.h" #if !defined(__APPLE__) && !defined(HAVE_GNUTLS) diff --git a/cups/notify.c b/cups/notify.c index fd7460a56..590962c76 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -12,6 +12,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" /* diff --git a/cups/options.c b/cups/options.c index 15687bf01..11814c9af 100644 --- a/cups/options.c +++ b/cups/options.c @@ -12,6 +12,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" /* diff --git a/cups/ppd-attr.c b/cups/ppd-attr.c index 96bbfd04d..982f901a6 100644 --- a/cups/ppd-attr.c +++ b/cups/ppd-attr.c @@ -14,6 +14,7 @@ #include "cups-private.h" #include "ppd-private.h" +#include "debug-internal.h" /* diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c index 62a76eb09..e4920a9d2 100644 --- a/cups/ppd-cache.c +++ b/cups/ppd-cache.c @@ -13,6 +13,7 @@ #include "cups-private.h" #include "ppd-private.h" +#include "debug-internal.h" #include <math.h> diff --git a/cups/ppd-conflicts.c b/cups/ppd-conflicts.c index 21797f11f..ffbacadca 100644 --- a/cups/ppd-conflicts.c +++ b/cups/ppd-conflicts.c @@ -16,6 +16,7 @@ #include "cups-private.h" #include "ppd-private.h" +#include "debug-internal.h" /* diff --git a/cups/ppd-custom.c b/cups/ppd-custom.c index a4cec7d4f..8cdd7c822 100644 --- a/cups/ppd-custom.c +++ b/cups/ppd-custom.c @@ -16,6 +16,7 @@ #include "cups-private.h" #include "ppd-private.h" +#include "debug-internal.h" /* diff --git a/cups/ppd-emit.c b/cups/ppd-emit.c index d2b58520c..6d0538941 100644 --- a/cups/ppd-emit.c +++ b/cups/ppd-emit.c @@ -15,6 +15,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include "ppd.h" #if defined(_WIN32) || defined(__EMX__) # include <io.h> diff --git a/cups/ppd-localize.c b/cups/ppd-localize.c index 29b2d3d9a..ea8491532 100644 --- a/cups/ppd-localize.c +++ b/cups/ppd-localize.c @@ -16,6 +16,7 @@ #include "cups-private.h" #include "ppd-private.h" +#include "debug-internal.h" /* diff --git a/cups/ppd-mark.c b/cups/ppd-mark.c index 80024132b..eb476771e 100644 --- a/cups/ppd-mark.c +++ b/cups/ppd-mark.c @@ -16,6 +16,7 @@ #include "cups-private.h" #include "ppd-private.h" +#include "debug-internal.h" /* diff --git a/cups/ppd-page.c b/cups/ppd-page.c index 60ac2e584..1f5860a83 100644 --- a/cups/ppd-page.c +++ b/cups/ppd-page.c @@ -15,7 +15,7 @@ */ #include "string-private.h" -#include "debug-private.h" +#include "debug-internal.h" #include "ppd.h" diff --git a/cups/ppd-util.c b/cups/ppd-util.c index cdc29d34a..5e43615eb 100644 --- a/cups/ppd-util.c +++ b/cups/ppd-util.c @@ -14,6 +14,7 @@ #include "cups-private.h" #include "ppd-private.h" +#include "debug-internal.h" #include <fcntl.h> #include <sys/stat.h> #if defined(_WIN32) || defined(__EMX__) diff --git a/cups/ppd.c b/cups/ppd.c index 3ca30fba6..3d3e063e8 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -16,6 +16,7 @@ #include "cups-private.h" #include "ppd-private.h" +#include "debug-internal.h" /* diff --git a/cups/pwg-media.c b/cups/pwg-media.c index 61671efe8..079faaa0f 100644 --- a/cups/pwg-media.c +++ b/cups/pwg-media.c @@ -11,6 +11,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <math.h> diff --git a/cups/raster-error.c b/cups/raster-error.c index 8bba1275d..66f91e45c 100644 --- a/cups/raster-error.c +++ b/cups/raster-error.c @@ -12,8 +12,9 @@ * Include necessary headers... */ -#include <cups/cups-private.h> -#include <cups/raster-private.h> +#include "cups-private.h" +#include "raster-private.h" +#include "debug-internal.h" /* diff --git a/cups/raster-interpret.c b/cups/raster-interpret.c index 63d73d356..fbe52f375 100644 --- a/cups/raster-interpret.c +++ b/cups/raster-interpret.c @@ -14,6 +14,7 @@ #include <cups/raster-private.h> #include <cups/ppd-private.h> +#include "debug-internal.h" /* diff --git a/cups/raster-stream.c b/cups/raster-stream.c index 54adfb808..d7db020f1 100644 --- a/cups/raster-stream.c +++ b/cups/raster-stream.c @@ -14,7 +14,8 @@ * Include necessary headers... */ -#include <cups/raster-private.h> +#include "raster-private.h" +#include "debug-internal.h" #ifdef HAVE_STDINT_H # include <stdint.h> #endif /* HAVE_STDINT_H */ @@ -693,7 +694,13 @@ _cupsRasterReadHeader( if (!cups_raster_update(r)) return (0); - DEBUG_printf(("4_cupsRasterReadHeader: cupsBitsPerPixel=%u, cupsBitsPerColor=%u, cupsBytesPerLine=%u, cupsWidth=%u, cupsHeight=%u, r->bpp=%d", r->header.cupsBitsPerPixel, r->header.cupsBitsPerColor, r->header.cupsBytesPerLine, r->header.cupsWidth, r->header.cupsHeight, r->bpp)); + DEBUG_printf(("4_cupsRasterReadHeader: cupsColorSpace=%s", _cupsRasterColorSpaceString(r->header.cupsColorSpace))); + DEBUG_printf(("4_cupsRasterReadHeader: cupsBitsPerColor=%u", r->header.cupsBitsPerColor)); + DEBUG_printf(("4_cupsRasterReadHeader: cupsBitsPerPixel=%u", r->header.cupsBitsPerPixel)); + DEBUG_printf(("4_cupsRasterReadHeader: cupsBytesPerLine=%u", r->header.cupsBytesPerLine)); + DEBUG_printf(("4_cupsRasterReadHeader: cupsWidth=%u", r->header.cupsWidth)); + DEBUG_printf(("4_cupsRasterReadHeader: cupsHeight=%u", r->header.cupsHeight)); + DEBUG_printf(("4_cupsRasterReadHeader: r->bpp=%d", r->bpp)); return (r->header.cupsBitsPerPixel > 0 && r->header.cupsBitsPerPixel <= 240 && r->header.cupsBitsPerColor > 0 && r->header.cupsBitsPerColor <= 16 && r->header.cupsBytesPerLine > 0 && r->header.cupsBytesPerLine <= 0x7fffffff && r->header.cupsHeight != 0 && (r->header.cupsBytesPerLine % r->bpp) == 0); } diff --git a/cups/raster-stubs.c b/cups/raster-stubs.c index 34dde8277..11e0a141e 100644 --- a/cups/raster-stubs.c +++ b/cups/raster-stubs.c @@ -11,7 +11,7 @@ * Include necessary headers... */ -#include <cups/raster-private.h> +#include "raster-private.h" /* @@ -161,8 +161,6 @@ cupsRasterReadHeader( cups_raster_t *r, /* I - Raster stream */ cups_page_header_t *h) /* I - Pointer to header data */ { - DEBUG_printf(("cupsRasterReadHeader(r=%p, h=%p)", (void *)r, (void *)h)); - /* * Get the raster header... */ @@ -170,7 +168,6 @@ cupsRasterReadHeader( if (!_cupsRasterReadHeader(r)) { memset(h, 0, sizeof(cups_page_header_t)); - DEBUG_puts("1cupsRasterReadHeader: Unable to read page header, returning 0."); return (0); } @@ -179,15 +176,6 @@ cupsRasterReadHeader( */ memcpy(h, &(r->header), sizeof(cups_page_header_t)); - - DEBUG_printf(("1cupsRasterReadHeader: cupsColorSpace=%s", _cupsRasterColorSpaceString(h->cupsColorSpace))); - DEBUG_printf(("1cupsRasterReadHeader: cupsBitsPerColor=%u", h->cupsBitsPerColor)); - DEBUG_printf(("1cupsRasterReadHeader: cupsBitsPerPixel=%u", h->cupsBitsPerPixel)); - DEBUG_printf(("1cupsRasterReadHeader: cupsBytesPerLine=%u", h->cupsBytesPerLine)); - DEBUG_printf(("1cupsRasterReadHeader: cupsWidth=%u", h->cupsWidth)); - DEBUG_printf(("1cupsRasterReadHeader: cupsHeight=%u", h->cupsHeight)); - - DEBUG_puts("1cupsRasterReadHeader: Returning 1."); return (1); } @@ -208,12 +196,9 @@ cupsRasterReadHeader2( * Get the raster header... */ - DEBUG_printf(("cupsRasterReadHeader2(r=%p, h=%p)", (void *)r, (void *)h)); - if (!_cupsRasterReadHeader(r)) { memset(h, 0, sizeof(cups_page_header2_t)); - DEBUG_puts("1cupsRasterReadHeader2: Unable to read header, returning 0."); return (0); } @@ -222,15 +207,6 @@ cupsRasterReadHeader2( */ memcpy(h, &(r->header), sizeof(cups_page_header2_t)); - - DEBUG_printf(("1cupsRasterReadHeader2: cupsColorSpace=%s", _cupsRasterColorSpaceString(h->cupsColorSpace))); - DEBUG_printf(("1cupsRasterReadHeader2: cupsBitsPerColor=%u", h->cupsBitsPerColor)); - DEBUG_printf(("1cupsRasterReadHeader2: cupsBitsPerPixel=%u", h->cupsBitsPerPixel)); - DEBUG_printf(("1cupsRasterReadHeader2: cupsBytesPerLine=%u", h->cupsBytesPerLine)); - DEBUG_printf(("1cupsRasterReadHeader2: cupsWidth=%u", h->cupsWidth)); - DEBUG_printf(("1cupsRasterReadHeader2: cupsHeight=%u", h->cupsHeight)); - - DEBUG_puts("1cupsRasterReadHeader2: Returning 1."); return (1); } @@ -267,13 +243,8 @@ cupsRasterWriteHeader( cups_raster_t *r, /* I - Raster stream */ cups_page_header_t *h) /* I - Raster page header */ { - DEBUG_printf(("cupsRasterWriteHeader(r=%p, h=%p)", (void *)r, (void *)h)); - if (r == NULL || r->mode == CUPS_RASTER_READ) - { - DEBUG_puts("1cupsRasterWriteHeader: Stream NULL or open for reading, returning 0."); return (0); - } /* * Make a copy of the header and write using the private function... @@ -300,13 +271,8 @@ cupsRasterWriteHeader2( cups_raster_t *r, /* I - Raster stream */ cups_page_header2_t *h) /* I - Raster page header */ { - DEBUG_printf(("cupsRasterWriteHeader(r=%p, h=%p)", (void *)r, (void *)h)); - if (r == NULL || r->mode == CUPS_RASTER_READ) - { - DEBUG_puts("1cupsRasterWriteHeader2: Stream NULL or open for reading, returning 0."); return (0); - } /* * Make a copy of the header, and compute the number of raster @@ -357,12 +323,7 @@ cups_read_fd(void *ctx, /* I - File descriptor as pointer */ while ((count = read(fd, buf, bytes)) < 0) #endif /* _WIN32 */ if (errno != EINTR && errno != EAGAIN) - { - DEBUG_printf(("8cups_read_fd: %s", strerror(errno))); return (-1); - } - - DEBUG_printf(("8cups_read_fd: Returning %d bytes.", (int)count)); return (count); } @@ -388,10 +349,7 @@ cups_write_fd(void *ctx, /* I - File descriptor pointer */ while ((count = write(fd, buf, bytes)) < 0) #endif /* _WIN32 */ if (errno != EINTR && errno != EAGAIN) - { - DEBUG_printf(("8cups_write_fd: %s", strerror(errno))); return (-1); - } return (count); } diff --git a/cups/request.c b/cups/request.c index acf9cd307..69a780137 100644 --- a/cups/request.c +++ b/cups/request.c @@ -12,6 +12,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <fcntl.h> #include <sys/stat.h> #if defined(_WIN32) || defined(__EMX__) diff --git a/cups/sidechannel.c b/cups/sidechannel.c index c70df1e9e..b43123a8c 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -13,6 +13,7 @@ #include "sidechannel.h" #include "cups-private.h" +#include "debug-internal.h" #ifdef _WIN32 # include <io.h> #else diff --git a/cups/snmp.c b/cups/snmp.c index 07c18c48f..10eca15c5 100644 --- a/cups/snmp.c +++ b/cups/snmp.c @@ -14,6 +14,7 @@ #include "cups-private.h" #include "snmp-private.h" +#include "debug-internal.h" #ifdef HAVE_POLL # include <poll.h> #endif /* HAVE_POLL */ diff --git a/cups/string.c b/cups/string.c index 5d5c3bff7..e91ba40d4 100644 --- a/cups/string.c +++ b/cups/string.c @@ -13,6 +13,7 @@ #define _CUPS_STRING_C_ #include "cups-private.h" +#include "debug-internal.h" #include <stddef.h> #include <limits.h> diff --git a/cups/tempfile.c b/cups/tempfile.c index 9b72f1e83..fb3980295 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -13,6 +13,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <stdlib.h> #include <fcntl.h> #include <sys/stat.h> diff --git a/cups/testppd.c b/cups/testppd.c index 091a27554..914abbd42 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -1021,10 +1021,6 @@ main(int argc, /* I - Number of command-line arguments */ } else if (!strcmp(argv[1], "--raster")) { - int num_options; /* Number of options */ - cups_option_t *options; /* Options */ - - for (status = 0, num_options = 0, options = NULL, i = 1; i < argc; i ++) { if (argv[i][0] == '-') diff --git a/cups/tls.c b/cups/tls.c index 916d32917..5caa84d80 100644 --- a/cups/tls.c +++ b/cups/tls.c @@ -15,6 +15,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <fcntl.h> #include <math.h> #ifdef _WIN32 diff --git a/cups/transcode.c b/cups/transcode.c index f05217bad..426781319 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -12,6 +12,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <limits.h> #include <time.h> #ifdef HAVE_ICONV_H diff --git a/cups/usersys.c b/cups/usersys.c index f9fdc5de4..c4408ac73 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -12,6 +12,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <stdlib.h> #include <sys/stat.h> #ifdef _WIN32 diff --git a/cups/util.c b/cups/util.c index 077c0e885..0961ac9b5 100644 --- a/cups/util.c +++ b/cups/util.c @@ -13,6 +13,7 @@ */ #include "cups-private.h" +#include "debug-internal.h" #include <fcntl.h> #include <sys/stat.h> #if defined(_WIN32) || defined(__EMX__) diff --git a/filter/Dependencies b/filter/Dependencies index 376eebe8b..50320a1cc 100644 --- a/filter/Dependencies +++ b/filter/Dependencies @@ -1,24 +1,23 @@ commandtops.o: commandtops.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.h ../cups/raster.h \ - ../cups/sidechannel.h -gziptoany.o: gziptoany.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/thread-private.h ../cups/ppd.h ../cups/raster.h \ + ../cups/sidechannel.h +gziptoany.o: gziptoany.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 common.o: common.c common.h ../cups/string-private.h ../config.h \ - ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \ + ../cups/versioning.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \ ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \ ../cups/ppd.h ../cups/raster.h pstops.o: pstops.c common.h ../cups/string-private.h ../config.h \ - ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \ + ../cups/versioning.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \ ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \ ../cups/ppd.h ../cups/raster.h ../cups/language-private.h \ ../cups/transcode.h @@ -38,10 +37,10 @@ rastertolabel.o: rastertolabel.c ../cups/cups.h ../cups/file.h \ ../cups/string-private.h ../config.h ../cups/language-private.h \ ../cups/transcode.h rastertopwg.o: rastertopwg.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/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 diff --git a/locale/Dependencies b/locale/Dependencies index 786cd70e0..5b5507ad1 100644 --- a/locale/Dependencies +++ b/locale/Dependencies @@ -1,15 +1,14 @@ checkpo.o: checkpo.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 +po2strings.o: po2strings.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 -po2strings.o: po2strings.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 strings2po.o: strings2po.c diff --git a/monitor/Dependencies b/monitor/Dependencies index 43ceecfbd..5b9da267f 100644 --- a/monitor/Dependencies +++ b/monitor/Dependencies @@ -1,14 +1,13 @@ bcp.o: bcp.c ../cups/cups-private.h ../cups/string-private.h ../config.h \ - ../cups/debug-private.h ../cups/versioning.h ../cups/array-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.h ../cups/raster.h +tbcp.o: tbcp.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.h \ ../cups/raster.h -tbcp.o: tbcp.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.h ../cups/raster.h diff --git a/notifier/Dependencies b/notifier/Dependencies index 975602f4b..5846943ee 100644 --- a/notifier/Dependencies +++ b/notifier/Dependencies @@ -2,20 +2,19 @@ dbus.o: dbus.c ../cups/cups.h ../cups/file.h ../cups/versioning.h \ ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h \ ../cups/pwg.h ../cups/string-private.h ../config.h mailto.o: mailto.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 rss.o: rss.c ../cups/cups.h ../cups/file.h ../cups/versioning.h \ ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h \ ../cups/pwg.h ../cups/string-private.h ../config.h \ ../cups/ipp-private.h testnotify.o: testnotify.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/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 diff --git a/ppdc/Dependencies b/ppdc/Dependencies index f570c1945..af0ac5b98 100644 --- a/ppdc/Dependencies +++ b/ppdc/Dependencies @@ -1,184 +1,183 @@ ppdc-array.o: ppdc-array.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-attr.o: ppdc-attr.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-catalog.o: ppdc-catalog.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-choice.o: ppdc-choice.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-constraint.o: ppdc-constraint.cxx ppdc-private.h ppdc.h \ ../cups/file.h ../cups/versioning.h ../cups/cups-private.h \ - ../cups/string-private.h ../config.h ../cups/debug-private.h \ - ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \ - ../cups/cups.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 -ppdc-driver.o: ppdc-driver.cxx ppdc-private.h ppdc.h ../cups/file.h \ - ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ + ../cups/string-private.h ../config.h ../cups/array-private.h \ ../cups/array.h ../cups/ipp-private.h ../cups/cups.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 +ppdc-driver.o: ppdc-driver.cxx ppdc-private.h ppdc.h ../cups/file.h \ + ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-file.o: ppdc-file.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-filter.o: ppdc-filter.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-font.o: ppdc-font.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-group.o: ppdc-group.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-import.o: ppdc-import.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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.h ../cups/raster.h ppdc-mediasize.o: ppdc-mediasize.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-message.o: ppdc-message.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-option.o: ppdc-option.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-profile.o: ppdc-profile.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-shared.o: ppdc-shared.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-source.o: ppdc-source.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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/raster.h ../data/epson.h ../data/hp.h \ ../data/label.h ppdc-string.o: ppdc-string.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc-variable.o: ppdc-variable.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 genstrings.o: genstrings.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdc.o: ppdc.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdhtml.o: ppdhtml.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdi.o: ppdi.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 ppdmerge.o: ppdmerge.cxx ../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 ppdpo.o: ppdpo.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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 testcatalog.o: testcatalog.cxx ppdc-private.h ppdc.h ../cups/file.h \ ../cups/versioning.h ../cups/cups-private.h ../cups/string-private.h \ - ../config.h ../cups/debug-private.h ../cups/array-private.h \ - ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/ipp.h \ - ../cups/http.h ../cups/language.h ../cups/pwg.h ../cups/http-private.h \ + ../config.h ../cups/array-private.h ../cups/array.h \ + ../cups/ipp-private.h ../cups/cups.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/ppdc/ppdc-private.h b/ppdc/ppdc-private.h index 69d7aadfc..1f2e60617 100644 --- a/ppdc/ppdc-private.h +++ b/ppdc/ppdc-private.h @@ -21,10 +21,16 @@ // Macros... // -# define PPDC_NEW DEBUG_printf(("%s: %p new", class_name(), this)) -# define PPDC_NEWVAL(s) DEBUG_printf(("%s(\"%s\"): %p new", class_name(), s, this)) -# define PPDC_DELETE DEBUG_printf(("%s: %p delete", class_name(), this)) -# define PPDC_DELETEVAL(s) DEBUG_printf(("%s(\"%s\"): %p delete", class_name(), s, this)) - +# ifdef PPDC_DEBUG +# define PPDC_NEW DEBUG_printf(("%s: %p new", class_name(), this)) +# define PPDC_NEWVAL(s) DEBUG_printf(("%s(\"%s\"): %p new", class_name(), s, this)) +# define PPDC_DELETE DEBUG_printf(("%s: %p delete", class_name(), this)) +# define PPDC_DELETEVAL(s) DEBUG_printf(("%s(\"%s\"): %p delete", class_name(), s, this)) +# else +# define PPDC_NEW +# define PPDC_NEWVAL(s) +# define PPDC_DELETE +# define PPDC_DELETEVAL(s) +# endif /* PPDC_DEBUG */ #endif // !_PPDC_PRIVATE_H_ diff --git a/ppdc/ppdc-shared.cxx b/ppdc/ppdc-shared.cxx index 7379311e2..1b0152d3b 100644 --- a/ppdc/ppdc-shared.cxx +++ b/ppdc/ppdc-shared.cxx @@ -40,8 +40,6 @@ ppdcShared::~ppdcShared() void ppdcShared::release(void) { - DEBUG_printf(("%s: %p release use=%d", class_name(), this, use)); - use --; #ifdef DEBUG @@ -65,6 +63,4 @@ void ppdcShared::retain() { use ++; - - DEBUG_printf(("%s: %p retain use=%d", class_name(), this, use)); } diff --git a/scheduler/Dependencies b/scheduler/Dependencies index 2a4149232..a6476c4f0 100644 --- a/scheduler/Dependencies +++ b/scheduler/Dependencies @@ -1,5 +1,14 @@ auth.o: auth.c cupsd.h ../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 ../cups/file-private.h \ + ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \ + statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \ + colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h +banners.o: banners.c cupsd.h ../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 \ @@ -7,19 +16,18 @@ auth.o: auth.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \ ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ - banners.h dirsvc.h network.h subscriptions.h -banners.o: banners.c cupsd.h ../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/file-private.h ../cups/ppd-private.h \ - ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ - client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h ../cups/dir.h cert.o: cert.c cupsd.h ../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 ../cups/file-private.h \ + ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \ + statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \ + colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h +classes.o: classes.c cupsd.h ../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 \ @@ -28,38 +36,18 @@ cert.o: cert.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h -classes.o: classes.c cupsd.h ../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/file-private.h ../cups/ppd-private.h \ - ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ - client.h policy.h printers.h classes.h job.h colorman.h conf.h \ - banners.h dirsvc.h network.h subscriptions.h client.o: client.c cupsd.h ../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/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/file-private.h ../cups/ppd-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h colorman.o: colorman.c cupsd.h ../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/file-private.h ../cups/ppd-private.h \ - ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ - client.h policy.h printers.h classes.h job.h colorman.h conf.h \ - banners.h dirsvc.h network.h subscriptions.h -conf.o: conf.c cupsd.h ../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 \ @@ -68,18 +56,17 @@ conf.o: conf.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h +conf.o: conf.c cupsd.h ../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/file-private.h \ + ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \ + statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \ + colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h dirsvc.o: dirsvc.c cupsd.h ../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/file-private.h ../cups/ppd-private.h \ - ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ - client.h policy.h printers.h classes.h job.h colorman.h conf.h \ - banners.h dirsvc.h network.h subscriptions.h -env.o: env.c cupsd.h ../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 \ @@ -88,28 +75,45 @@ env.o: env.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h +env.o: env.c cupsd.h ../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/file-private.h \ + ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \ + statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \ + colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h file.o: file.c cupsd.h ../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/file-private.h ../cups/ppd-private.h \ - ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ - client.h policy.h printers.h classes.h job.h colorman.h conf.h \ - banners.h dirsvc.h network.h subscriptions.h ../cups/dir.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/file-private.h \ + ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \ + statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \ + colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h \ + ../cups/dir.h main.o: main.c cupsd.h ../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/file-private.h ../cups/ppd-private.h \ - ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ - client.h policy.h printers.h classes.h job.h colorman.h conf.h \ - banners.h dirsvc.h network.h subscriptions.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/file-private.h \ + ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \ + statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \ + colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h ipp.o: ipp.c cupsd.h ../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 ../cups/file-private.h \ + ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \ + statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \ + colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h +listen.o: listen.c cupsd.h ../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 \ @@ -118,92 +122,79 @@ ipp.o: ipp.c cupsd.h ../cups/cups-private.h ../cups/string-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h -listen.o: listen.c cupsd.h ../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/file-private.h ../cups/ppd-private.h \ - ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ - client.h policy.h printers.h classes.h job.h colorman.h conf.h \ - banners.h dirsvc.h network.h subscriptions.h job.o: job.c cupsd.h ../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/file-private.h ../cups/ppd-private.h \ - ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ - client.h policy.h printers.h classes.h job.h colorman.h conf.h \ - banners.h dirsvc.h network.h subscriptions.h ../cups/backend.h \ - ../cups/dir.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/file-private.h \ + ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \ + statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \ + colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h \ + ../cups/backend.h ../cups/dir.h log.o: log.c cupsd.h ../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/file-private.h ../cups/ppd-private.h \ - ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ - client.h policy.h printers.h classes.h job.h colorman.h conf.h \ - banners.h dirsvc.h network.h subscriptions.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/file-private.h \ + ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \ + statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \ + colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h network.o: network.c ../cups/http-private.h ../config.h \ ../cups/language.h ../cups/array.h ../cups/versioning.h ../cups/http.h \ ../cups/ipp-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \ ../cups/pwg.h cupsd.h ../cups/cups-private.h ../cups/string-private.h \ - ../cups/debug-private.h ../cups/array-private.h \ - ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \ - ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \ - ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ - client.h policy.h printers.h classes.h job.h colorman.h conf.h \ - banners.h dirsvc.h network.h subscriptions.h + ../cups/array-private.h ../cups/language-private.h ../cups/transcode.h \ + ../cups/pwg-private.h ../cups/thread-private.h ../cups/file-private.h \ + ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \ + statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \ + colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h policy.o: policy.c cupsd.h ../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/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/file-private.h ../cups/ppd-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h printers.o: printers.c cupsd.h ../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/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/file-private.h ../cups/ppd-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h ../cups/dir.h process.o: process.c cupsd.h ../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/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/file-private.h ../cups/ppd-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h quotas.o: quotas.c cupsd.h ../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/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/file-private.h ../cups/ppd-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h select.o: select.c cupsd.h ../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/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/file-private.h ../cups/ppd-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ @@ -213,87 +204,82 @@ server.o: server.c ../cups/http-private.h ../config.h ../cups/language.h \ ../cups/array.h ../cups/versioning.h ../cups/http.h \ ../cups/ipp-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \ ../cups/pwg.h cupsd.h ../cups/cups-private.h ../cups/string-private.h \ - ../cups/debug-private.h ../cups/array-private.h \ - ../cups/language-private.h ../cups/transcode.h ../cups/pwg-private.h \ - ../cups/thread-private.h ../cups/file-private.h ../cups/ppd-private.h \ - ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ - client.h policy.h printers.h classes.h job.h colorman.h conf.h \ - banners.h dirsvc.h network.h subscriptions.h + ../cups/array-private.h ../cups/language-private.h ../cups/transcode.h \ + ../cups/pwg-private.h ../cups/thread-private.h ../cups/file-private.h \ + ../cups/ppd-private.h ../cups/ppd.h ../cups/raster.h mime.h sysman.h \ + statbuf.h cert.h auth.h client.h policy.h printers.h classes.h job.h \ + colorman.h conf.h banners.h dirsvc.h network.h subscriptions.h statbuf.o: statbuf.c cupsd.h ../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/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/file-private.h ../cups/ppd-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h subscriptions.o: subscriptions.c cupsd.h ../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/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/file-private.h ../cups/ppd-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h sysman.o: sysman.c cupsd.h ../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/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/file-private.h ../cups/ppd-private.h \ ../cups/ppd.h ../cups/raster.h mime.h sysman.h statbuf.h cert.h auth.h \ client.h policy.h printers.h classes.h job.h colorman.h conf.h \ banners.h dirsvc.h network.h subscriptions.h filter.o: filter.c ../cups/string-private.h ../config.h \ - ../cups/debug-private.h ../cups/versioning.h mime.h ../cups/array.h \ - ../cups/ipp.h ../cups/http.h ../cups/file.h -mime.o: mime.c ../cups/string-private.h ../config.h \ - ../cups/debug-private.h ../cups/versioning.h ../cups/dir.h \ - mime-private.h mime.h ../cups/array.h ../cups/ipp.h ../cups/http.h \ - ../cups/file.h -type.o: type.c ../cups/string-private.h ../config.h \ - ../cups/debug-private.h ../cups/versioning.h mime.h ../cups/array.h \ - ../cups/ipp.h ../cups/http.h ../cups/file.h + ../cups/versioning.h mime.h ../cups/array.h ../cups/ipp.h \ + ../cups/http.h ../cups/file.h +mime.o: mime.c ../cups/string-private.h ../config.h ../cups/versioning.h \ + ../cups/dir.h mime-private.h mime.h ../cups/array.h ../cups/ipp.h \ + ../cups/http.h ../cups/file.h +type.o: type.c ../cups/string-private.h ../config.h ../cups/versioning.h \ + mime.h ../cups/array.h ../cups/ipp.h ../cups/http.h ../cups/file.h cupsfilter.o: cupsfilter.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/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/file-private.h ../cups/ppd-private.h \ ../cups/ppd.h ../cups/raster.h mime.h cups-deviced.o: cups-deviced.c util.h ../cups/array-private.h \ ../cups/array.h ../cups/versioning.h ../cups/file-private.h \ ../cups/cups-private.h ../cups/string-private.h ../config.h \ - ../cups/debug-private.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/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-exec.o: cups-exec.c ../cups/string-private.h ../config.h \ - ../cups/file.h ../cups/versioning.h + ../cups/versioning.h ../cups/file.h cups-lpd.o: cups-lpd.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 testlpd.o: testlpd.c ../cups/cups.h ../cups/file.h ../cups/versioning.h \ ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h \ ../cups/pwg.h ../cups/string-private.h ../config.h -testmime.o: testmime.c ../cups/string-private.h ../config.h ../cups/dir.h \ - ../cups/versioning.h ../cups/debug-private.h ../cups/ppd-private.h \ - ../cups/cups.h ../cups/file.h ../cups/ipp.h ../cups/http.h \ - ../cups/array.h ../cups/language.h ../cups/pwg.h ../cups/ppd.h \ - ../cups/raster.h ../cups/pwg-private.h mime.h +testmime.o: testmime.c ../cups/string-private.h ../config.h \ + ../cups/versioning.h ../cups/dir.h ../cups/debug-private.h \ + ../cups/ppd-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \ + ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \ + ../cups/ppd.h ../cups/raster.h ../cups/pwg-private.h mime.h testspeed.o: testspeed.c ../cups/string-private.h ../config.h \ - ../cups/cups.h ../cups/file.h ../cups/versioning.h ../cups/ipp.h \ + ../cups/versioning.h ../cups/cups.h ../cups/file.h ../cups/ipp.h \ ../cups/http.h ../cups/array.h ../cups/language.h ../cups/pwg.h \ ../cups/debug-private.h testsub.o: testsub.c ../cups/cups.h ../cups/file.h ../cups/versioning.h \ @@ -302,17 +288,16 @@ testsub.o: testsub.c ../cups/cups.h ../cups/file.h ../cups/versioning.h \ ../config.h ../cups/ipp-private.h util.o: util.c util.h ../cups/array-private.h ../cups/array.h \ ../cups/versioning.h ../cups/file-private.h ../cups/cups-private.h \ - ../cups/string-private.h ../config.h ../cups/debug-private.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/string-private.h ../config.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-driverd.o: cups-driverd.cxx util.h ../cups/array-private.h \ ../cups/array.h ../cups/versioning.h ../cups/file-private.h \ ../cups/cups-private.h ../cups/string-private.h ../config.h \ - ../cups/debug-private.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 \ - ../ppdc/ppdc.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 ../ppdc/ppdc.h diff --git a/scheduler/auth.c b/scheduler/auth.c index 4c405b1fa..0774ae3cf 100644 --- a/scheduler/auth.c +++ b/scheduler/auth.c @@ -2035,45 +2035,33 @@ pam_func( * Answer all of the messages... */ - DEBUG_printf(("pam_func: appdata_ptr = %p\n", appdata_ptr)); - data = (cupsd_authdata_t *)appdata_ptr; for (i = 0; i < num_msg; i ++) { - DEBUG_printf(("pam_func: Message = \"%s\"\n", msg[i]->msg)); - switch (msg[i]->msg_style) { case PAM_PROMPT_ECHO_ON: - DEBUG_printf(("pam_func: PAM_PROMPT_ECHO_ON, returning \"%s\"...\n", - data->username)); replies[i].resp_retcode = PAM_SUCCESS; replies[i].resp = strdup(data->username); break; case PAM_PROMPT_ECHO_OFF: - DEBUG_printf(("pam_func: PAM_PROMPT_ECHO_OFF, returning \"%s\"...\n", - data->password)); replies[i].resp_retcode = PAM_SUCCESS; replies[i].resp = strdup(data->password); break; case PAM_TEXT_INFO: - DEBUG_puts("pam_func: PAM_TEXT_INFO..."); replies[i].resp_retcode = PAM_SUCCESS; replies[i].resp = NULL; break; case PAM_ERROR_MSG: - DEBUG_puts("pam_func: PAM_ERROR_MSG..."); replies[i].resp_retcode = PAM_SUCCESS; replies[i].resp = NULL; break; default: - DEBUG_printf(("pam_func: Unknown PAM message %d...\n", - msg[i]->msg_style)); free(replies); return (PAM_CONV_ERR); } diff --git a/scheduler/cert.c b/scheduler/cert.c index 192ad8ad9..258e8fc83 100644 --- a/scheduler/cert.c +++ b/scheduler/cert.c @@ -244,9 +244,6 @@ cupsdAddCert(int pid, /* I - Process ID */ fchown(fd, User, Group); } - DEBUG_printf(("ADD pid=%d, username=%s, cert=%s\n", pid, username, - cert->certificate)); - write(fd, cert->certificate, strlen(cert->certificate)); close(fd); @@ -280,9 +277,6 @@ cupsdDeleteCert(int pid) /* I - Process ID */ cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdDeleteCert: Removing certificate for PID %d.", pid); - DEBUG_printf(("DELETE pid=%d, username=%s, cert=%s\n", cert->pid, - cert->username, cert->certificate)); - if (prev == NULL) Certs = cert->next; else diff --git a/scheduler/filter.c b/scheduler/filter.c index c27559179..5596d623c 100644 --- a/scheduler/filter.c +++ b/scheduler/filter.c @@ -12,11 +12,18 @@ */ #include <cups/string-private.h> -#include <cups/debug-private.h> #include "mime.h" /* + * Debug macros that used to be private API... + */ + +#define DEBUG_puts(x) +#define DEBUG_printf(...) + + +/* * Local types... */ diff --git a/scheduler/job.c b/scheduler/job.c index 781b11514..abd2d49de 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -2783,8 +2783,6 @@ cupsdStopAllJobs( cupsd_job_t *job; /* Current job */ - DEBUG_puts("cupsdStopAllJobs()"); - for (job = (cupsd_job_t *)cupsArrayFirst(PrintingJobs); job; job = (cupsd_job_t *)cupsArrayNext(PrintingJobs)) diff --git a/scheduler/mime.c b/scheduler/mime.c index 85310a4c7..d60d4efb9 100644 --- a/scheduler/mime.c +++ b/scheduler/mime.c @@ -12,12 +12,19 @@ */ #include <cups/string-private.h> -#include <cups/debug-private.h> #include <cups/dir.h> #include "mime-private.h" /* + * Debug macros that used to be private API... + */ + +#define DEBUG_puts(x) +#define DEBUG_printf(...) + + +/* * Local types... */ diff --git a/scheduler/printers.c b/scheduler/printers.c index 3a68ee193..f168b4c1a 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -2260,9 +2260,6 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ *filter; /* Current filter */ - DEBUG_printf(("cupsdSetPrinterAttrs: entering name = %s, type = %x\n", p->name, - p->type)); - /* * Make sure that we have the common attributes defined... */ @@ -2593,9 +2590,6 @@ cupsdSetPrinterAttrs(cupsd_printer_t *p)/* I - Printer to setup */ add_printer_formats(p); - DEBUG_printf(("cupsdSetPrinterAttrs: leaving name = %s, type = %x\n", p->name, - p->type)); - /* * Add name-default attributes... */ @@ -3037,9 +3031,6 @@ cupsdValidateDest( int port; /* Port portion of URI */ - DEBUG_printf(("cupsdValidateDest(uri=\"%s\", dtype=%p, printer=%p)\n", uri, - dtype, printer)); - /* * Initialize return values... */ @@ -3143,8 +3134,6 @@ cupsdValidateDest( } } - DEBUG_printf(("localized hostname is \"%s\"...\n", localname)); - /* * Find a matching printer or class... */ diff --git a/scheduler/sysman.c b/scheduler/sysman.c index e7f79e3de..56eb4e32a 100644 --- a/scheduler/sysman.c +++ b/scheduler/sysman.c @@ -436,9 +436,6 @@ sysEventThreadEntry(void) powerRLS = IONotificationPortGetRunLoopSource(powerNotifierPort); CFRunLoopAddSource(CFRunLoopGetCurrent(), powerRLS, kCFRunLoopDefaultMode); } - else - DEBUG_puts("sysEventThreadEntry: error registering for system power " - "notifications"); /* * Register for system configuration change notifications @@ -523,17 +520,8 @@ sysEventThreadEntry(void) CFRunLoopAddSource(CFRunLoopGetCurrent(), storeRLS, kCFRunLoopDefaultMode); } - else - DEBUG_printf(("sysEventThreadEntry: SCDynamicStoreCreateRunLoopSource " - "failed: %s\n", SCErrorString(SCError()))); } - else - DEBUG_printf(("sysEventThreadEntry: SCDynamicStoreSetNotificationKeys " - "failed: %s\n", SCErrorString(SCError()))); } - else - DEBUG_printf(("sysEventThreadEntry: SCDynamicStoreCreate failed: %s\n", - SCErrorString(SCError()))); if (keys) CFRelease(keys); diff --git a/scheduler/testmime.c b/scheduler/testmime.c index 97c885aaf..221a65a0e 100644 --- a/scheduler/testmime.c +++ b/scheduler/testmime.c @@ -212,9 +212,6 @@ add_ppd_filter(mime_t *mime, /* I - MIME database */ mime_filter_t *filterptr; /* MIME filter */ - DEBUG_printf(("add_ppd_filter(mime=%p, filtertype=%p(%s/%s), filter=\"%s\")", - mime, filtertype, filtertype->super, filtertype->type, filter)); - /* * Parse the filter string; it should be in one of the following formats: * @@ -278,26 +275,13 @@ add_ppd_filter(mime_t *mime, /* I - MIME database */ { if (desttype != filtertype) { - DEBUG_printf(("add_ppd_filter: Adding filter %s/%s %s/%s %d %s", - temptype->super, temptype->type, desttype->super, - desttype->type, cost, program)); filterptr = mimeAddFilter(mime, temptype, desttype, cost, program); if (!mimeFilterLookup(mime, desttype, filtertype)) - { - DEBUG_printf(("add_printer_filter: Adding filter %s/%s %s/%s 0 -", - desttype->super, desttype->type, filtertype->super, - filtertype->type)); mimeAddFilter(mime, desttype, filtertype, 0, "-"); - } } else - { - DEBUG_printf(("add_printer_filter: Adding filter %s/%s %s/%s %d %s", - temptype->super, temptype->type, filtertype->super, - filtertype->type, cost, program)); filterptr = mimeAddFilter(mime, temptype, filtertype, cost, program); - } if (filterptr) filterptr->maxsize = maxsize; diff --git a/scheduler/type.c b/scheduler/type.c index 719afb7df..2cceeda58 100644 --- a/scheduler/type.c +++ b/scheduler/type.c @@ -12,12 +12,19 @@ */ #include <cups/string-private.h> -#include <cups/debug-private.h> #include <locale.h> #include "mime.h" /* + * Debug macros that used to be private API... + */ + +#define DEBUG_puts(x) +#define DEBUG_printf(...) + + +/* * Local types... */ @@ -44,7 +51,7 @@ static int mime_patmatch(const char *s, const char *pat); * Local globals... */ -#ifdef DEBUG +#ifdef MIME_DEBUG static const char * const debug_ops[] = { /* Test names... */ "NOP", /* No operation */ 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... diff --git a/test/Dependencies b/test/Dependencies index 88faf7094..64993e730 100644 --- a/test/Dependencies +++ b/test/Dependencies @@ -1,18 +1,16 @@ ippfind.o: ippfind.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 ippserver.o: ippserver.c ../config.h ../cups/cups.h ../cups/file.h \ ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \ ../cups/language.h ../cups/pwg.h ../cups/string-private.h \ ../cups/thread-private.h ipptool.o: ipptool.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/file-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/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj index 1e6cc13d8..4ef98fd5f 100644 --- a/xcode/CUPS.xcodeproj/project.pbxproj +++ b/xcode/CUPS.xcodeproj/project.pbxproj @@ -171,12 +171,11 @@ 2706963B1CADF3E200FFE5FB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 278C58E7136B64B000836530 /* Security.framework */; }; 2706963E1CADF3E200FFE5FB /* array.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EB91333056300FCA411 /* array.h */; settings = {ATTRIBUTES = (Public, ); }; }; 270696401CADF3E200FFE5FB /* cups-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EC01333056300FCA411 /* cups-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 270696411CADF3E200FFE5FB /* debug-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EC31333056300FCA411 /* debug-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; 270696421CADF3E200FFE5FB /* file-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220ED7133305BB00FCA411 /* file-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; 270696431CADF3E200FFE5FB /* http-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EE0133305BB00FCA411 /* http-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; 270696441CADF3E200FFE5FB /* ipp-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EE4133305BB00FCA411 /* ipp-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; 270696451CADF3E200FFE5FB /* language-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EE9133305BB00FCA411 /* language-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; - 270696461CADF3E200FFE5FB /* md5-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EEE133305BB00FCA411 /* md5-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 270696461CADF3E200FFE5FB /* md5-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EEE133305BB00FCA411 /* md5-internal.h */; settings = {ATTRIBUTES = (Private, ); }; }; 270696481CADF3E200FFE5FB /* pwg-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EF9133305BB00FCA411 /* pwg-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2706964A1CADF3E200FFE5FB /* string-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220F01133305BB00FCA411 /* string-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2706964B1CADF3E200FFE5FB /* thread-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220F04133305BB00FCA411 /* thread-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; @@ -479,7 +478,6 @@ 72220ECD1333056300FCA411 /* cups-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EC01333056300FCA411 /* cups-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; 72220ECE1333056300FCA411 /* cups.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EC11333056300FCA411 /* cups.h */; settings = {ATTRIBUTES = (Public, ); }; }; 72220ECF1333056300FCA411 /* ppd-custom.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EC21333056300FCA411 /* ppd-custom.c */; }; - 72220ED01333056300FCA411 /* debug-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EC31333056300FCA411 /* debug-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; 72220F0B133305BB00FCA411 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220ED1133305BB00FCA411 /* debug.c */; }; 72220F0C133305BB00FCA411 /* dest.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220ED2133305BB00FCA411 /* dest.c */; }; 72220F0D133305BB00FCA411 /* dir.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220ED3133305BB00FCA411 /* dir.c */; }; @@ -509,7 +507,7 @@ 72220F25133305BB00FCA411 /* language.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EEB133305BB00FCA411 /* language.h */; settings = {ATTRIBUTES = (Public, ); }; }; 72220F26133305BB00FCA411 /* ppd-localize.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EEC133305BB00FCA411 /* ppd-localize.c */; }; 72220F27133305BB00FCA411 /* ppd-mark.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EED133305BB00FCA411 /* ppd-mark.c */; }; - 72220F28133305BB00FCA411 /* md5-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EEE133305BB00FCA411 /* md5-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 72220F28133305BB00FCA411 /* md5-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 72220EEE133305BB00FCA411 /* md5-internal.h */; settings = {ATTRIBUTES = (Private, ); }; }; 72220F29133305BB00FCA411 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EEF133305BB00FCA411 /* md5.c */; }; 72220F2A133305BB00FCA411 /* md5passwd.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EF0133305BB00FCA411 /* md5passwd.c */; }; 72220F2B133305BB00FCA411 /* notify.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220EF1133305BB00FCA411 /* notify.c */; }; @@ -568,6 +566,12 @@ 72220FB913330BCE00FCA411 /* type.c in Sources */ = {isa = PBXBuildFile; fileRef = 72220FB513330BCE00FCA411 /* type.c */; }; 72220FBA13330BEE00FCA411 /* libcups.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72220EAE1333047D00FCA411 /* libcups.dylib */; }; 72220FBF13330C1000FCA411 /* libcupsmime.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72220FAC13330B2200FCA411 /* libcupsmime.dylib */; }; + 722A24EF2178D00D000CAB20 /* debug-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 722A24EE2178D00C000CAB20 /* debug-internal.h */; }; + 722A24F02178D00D000CAB20 /* debug-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 722A24EE2178D00C000CAB20 /* debug-internal.h */; }; + 722A24F12178D00D000CAB20 /* debug-internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 722A24EE2178D00C000CAB20 /* debug-internal.h */; }; + 722A24F32178D091000CAB20 /* debug-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 722A24F22178D090000CAB20 /* debug-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; + 722A24F42178D091000CAB20 /* debug-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 722A24F22178D090000CAB20 /* debug-private.h */; }; + 722A24F52178D091000CAB20 /* debug-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 722A24F22178D090000CAB20 /* debug-private.h */; }; 7234F4201378A16F00D3E9C9 /* array-private.h in Headers */ = {isa = PBXBuildFile; fileRef = 7234F41F1378A16F00D3E9C9 /* array-private.h */; settings = {ATTRIBUTES = (Private, ); }; }; 724379081333E4A5009631B9 /* libcups.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 72220EAE1333047D00FCA411 /* libcups.dylib */; }; 7243790D1333E4E3009631B9 /* ipp.c in Sources */ = {isa = PBXBuildFile; fileRef = 7243790A1333E4E3009631B9 /* ipp.c */; }; @@ -3282,7 +3286,6 @@ 72220EC01333056300FCA411 /* cups-private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "cups-private.h"; path = "../cups/cups-private.h"; sourceTree = "<group>"; }; 72220EC11333056300FCA411 /* cups.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cups.h; path = ../cups/cups.h; sourceTree = "<group>"; }; 72220EC21333056300FCA411 /* ppd-custom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ppd-custom.c"; path = "../cups/ppd-custom.c"; sourceTree = "<group>"; }; - 72220EC31333056300FCA411 /* debug-private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "debug-private.h"; path = "../cups/debug-private.h"; sourceTree = "<group>"; }; 72220ED1133305BB00FCA411 /* debug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = debug.c; path = ../cups/debug.c; sourceTree = "<group>"; }; 72220ED2133305BB00FCA411 /* dest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dest.c; path = ../cups/dest.c; sourceTree = "<group>"; }; 72220ED3133305BB00FCA411 /* dir.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dir.c; path = ../cups/dir.c; sourceTree = "<group>"; }; @@ -3312,7 +3315,7 @@ 72220EEB133305BB00FCA411 /* language.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = language.h; path = ../cups/language.h; sourceTree = "<group>"; }; 72220EEC133305BB00FCA411 /* ppd-localize.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ppd-localize.c"; path = "../cups/ppd-localize.c"; sourceTree = "<group>"; }; 72220EED133305BB00FCA411 /* ppd-mark.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ppd-mark.c"; path = "../cups/ppd-mark.c"; sourceTree = "<group>"; }; - 72220EEE133305BB00FCA411 /* md5-private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "md5-private.h"; path = "../cups/md5-private.h"; sourceTree = "<group>"; }; + 72220EEE133305BB00FCA411 /* md5-internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "md5-internal.h"; path = "../cups/md5-internal.h"; sourceTree = "<group>"; }; 72220EEF133305BB00FCA411 /* md5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = md5.c; path = ../cups/md5.c; sourceTree = "<group>"; }; 72220EF0133305BB00FCA411 /* md5passwd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = md5passwd.c; path = ../cups/md5passwd.c; sourceTree = "<group>"; }; 72220EF1133305BB00FCA411 /* notify.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = notify.c; path = ../cups/notify.c; sourceTree = "<group>"; }; @@ -3389,6 +3392,8 @@ 7226369B18AE6D19004ED309 /* org.cups.cups-lpd.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "org.cups.cups-lpd.plist"; path = "../scheduler/org.cups.cups-lpd.plist"; sourceTree = SOURCE_ROOT; }; 7226369C18AE6D19004ED309 /* org.cups.cupsd.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = org.cups.cupsd.plist; path = ../scheduler/org.cups.cupsd.plist; sourceTree = SOURCE_ROOT; }; 7226369D18AE73BB004ED309 /* config.h.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = config.h.in; path = ../config.h.in; sourceTree = "<group>"; }; + 722A24EE2178D00C000CAB20 /* debug-internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "debug-internal.h"; path = "../cups/debug-internal.h"; sourceTree = "<group>"; }; + 722A24F22178D090000CAB20 /* debug-private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "debug-private.h"; path = "../cups/debug-private.h"; sourceTree = "<group>"; }; 7234F41F1378A16F00D3E9C9 /* array-private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "array-private.h"; path = "../cups/array-private.h"; sourceTree = "<group>"; }; 724378FD1333E43E009631B9 /* ipp */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ipp; sourceTree = BUILT_PRODUCTS_DIR; }; 724379091333E4E3009631B9 /* backend-private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "backend-private.h"; path = "../backend/backend-private.h"; sourceTree = "<group>"; }; @@ -4869,12 +4874,13 @@ 72220EB41333050100FCA411 /* libcups */ = { isa = PBXGroup; children = ( - 276683561337A8C5000D33D0 /* cups.strings */, 72220EB51333052D00FCA411 /* adminutil.c */, 72220EB81333056300FCA411 /* array.c */, 72220EBB1333056300FCA411 /* auth.c */, 72220EBC1333056300FCA411 /* backchannel.c */, 72220EBD1333056300FCA411 /* backend.c */, + 276683561337A8C5000D33D0 /* cups.strings */, + 722A24EE2178D00C000CAB20 /* debug-internal.h */, 72220ED1133305BB00FCA411 /* debug.c */, 72CF95E018A13543000FCAE4 /* dest-job.c */, 72CF95E118A13543000FCAE4 /* dest-localization.c */, @@ -4900,6 +4906,7 @@ 72220EE8133305BB00FCA411 /* langprintf.c */, 72220EEA133305BB00FCA411 /* language.c */, 27D3037D134148CB00F022B1 /* libcups2.def */, + 72220EEE133305BB00FCA411 /* md5-internal.h */, 72220EEF133305BB00FCA411 /* md5.c */, 72220EF0133305BB00FCA411 /* md5passwd.c */, 72220EF1133305BB00FCA411 /* notify.c */, @@ -4962,15 +4969,14 @@ 72220F461333060C00FCA411 /* Private Headers */ = { isa = PBXGroup; children = ( - 72220F471333063D00FCA411 /* config.h */, 7234F41F1378A16F00D3E9C9 /* array-private.h */, + 72220F471333063D00FCA411 /* config.h */, 72220EC01333056300FCA411 /* cups-private.h */, - 72220EC31333056300FCA411 /* debug-private.h */, + 722A24F22178D090000CAB20 /* debug-private.h */, 72220ED7133305BB00FCA411 /* file-private.h */, 72220EE0133305BB00FCA411 /* http-private.h */, 72220EE4133305BB00FCA411 /* ipp-private.h */, 72220EE9133305BB00FCA411 /* language-private.h */, - 72220EEE133305BB00FCA411 /* md5-private.h */, 72220EF5133305BB00FCA411 /* ppd-private.h */, 72220EF9133305BB00FCA411 /* pwg-private.h */, 2767FC76192696A0000F61D3 /* raster-private.h */, @@ -5264,20 +5270,21 @@ files = ( 2706963E1CADF3E200FFE5FB /* array.h in Headers */, 7253C469216ED5D400494ADD /* raster.h in Headers */, + 722A24F42178D091000CAB20 /* debug-private.h in Headers */, 270696401CADF3E200FFE5FB /* cups-private.h in Headers */, - 270696411CADF3E200FFE5FB /* debug-private.h in Headers */, 7253C471216ED6C400494ADD /* array-private.h in Headers */, 270696421CADF3E200FFE5FB /* file-private.h in Headers */, 270696431CADF3E200FFE5FB /* http-private.h in Headers */, 270696441CADF3E200FFE5FB /* ipp-private.h in Headers */, 270696451CADF3E200FFE5FB /* language-private.h in Headers */, - 270696461CADF3E200FFE5FB /* md5-private.h in Headers */, + 270696461CADF3E200FFE5FB /* md5-internal.h in Headers */, 270696481CADF3E200FFE5FB /* pwg-private.h in Headers */, 2706964A1CADF3E200FFE5FB /* string-private.h in Headers */, 7253C46C216ED5E500494ADD /* raster-private.h in Headers */, 2706964B1CADF3E200FFE5FB /* thread-private.h in Headers */, 2706964C1CADF3E200FFE5FB /* config.h in Headers */, 2706964D1CADF3E200FFE5FB /* cups.h in Headers */, + 722A24F02178D00D000CAB20 /* debug-internal.h in Headers */, 2706964E1CADF3E200FFE5FB /* dir.h in Headers */, 2706964F1CADF3E200FFE5FB /* file.h in Headers */, 270696501CADF3E200FFE5FB /* http.h in Headers */, @@ -5302,7 +5309,9 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 722A24F52178D091000CAB20 /* debug-private.h in Headers */, 274FF6C61333B1C400317ECB /* dir.h in Headers */, + 722A24F12178D00D000CAB20 /* debug-internal.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5321,23 +5330,24 @@ 72220F21133305BB00FCA411 /* ipp.h in Headers */, 72220F25133305BB00FCA411 /* language.h in Headers */, 72220F31133305BB00FCA411 /* ppd.h in Headers */, + 722A24F32178D091000CAB20 /* debug-private.h in Headers */, 72220F37133305BB00FCA411 /* sidechannel.h in Headers */, 72220F41133305BB00FCA411 /* transcode.h in Headers */, 72220F44133305BB00FCA411 /* versioning.h in Headers */, 7234F4201378A16F00D3E9C9 /* array-private.h in Headers */, 72220ECD1333056300FCA411 /* cups-private.h in Headers */, - 72220ED01333056300FCA411 /* debug-private.h in Headers */, 72220F11133305BB00FCA411 /* file-private.h in Headers */, 72220F1A133305BB00FCA411 /* http-private.h in Headers */, 72220F1E133305BB00FCA411 /* ipp-private.h in Headers */, 72220F23133305BB00FCA411 /* language-private.h in Headers */, 7253C46F216ED69200494ADD /* pwg.h in Headers */, - 72220F28133305BB00FCA411 /* md5-private.h in Headers */, + 72220F28133305BB00FCA411 /* md5-internal.h in Headers */, 72220F2F133305BB00FCA411 /* ppd-private.h in Headers */, 72220F33133305BB00FCA411 /* pwg-private.h in Headers */, 72220F38133305BB00FCA411 /* snmp-private.h in Headers */, 72220F3B133305BB00FCA411 /* string-private.h in Headers */, 72220F3E133305BB00FCA411 /* thread-private.h in Headers */, + 722A24EF2178D00D000CAB20 /* debug-internal.h in Headers */, 72220F481333063D00FCA411 /* config.h in Headers */, 7253C468216ED5D300494ADD /* raster.h in Headers */, ); |