diff options
198 files changed, 409 insertions, 401 deletions
diff --git a/Makedefs.in b/Makedefs.in index 41612af71..c971b0200 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -1,5 +1,5 @@ # -# "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $" +# "$Id$" # # Common makefile definitions for CUPS. # @@ -258,5 +258,5 @@ DBUSDIR = @DBUSDIR@ # -# End of "$Id: Makedefs.in 7900 2008-09-03 13:47:57Z mike $" +# End of "$Id$" # @@ -1,5 +1,5 @@ # -# "$Id: Makefile 9391 2010-11-30 21:53:04Z mike $" +# "$Id$" # # Top-level Makefile for CUPS. # @@ -329,5 +329,5 @@ dist: all # -# End of "$Id: Makefile 9391 2010-11-30 21:53:04Z mike $". +# End of "$Id$". # diff --git a/backend/Makefile b/backend/Makefile index c6ddb95b0..adb8f6700 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7924 2008-09-10 17:36:13Z mike $" +# "$Id$" # # Backend makefile for CUPS. # @@ -296,5 +296,5 @@ include Dependencies # -# End of "$Id: Makefile 7924 2008-09-10 17:36:13Z mike $". +# End of "$Id$". # diff --git a/backend/backend-private.h b/backend/backend-private.h index 980b3e518..3729bb020 100644 --- a/backend/backend-private.h +++ b/backend/backend-private.h @@ -1,5 +1,5 @@ /* - * "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $" + * "$Id$" * * Backend support definitions for CUPS. * @@ -334,5 +334,5 @@ extern int backendWaitLoop(int snmp_fd, http_addr_t *addr, /* - * End of "$Id: backend-private.h 7810 2008-07-29 01:11:15Z mike $". + * End of "$Id$". */ diff --git a/backend/ieee1284.c b/backend/ieee1284.c index a837325f0..bc4b344a6 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -1,5 +1,5 @@ /* - * "$Id: ieee1284.c 7687 2008-06-24 01:28:36Z mike $" + * "$Id$" * * IEEE-1284 support functions for CUPS. * @@ -487,5 +487,5 @@ backendGetMakeModel( /* - * End of "$Id: ieee1284.c 7687 2008-06-24 01:28:36Z mike $". + * End of "$Id$". */ diff --git a/backend/ipp.c b/backend/ipp.c index 9a474b9e0..e7f3c3f3e 100644 --- a/backend/ipp.c +++ b/backend/ipp.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp.c 9759 2011-05-11 03:24:33Z mike $" + * "$Id$" * * IPP backend for CUPS. * @@ -3669,5 +3669,5 @@ update_reasons(ipp_attribute_t *attr, /* I - printer-state-reasons or NULL */ } /* - * End of "$Id: ipp.c 9759 2011-05-11 03:24:33Z mike $". + * End of "$Id$". */ diff --git a/backend/lpd.c b/backend/lpd.c index c4f73155e..d73d1bcf0 100644 --- a/backend/lpd.c +++ b/backend/lpd.c @@ -1,5 +1,5 @@ /* - * "$Id: lpd.c 7740 2008-07-14 23:58:05Z mike $" + * "$Id$" * * Line Printer Daemon backend for CUPS. * @@ -1331,5 +1331,5 @@ sigterm_handler(int sig) /* I - Signal */ /* - * End of "$Id: lpd.c 7740 2008-07-14 23:58:05Z mike $". + * End of "$Id$". */ diff --git a/backend/runloop.c b/backend/runloop.c index 0b3f65f78..c03c4c262 100644 --- a/backend/runloop.c +++ b/backend/runloop.c @@ -1,5 +1,5 @@ /* - * "$Id: runloop.c 9565 2011-02-23 00:08:08Z mike $" + * "$Id$" * * Common run loop APIs for CUPS backends. * @@ -539,5 +539,5 @@ backendWaitLoop( /* - * End of "$Id: runloop.c 9565 2011-02-23 00:08:08Z mike $". + * End of "$Id$". */ diff --git a/backend/snmp.c b/backend/snmp.c index cffc7aaf6..fc40800c6 100644 --- a/backend/snmp.c +++ b/backend/snmp.c @@ -1,5 +1,5 @@ /* - * "$Id: snmp.c 7810 2008-07-29 01:11:15Z mike $" + * "$Id$" * * SNMP discovery backend for CUPS. * @@ -1391,5 +1391,5 @@ update_cache(snmp_cache_t *device, /* I - Device */ /* - * End of "$Id: snmp.c 7810 2008-07-29 01:11:15Z mike $". + * End of "$Id$". */ diff --git a/backend/socket.c b/backend/socket.c index 2da3d07f2..ebed1361b 100644 --- a/backend/socket.c +++ b/backend/socket.c @@ -1,5 +1,5 @@ /* - * "$Id: socket.c 7881 2008-08-28 20:21:56Z mike $" + * "$Id$" * * AppSocket backend for CUPS. * @@ -520,5 +520,5 @@ wait_bc(int device_fd, /* I - Socket */ /* - * End of "$Id: socket.c 7881 2008-08-28 20:21:56Z mike $". + * End of "$Id$". */ diff --git a/backend/test1284.c b/backend/test1284.c index b25bacb95..49bef87ee 100644 --- a/backend/test1284.c +++ b/backend/test1284.c @@ -1,5 +1,5 @@ /* - * "$Id: test1284.c 7465 2008-04-18 16:20:11Z mike $" + * "$Id$" * * IEEE-1284 support functions test program for CUPS. * @@ -80,5 +80,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id: test1284.c 7465 2008-04-18 16:20:11Z mike $". + * End of "$Id$". */ diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index 2b423c2a4..937d18e1a 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -1,5 +1,5 @@ /* -* "$Id: usb-darwin.c 7953 2008-09-17 01:43:19Z mike $" +* "$Id$" * * Copyright 2005-2013 Apple Inc. All rights reserved. * @@ -2339,5 +2339,5 @@ static void get_device_id(cups_sc_status_t *status, /* - * End of "$Id: usb-darwin.c 7953 2008-09-17 01:43:19Z mike $". + * End of "$Id$". */ diff --git a/backend/usb-unix.c b/backend/usb-unix.c index 67c7f654f..3fe18b68f 100644 --- a/backend/usb-unix.c +++ b/backend/usb-unix.c @@ -1,5 +1,5 @@ /* - * "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $" + * "$Id$" * * USB port backend for CUPS. * @@ -612,5 +612,5 @@ side_cb(int print_fd, /* I - Print file */ /* - * End of "$Id: usb-unix.c 7810 2008-07-29 01:11:15Z mike $". + * End of "$Id$". */ diff --git a/backend/usb.c b/backend/usb.c index 2e024e612..ee8c1f4ed 100644 --- a/backend/usb.c +++ b/backend/usb.c @@ -1,5 +1,5 @@ /* - * "$Id: usb.c 7687 2008-06-24 01:28:36Z mike $" + * "$Id$" * * USB port backend for CUPS. * @@ -260,5 +260,5 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ /* - * End of "$Id: usb.c 7687 2008-06-24 01:28:36Z mike $". + * End of "$Id$". */ diff --git a/berkeley/Makefile b/berkeley/Makefile index 8459ea291..991481ac0 100644 --- a/berkeley/Makefile +++ b/berkeley/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" +# "$Id$" # # Berkeley commands makefile for CUPS. # @@ -164,5 +164,5 @@ include Dependencies # -# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". +# End of "$Id$". # diff --git a/berkeley/lpc.c b/berkeley/lpc.c index e1003b1b1..e8ccb91c0 100644 --- a/berkeley/lpc.c +++ b/berkeley/lpc.c @@ -1,5 +1,5 @@ /* - * "$Id: lpc.c 7079 2007-11-30 01:58:31Z mike $" + * "$Id$" * * "lpc" command for CUPS. * @@ -446,5 +446,5 @@ show_status(http_t *http, /* I - HTTP connection to server */ /* - * End of "$Id: lpc.c 7079 2007-11-30 01:58:31Z mike $". + * End of "$Id$". */ diff --git a/berkeley/lpq.c b/berkeley/lpq.c index 9356fc1f3..dcce2c0ed 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -1,5 +1,5 @@ /* - * "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $" + * "$Id$" * * "lpq" command for CUPS. * @@ -678,5 +678,5 @@ usage(void) /* - * End of "$Id: lpq.c 7460 2008-04-16 02:19:54Z mike $". + * End of "$Id$". */ diff --git a/berkeley/lpr.c b/berkeley/lpr.c index 7d30cc6e6..6e36beed7 100644 --- a/berkeley/lpr.c +++ b/berkeley/lpr.c @@ -1,5 +1,5 @@ /* - * "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * "lpr" command for CUPS. * @@ -418,5 +418,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: lpr.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/berkeley/lprm.c b/berkeley/lprm.c index 5e12c74fd..e2d03e359 100644 --- a/berkeley/lprm.c +++ b/berkeley/lprm.c @@ -1,5 +1,5 @@ /* - * "$Id: lprm.c 7261 2008-01-28 23:09:31Z mike $" + * "$Id$" * * "lprm" command for CUPS. * @@ -213,5 +213,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: lprm.c 7261 2008-01-28 23:09:31Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index 6dac2bb50..7a73c058d 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" +# "$Id$" # # CGI makefile for CUPS. # @@ -380,5 +380,5 @@ include Dependencies # -# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". +# End of "$Id$". # diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c index 84c9d9c90..cecbba418 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c @@ -1,5 +1,5 @@ /* - * "$Id: admin.c 8029 2008-10-08 21:07:45Z mike $" + * "$Id$" * * Administration CGI for CUPS. * @@ -4218,5 +4218,5 @@ get_points(double number, /* I - Original number */ /* - * End of "$Id: admin.c 8029 2008-10-08 21:07:45Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h index 412bdc39a..1f9690273 100644 --- a/cgi-bin/cgi-private.h +++ b/cgi-bin/cgi-private.h @@ -1,5 +1,5 @@ /* - * "$Id: cgi-private.h 7940 2008-09-16 00:45:16Z mike $" + * "$Id$" * * Private CGI definitions for CUPS. * @@ -32,5 +32,5 @@ /* - * End of "$Id: cgi-private.h 7940 2008-09-16 00:45:16Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h index bceb5f519..61eb7fc75 100644 --- a/cgi-bin/cgi.h +++ b/cgi-bin/cgi.h @@ -1,5 +1,5 @@ /* - * "$Id: cgi.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * CGI support library definitions for CUPS. * @@ -115,5 +115,5 @@ extern const char *cgiText(const char *message); #endif /* !_CUPS_CGI_H_ */ /* - * End of "$Id: cgi.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c index 8d42e5cda..6f2fd58a2 100644 --- a/cgi-bin/classes.c +++ b/cgi-bin/classes.c @@ -1,5 +1,5 @@ /* - * "$Id: classes.c 7940 2008-09-16 00:45:16Z mike $" + * "$Id$" * * Class status CGI for CUPS. * @@ -554,5 +554,5 @@ show_class(http_t *http, /* I - Connection to server */ /* - * End of "$Id: classes.c 7940 2008-09-16 00:45:16Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c index 08586a0b1..801f088fd 100644 --- a/cgi-bin/help-index.c +++ b/cgi-bin/help-index.c @@ -1,5 +1,5 @@ /* - * "$Id: help-index.c 7717 2008-07-04 02:35:33Z mike $" + * "$Id$" * * Online help index routines for CUPS. * @@ -1324,5 +1324,5 @@ help_sort_words(help_word_t *w1, /* I - Second word */ /* - * End of "$Id: help-index.c 7717 2008-07-04 02:35:33Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h index 676be6756..41d8d93db 100644 --- a/cgi-bin/help-index.h +++ b/cgi-bin/help-index.h @@ -1,5 +1,5 @@ /* - * "$Id: help-index.h 7615 2008-05-25 07:17:07Z mike $" + * "$Id$" * * Online help index definitions for CUPS. * @@ -83,5 +83,5 @@ extern help_index_t *helpSearchIndex(help_index_t *hi, const char *query, #endif /* !_CUPS_HELP_INDEX_H_ */ /* - * End of "$Id: help-index.h 7615 2008-05-25 07:17:07Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/html.c b/cgi-bin/html.c index ea2b3f705..9db5438eb 100644 --- a/cgi-bin/html.c +++ b/cgi-bin/html.c @@ -1,5 +1,5 @@ /* - * "$Id: html.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * HTML support functions for CUPS. * @@ -235,5 +235,5 @@ cgi_null_passwd(const char *prompt) /* I - Prompt string (unused) */ /* - * End of "$Id: html.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c index 7424f7a4d..38120da08 100644 --- a/cgi-bin/ipp-var.c +++ b/cgi-bin/ipp-var.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp-var.c 7940 2008-09-16 00:45:16Z mike $" + * "$Id$" * * CGI <-> IPP variable routines for CUPS. * @@ -1589,5 +1589,5 @@ cgiText(const char *message) /* I - Message */ /* - * End of "$Id: ipp-var.c 7940 2008-09-16 00:45:16Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c index bfb354885..e57b0218d 100644 --- a/cgi-bin/jobs.c +++ b/cgi-bin/jobs.c @@ -1,5 +1,5 @@ /* - * "$Id: jobs.c 7237 2008-01-22 01:38:39Z mike $" + * "$Id$" * * Job status CGI for CUPS. * @@ -210,5 +210,5 @@ do_job_op(http_t *http, /* I - HTTP connection */ /* - * End of "$Id: jobs.c 7237 2008-01-22 01:38:39Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c index 36e992025..37b0f552d 100644 --- a/cgi-bin/printers.c +++ b/cgi-bin/printers.c @@ -1,5 +1,5 @@ /* - * "$Id: printers.c 7940 2008-09-16 00:45:16Z mike $" + * "$Id$" * * Printer status CGI for CUPS. * @@ -574,5 +574,5 @@ show_printer(http_t *http, /* I - Connection to server */ /* - * End of "$Id: printers.c 7940 2008-09-16 00:45:16Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/search.c b/cgi-bin/search.c index 94150de58..a6abd5978 100644 --- a/cgi-bin/search.c +++ b/cgi-bin/search.c @@ -1,5 +1,5 @@ /* - * "$Id: search.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * Search routines for CUPS. * @@ -377,5 +377,5 @@ cgiFreeSearch(void *search) /* I - Search context */ /* - * End of "$Id: search.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/template.c b/cgi-bin/template.c index 77bfbe3a8..cdf1544bb 100644 --- a/cgi-bin/template.c +++ b/cgi-bin/template.c @@ -1,5 +1,5 @@ /* - * "$Id: template.c 7219 2008-01-14 22:00:02Z mike $" + * "$Id$" * * CGI template function. * @@ -729,5 +729,5 @@ cgi_puturi(const char *s, /* I - String to output */ /* - * End of "$Id: template.c 7219 2008-01-14 22:00:02Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c index 88fcce4f5..dfda3d7ea 100644 --- a/cgi-bin/testcgi.c +++ b/cgi-bin/testcgi.c @@ -1,5 +1,5 @@ /* - * "$Id: testcgi.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * CGI test program for CUPS. * @@ -71,5 +71,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testcgi.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c index 3defe45e5..ce1b94b01 100644 --- a/cgi-bin/testhi.c +++ b/cgi-bin/testhi.c @@ -1,5 +1,5 @@ /* - * "$Id: testhi.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Help index test program for CUPS. * @@ -109,5 +109,5 @@ list_nodes(const char *title, /* I - Title string */ /* - * End of "$Id: testhi.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c index a257fc06f..02c017365 100644 --- a/cgi-bin/testtemplate.c +++ b/cgi-bin/testtemplate.c @@ -1,5 +1,5 @@ /* - * "$Id: testtemplate.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * CGI template test program for CUPS. * @@ -99,5 +99,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testtemplate.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cgi-bin/var.c b/cgi-bin/var.c index 8b8c026c4..660c8bb3a 100644 --- a/cgi-bin/var.c +++ b/cgi-bin/var.c @@ -1,5 +1,5 @@ /* - * "$Id: var.c 7460 2008-04-16 02:19:54Z mike $" + * "$Id$" * * CGI form variable and array functions for CUPS. * @@ -1307,5 +1307,5 @@ cgi_unlink_file(void) /* - * End of "$Id: var.c 7460 2008-04-16 02:19:54Z mike $". + * End of "$Id$". */ diff --git a/conf/Makefile b/conf/Makefile index 04cc1e739..97df33f04 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $" +# "$Id$" # # Configuration file makefile for CUPS. # @@ -139,5 +139,5 @@ uninstall: # -# End of "$Id: Makefile 7938 2008-09-11 23:53:59Z mike $". +# End of "$Id$". # diff --git a/config.h.in b/config.h.in index 3aa648210..e708598ac 100644 --- a/config.h.in +++ b/config.h.in @@ -1,5 +1,5 @@ /* - * "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $" + * "$Id$" * * Configuration file for CUPS. * @@ -706,5 +706,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); } #endif /* !_CUPS_CONFIG_H_ */ /* - * End of "$Id: config.h.in 7918 2008-09-08 22:03:01Z mike $". + * End of "$Id$". */ diff --git a/configure.in b/configure.in index 5dd28e5af..fd0e079db 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl -dnl "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $" +dnl "$Id$" dnl dnl Configuration script for CUPS. dnl @@ -93,5 +93,5 @@ AC_OUTPUT(Makedefs chmod +x cups-config dnl -dnl End of "$Id: configure.in 7833 2008-08-04 20:55:13Z mike $". +dnl End of "$Id$". dnl diff --git a/cups-config.in b/cups-config.in index 7ba104477..436800a64 100755 --- a/cups-config.in +++ b/cups-config.in @@ -1,6 +1,6 @@ #! /bin/sh # -# "$Id: cups-config.in 9926 2011-08-27 09:23:01Z mike $" +# "$Id$" # # CUPS configuration utility. # @@ -142,5 +142,5 @@ while test $# -gt 0; do done # -# End of "$Id: cups-config.in 9926 2011-08-27 09:23:01Z mike $". +# End of "$Id$". # diff --git a/cups/Makefile b/cups/Makefile index f1c3a336f..c68ef2fc4 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" +# "$Id$" # # API library Makefile for CUPS. # @@ -639,5 +639,5 @@ include Dependencies # -# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". +# End of "$Id$". # diff --git a/cups/adminutil.c b/cups/adminutil.c index 8b5a53020..a84a5363e 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -1,5 +1,5 @@ /* - * "$Id: adminutil.c 7850 2008-08-20 00:07:25Z mike $" + * "$Id$" * * Administration utility API definitions for CUPS. * @@ -2337,5 +2337,5 @@ write_option(cups_file_t *dstfp, /* I - PPD file */ /* - * End of "$Id: adminutil.c 7850 2008-08-20 00:07:25Z mike $". + * End of "$Id$". */ diff --git a/cups/adminutil.h b/cups/adminutil.h index 826061570..52dfe9260 100644 --- a/cups/adminutil.h +++ b/cups/adminutil.h @@ -1,5 +1,5 @@ /* - * "$Id: adminutil.h 7026 2007-10-19 00:57:45Z mike $" + * "$Id$" * * Administration utility API definitions for CUPS. * @@ -77,5 +77,5 @@ extern int cupsAdminSetServerSettings(http_t *http, #endif /* !_CUPS_ADMINUTIL_H_ */ /* - * End of "$Id: adminutil.h 7026 2007-10-19 00:57:45Z mike $". + * End of "$Id$". */ diff --git a/cups/array.c b/cups/array.c index 7a036784f..9fbba6205 100644 --- a/cups/array.c +++ b/cups/array.c @@ -1,5 +1,5 @@ /* - * "$Id: array.c 7616 2008-05-28 00:34:13Z mike $" + * "$Id$" * * Sorted array routines for CUPS. * @@ -1362,5 +1362,5 @@ cups_array_find(cups_array_t *a, /* I - Array */ /* - * End of "$Id: array.c 7616 2008-05-28 00:34:13Z mike $". + * End of "$Id$". */ diff --git a/cups/array.h b/cups/array.h index 466a2721f..385b7dffc 100644 --- a/cups/array.h +++ b/cups/array.h @@ -1,5 +1,5 @@ /* - * "$Id: array.h 7266 2008-01-29 02:15:29Z mike $" + * "$Id$" * * Sorted array definitions for CUPS. * @@ -88,5 +88,5 @@ extern void *cupsArrayUserData(cups_array_t *a) _CUPS_API_1_2; #endif /* !_CUPS_ARRAY_H_ */ /* - * End of "$Id: array.h 7266 2008-01-29 02:15:29Z mike $". + * End of "$Id$". */ diff --git a/cups/attr.c b/cups/attr.c index da7a72537..bc241a517 100644 --- a/cups/attr.c +++ b/cups/attr.c @@ -1,5 +1,5 @@ /* - * "$Id: attr.c 7584 2008-05-16 22:55:53Z mike $" + * "$Id$" * * PPD model-specific attribute routines for CUPS. * @@ -331,5 +331,5 @@ _ppdNormalizeMakeAndModel( /* - * End of "$Id: attr.c 7584 2008-05-16 22:55:53Z mike $". + * End of "$Id$". */ diff --git a/cups/auth.c b/cups/auth.c index b0d2d1dd1..8efb34b33 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -1,5 +1,5 @@ /* - * "$Id: auth.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * Authentication functions for CUPS. * @@ -888,5 +888,5 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ /* - * End of "$Id: auth.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/cups/backchannel.c b/cups/backchannel.c index 3ee1dbc97..7fa8c97f5 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -1,5 +1,5 @@ /* - * "$Id: backchannel.c 7616 2008-05-28 00:34:13Z mike $" + * "$Id$" * * Backchannel functions for CUPS. * @@ -195,5 +195,5 @@ cups_setup(fd_set *set, /* I - Set for select() */ /* - * End of "$Id: backchannel.c 7616 2008-05-28 00:34:13Z mike $". + * End of "$Id$". */ diff --git a/cups/backend.c b/cups/backend.c index 6f8a6b2e8..372c04d81 100644 --- a/cups/backend.c +++ b/cups/backend.c @@ -1,5 +1,5 @@ /* - * "$Id: backend.c 7810 2008-07-29 01:11:15Z mike $" + * "$Id$" * * Backend functions for CUPS. * @@ -150,5 +150,5 @@ quote_string(const char *s) /* I - String to write */ /* - * End of "$Id: backend.c 7810 2008-07-29 01:11:15Z mike $". + * End of "$Id$". */ diff --git a/cups/backend.h b/cups/backend.h index d2e37ff8f..85941c71a 100644 --- a/cups/backend.h +++ b/cups/backend.h @@ -1,5 +1,5 @@ /* - * "$Id: backend.h 7810 2008-07-29 01:11:15Z mike $" + * "$Id$" * * Backend definitions for CUPS. * @@ -74,5 +74,5 @@ extern void cupsBackendReport(const char *device_scheme, #endif /* !_CUPS_BACKEND_H_ */ /* - * End of "$Id: backend.h 7810 2008-07-29 01:11:15Z mike $". + * End of "$Id$". */ diff --git a/cups/cups-private.h b/cups/cups-private.h index 6d68be444..cd32e6f82 100644 --- a/cups/cups-private.h +++ b/cups/cups-private.h @@ -1,5 +1,5 @@ /* - * "$Id: cups-private.h 9596 2011-03-11 18:26:36Z mike $" + * "$Id$" * * Private definitions for CUPS. * @@ -281,5 +281,5 @@ extern char *_cupsUserDefault(char *name, size_t namesize); #endif /* !_CUPS_CUPS_PRIVATE_H_ */ /* - * End of "$Id: cups-private.h 9596 2011-03-11 18:26:36Z mike $". + * End of "$Id$". */ diff --git a/cups/cups.h b/cups/cups.h index fd1ced1f5..4c1ed2e72 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -1,5 +1,5 @@ /* - * "$Id: cups.h 8781 2009-08-28 17:34:54Z mike $" + * "$Id$" * * API definitions for CUPS. * @@ -626,5 +626,5 @@ extern const char *cupsUserAgent(void) _CUPS_API_1_7; #endif /* !_CUPS_CUPS_H_ */ /* - * End of "$Id: cups.h 8781 2009-08-28 17:34:54Z mike $". + * End of "$Id$". */ diff --git a/cups/custom.c b/cups/custom.c index 4c4cc8ace..3d1d724fa 100644 --- a/cups/custom.c +++ b/cups/custom.c @@ -1,5 +1,5 @@ /* - * "$Id: custom.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * PPD custom option routines for CUPS. * @@ -118,5 +118,5 @@ ppdNextCustomParam(ppd_coption_t *opt) /* I - Custom option */ /* - * End of "$Id: custom.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cups/dest.c b/cups/dest.c index 7736baa4c..0af7ebaa6 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -1,5 +1,5 @@ /* - * "$Id: dest.c 9568 2011-02-25 06:13:56Z mike $" + * "$Id$" * * User-defined destination (and option) support for CUPS. * @@ -3908,5 +3908,5 @@ cups_make_string( /* - * End of "$Id: dest.c 9568 2011-02-25 06:13:56Z mike $". + * End of "$Id$". */ diff --git a/cups/dir.c b/cups/dir.c index b98f07c85..d30009ecf 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -1,5 +1,5 @@ /* - * "$Id: dir.c 7279 2008-01-31 01:50:44Z mike $" + * "$Id$" * * Directory routines for CUPS. * @@ -468,5 +468,5 @@ cupsDirRewind(cups_dir_t *dp) /* I - Directory pointer */ #endif /* WIN32 */ /* - * End of "$Id: dir.c 7279 2008-01-31 01:50:44Z mike $". + * End of "$Id$". */ diff --git a/cups/dir.h b/cups/dir.h index 362ea201b..75e5b1e61 100644 --- a/cups/dir.h +++ b/cups/dir.h @@ -1,5 +1,5 @@ /* - * "$Id: dir.h 7026 2007-10-19 00:57:45Z mike $" + * "$Id$" * * Public directory definitions for CUPS. * @@ -65,5 +65,5 @@ extern void cupsDirRewind(cups_dir_t *dp) _CUPS_API_1_2; #endif /* !_CUPS_DIR_H_ */ /* - * End of "$Id: dir.h 7026 2007-10-19 00:57:45Z mike $". + * End of "$Id$". */ diff --git a/cups/emit.c b/cups/emit.c index 650e8479b..777488ff1 100644 --- a/cups/emit.c +++ b/cups/emit.c @@ -1,5 +1,5 @@ /* - * "$Id: emit.c 7863 2008-08-26 03:39:59Z mike $" + * "$Id$" * * PPD code emission routines for CUPS. * @@ -1225,5 +1225,5 @@ ppd_handle_media(ppd_file_t *ppd) /* I - PPD file */ /* - * End of "$Id: emit.c 7863 2008-08-26 03:39:59Z mike $". + * End of "$Id$". */ diff --git a/cups/encode.c b/cups/encode.c index 88c7f9bb2..62516a01d 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -1,5 +1,5 @@ /* - * "$Id: encode.c 7696 2008-06-26 00:54:42Z mike $" + * "$Id$" * * Option encoding routines for CUPS. * @@ -872,5 +872,5 @@ compare_ipp_options(_ipp_option_t *a, /* I - First option */ /* - * End of "$Id: encode.c 7696 2008-06-26 00:54:42Z mike $". + * End of "$Id$". */ diff --git a/cups/file.c b/cups/file.c index 1918ec5be..d5e8f8b29 100644 --- a/cups/file.c +++ b/cups/file.c @@ -1,5 +1,5 @@ /* - * "$Id: file.c 7672 2008-06-18 22:03:02Z mike $" + * "$Id$" * * File functions for CUPS. * @@ -2710,5 +2710,5 @@ cups_write(cups_file_t *fp, /* I - CUPS file */ /* - * End of "$Id: file.c 7672 2008-06-18 22:03:02Z mike $". + * End of "$Id$". */ diff --git a/cups/file.h b/cups/file.h index 1428c576d..a3defede1 100644 --- a/cups/file.h +++ b/cups/file.h @@ -1,5 +1,5 @@ /* - * "$Id: file.h 7460 2008-04-16 02:19:54Z mike $" + * "$Id$" * * Public file definitions for CUPS. * @@ -112,5 +112,5 @@ extern ssize_t cupsFileWrite(cups_file_t *fp, const char *buf, #endif /* !_CUPS_FILE_H_ */ /* - * End of "$Id: file.h 7460 2008-04-16 02:19:54Z mike $". + * End of "$Id$". */ diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c index 6c9cc5547..8111e224d 100644 --- a/cups/getifaddrs.c +++ b/cups/getifaddrs.c @@ -1,5 +1,5 @@ /* - * "$Id: getifaddrs.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Network interface functions for CUPS. * @@ -262,5 +262,5 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */ /* - * End of "$Id: getifaddrs.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cups/getputfile.c b/cups/getputfile.c index 6816f6d42..4a09099ee 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -1,5 +1,5 @@ /* - * "$Id: getputfile.c 7359 2008-02-29 19:01:35Z mike $" + * "$Id$" * * Get/put file functions for CUPS. * @@ -498,5 +498,5 @@ cupsPutFile(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DE /* - * End of "$Id: getputfile.c 7359 2008-02-29 19:01:35Z mike $". + * End of "$Id$". */ diff --git a/cups/globals.c b/cups/globals.c index dabd06763..b343bcf32 100644 --- a/cups/globals.c +++ b/cups/globals.c @@ -1,5 +1,5 @@ /* - * "$Id: globals.c 7870 2008-08-27 18:14:10Z mike $" + * "$Id$" * * Global variable access routines for CUPS. * @@ -393,5 +393,5 @@ cups_globals_init(void) /* - * End of "$Id: globals.c 7870 2008-08-27 18:14:10Z mike $". + * End of "$Id$". */ diff --git a/cups/http-addr.c b/cups/http-addr.c index 64ac1b713..00882baca 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -1,5 +1,5 @@ /* - * "$Id: http-addr.c 7910 2008-09-06 00:25:17Z mike $" + * "$Id$" * * HTTP address routines for CUPS. * @@ -769,5 +769,5 @@ httpGetHostname(http_t *http, /* I - HTTP connection or NULL */ /* - * End of "$Id: http-addr.c 7910 2008-09-06 00:25:17Z mike $". + * End of "$Id$". */ diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index 97923ae6f..4943b5867 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -1,5 +1,5 @@ /* - * "$Id: http-addrlist.c 7910 2008-09-06 00:25:17Z mike $" + * "$Id$" * * HTTP address list routines for CUPS. * @@ -882,5 +882,5 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p /* - * End of "$Id: http-addrlist.c 7910 2008-09-06 00:25:17Z mike $". + * End of "$Id$". */ diff --git a/cups/http-private.h b/cups/http-private.h index 77f536c86..d0ea961a0 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -1,5 +1,5 @@ /* - * "$Id: http-private.h 7850 2008-08-20 00:07:25Z mike $" + * "$Id$" * * Private HTTP definitions for CUPS. * @@ -437,5 +437,5 @@ extern int _httpWait(http_t *http, int msec, int usessl); #endif /* !_CUPS_HTTP_PRIVATE_H_ */ /* - * End of "$Id: http-private.h 7850 2008-08-20 00:07:25Z mike $". + * End of "$Id$". */ diff --git a/cups/http-support.c b/cups/http-support.c index f3fe8c24a..3e974bc66 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -1,5 +1,5 @@ /* - * "$Id: http-support.c 7952 2008-09-17 00:56:20Z mike $" + * "$Id$" * * HTTP support routines for CUPS. * @@ -2359,5 +2359,5 @@ http_resolve_cb( /* - * End of "$Id: http-support.c 7952 2008-09-17 00:56:20Z mike $". + * End of "$Id$". */ diff --git a/cups/http.c b/cups/http.c index 919e73adf..046b20c52 100644 --- a/cups/http.c +++ b/cups/http.c @@ -1,5 +1,5 @@ /* - * "$Id: http.c 7850 2008-08-20 00:07:25Z mike $" + * "$Id$" * * HTTP routines for CUPS. * @@ -6027,5 +6027,5 @@ http_write_ssl(http_t *http, /* I - Connection to server */ /* - * End of "$Id: http.c 7850 2008-08-20 00:07:25Z mike $". + * End of "$Id$". */ diff --git a/cups/http.h b/cups/http.h index 555f52b38..8373c7614 100644 --- a/cups/http.h +++ b/cups/http.h @@ -1,5 +1,5 @@ /* - * "$Id: http.h 7026 2007-10-19 00:57:45Z mike $" + * "$Id$" * * Hyper-Text Transport Protocol definitions for CUPS. * @@ -623,5 +623,5 @@ extern http_state_t httpWriteResponse(http_t *http, #endif /* !_CUPS_HTTP_H_ */ /* - * End of "$Id: http.h 7026 2007-10-19 00:57:45Z mike $". + * End of "$Id$". */ diff --git a/cups/ipp-private.h b/cups/ipp-private.h index c29d54895..3dd6451cc 100644 --- a/cups/ipp-private.h +++ b/cups/ipp-private.h @@ -1,5 +1,5 @@ /* - * "$Id: ipp-private.h 7259 2008-01-28 22:26:04Z mike $" + * "$Id$" * * Private IPP definitions for CUPS. * @@ -77,5 +77,5 @@ extern _ipp_option_t *_ippFindOption(const char *name); #endif /* !_CUPS_IPP_H_ */ /* - * End of "$Id: ipp-private.h 7259 2008-01-28 22:26:04Z mike $". + * End of "$Id$". */ diff --git a/cups/ipp-support.c b/cups/ipp-support.c index d5c39f940..4f82e5d0b 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp-support.c 9371 2010-11-17 06:21:32Z mike $" + * "$Id$" * * Internet Printing Protocol support functions for CUPS. * @@ -2248,5 +2248,5 @@ ipp_col_string(ipp_t *col, /* I - Collection attribute */ /* - * End of "$Id: ipp-support.c 9371 2010-11-17 06:21:32Z mike $". + * End of "$Id$". */ diff --git a/cups/ipp.c b/cups/ipp.c index 8c1ace0f1..fd6f45f40 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp.c 10102 2011-11-02 23:52:39Z mike $" + * "$Id$" * * Internet Printing Protocol functions for CUPS. * @@ -7060,5 +7060,5 @@ ipp_write_file(int *fd, /* I - File descriptor */ /* - * End of "$Id: ipp.c 10102 2011-11-02 23:52:39Z mike $". + * End of "$Id$". */ diff --git a/cups/ipp.h b/cups/ipp.h index 7ae983d88..b43ee8552 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -1,5 +1,5 @@ /* - * "$Id: ipp.h 7847 2008-08-19 04:22:14Z mike $" + * "$Id$" * * Internet Printing Protocol definitions for CUPS. * @@ -992,5 +992,5 @@ extern int ippValidateAttributes(ipp_t *ipp) _CUPS_API_1_7; #endif /* !_CUPS_IPP_H_ */ /* - * End of "$Id: ipp.h 7847 2008-08-19 04:22:14Z mike $". + * End of "$Id$". */ diff --git a/cups/langprintf.c b/cups/langprintf.c index f85507547..f63a473f7 100644 --- a/cups/langprintf.c +++ b/cups/langprintf.c @@ -1,5 +1,5 @@ /* - * "$Id: langprintf.c 7802 2008-07-28 18:50:45Z mike $" + * "$Id$" * * Localized printf/puts functions for CUPS. * @@ -348,5 +348,5 @@ _cupsSetLocale(char *argv[]) /* IO - Command-line arguments */ /* - * End of "$Id: langprintf.c 7802 2008-07-28 18:50:45Z mike $". + * End of "$Id$". */ diff --git a/cups/language.c b/cups/language.c index accdac768..9e3bb8af2 100644 --- a/cups/language.c +++ b/cups/language.c @@ -1,5 +1,5 @@ /* - * "$Id: language.c 7558 2008-05-12 23:46:44Z mike $" + * "$Id$" * * I18N/language support for CUPS. * @@ -1586,5 +1586,5 @@ cups_unquote(char *d, /* O - Unquoted string */ /* - * End of "$Id: language.c 7558 2008-05-12 23:46:44Z mike $". + * End of "$Id$". */ diff --git a/cups/language.h b/cups/language.h index 91d2012bd..0b8acdee4 100644 --- a/cups/language.h +++ b/cups/language.h @@ -1,5 +1,5 @@ /* - * "$Id: language.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Multi-language support for CUPS. * @@ -111,5 +111,5 @@ extern cups_lang_t *cupsLangGet(const char *language); #endif /* !_CUPS_LANGUAGE_H_ */ /* - * End of "$Id: language.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cups/localize.c b/cups/localize.c index 7bb0fedd0..13f44c018 100644 --- a/cups/localize.c +++ b/cups/localize.c @@ -1,5 +1,5 @@ /* - * "$Id: localize.c 7679 2008-06-19 23:37:45Z mike $" + * "$Id$" * * PPD localization routines for CUPS. * @@ -775,5 +775,5 @@ ppd_ll_CC(char *ll_CC, /* O - Country-specific locale name */ /* - * End of "$Id: localize.c 7679 2008-06-19 23:37:45Z mike $". + * End of "$Id$". */ diff --git a/cups/mark.c b/cups/mark.c index dc2257f39..b44a31a92 100644 --- a/cups/mark.c +++ b/cups/mark.c @@ -1,5 +1,5 @@ /* - * "$Id: mark.c 9042 2010-03-24 00:45:34Z mike $" + * "$Id$" * * Option marking routines for CUPS. * @@ -1097,5 +1097,5 @@ ppd_mark_option(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: mark.c 9042 2010-03-24 00:45:34Z mike $". + * End of "$Id$". */ diff --git a/cups/md5.c b/cups/md5.c index f7c42ad24..1f46a957c 100644 --- a/cups/md5.c +++ b/cups/md5.c @@ -1,5 +1,5 @@ /* - * "$Id: md5.c 9042 2010-03-24 00:45:34Z mike $" + * "$Id$" * * Private MD5 implementation for CUPS. * @@ -342,5 +342,5 @@ _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]) /* - * End of "$Id: md5.c 9042 2010-03-24 00:45:34Z mike $". + * End of "$Id$". */ diff --git a/cups/md5passwd.c b/cups/md5passwd.c index 777073a00..a0dc2cf5b 100644 --- a/cups/md5passwd.c +++ b/cups/md5passwd.c @@ -1,5 +1,5 @@ /* - * "$Id: md5passwd.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * MD5 password support for CUPS. * @@ -138,5 +138,5 @@ httpMD5String(const unsigned char *sum, /* I - MD5 sum data */ /* - * End of "$Id: md5passwd.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cups/notify.c b/cups/notify.c index 78c78cec6..69363aa15 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -1,5 +1,5 @@ /* - * "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $" + * "$Id$" * * Notification routines for CUPS. * @@ -198,5 +198,5 @@ cupsNotifyText(cups_lang_t *lang, /* I - Language data */ /* - * End of "$Id: notify.c 7337 2008-02-22 04:44:04Z mike $". + * End of "$Id$". */ diff --git a/cups/options.c b/cups/options.c index 8efe0b495..14b88c959 100644 --- a/cups/options.c +++ b/cups/options.c @@ -1,5 +1,5 @@ /* - * "$Id: options.c 8181 2008-12-10 17:29:57Z mike $" + * "$Id$" * * Option routines for CUPS. * @@ -707,5 +707,5 @@ cups_find_option( /* - * End of "$Id: options.c 8181 2008-12-10 17:29:57Z mike $". + * End of "$Id$". */ diff --git a/cups/page.c b/cups/page.c index b5c5e34cd..824393d90 100644 --- a/cups/page.c +++ b/cups/page.c @@ -1,5 +1,5 @@ /* - * "$Id: page.c 7791 2008-07-24 00:55:30Z mike $" + * "$Id$" * * Page size functions for CUPS. * @@ -392,5 +392,5 @@ ppdPageLength(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: page.c 7791 2008-07-24 00:55:30Z mike $". + * End of "$Id$". */ diff --git a/cups/ppd.c b/cups/ppd.c index fe58fcfe0..6813ea0e6 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -1,5 +1,5 @@ /* - * "$Id: ppd.c 9900 2011-08-17 20:59:46Z mike $" + * "$Id$" * * PPD file routines for CUPS. * @@ -3394,5 +3394,5 @@ ppd_update_filters(ppd_file_t *ppd,/* I - PPD file */ /* - * End of "$Id: ppd.c 9900 2011-08-17 20:59:46Z mike $". + * End of "$Id$". */ diff --git a/cups/ppd.h b/cups/ppd.h index 3e281bd42..dae2560f5 100644 --- a/cups/ppd.h +++ b/cups/ppd.h @@ -1,5 +1,5 @@ /* - * "$Id: ppd.h 7791 2008-07-24 00:55:30Z mike $" + * "$Id$" * * PostScript Printer Description definitions for CUPS. * @@ -476,5 +476,5 @@ extern int ppdPageSizeLimits(ppd_file_t *ppd, #endif /* !_CUPS_PPD_H_ */ /* - * End of "$Id: ppd.h 7791 2008-07-24 00:55:30Z mike $". + * End of "$Id$". */ diff --git a/cups/request.c b/cups/request.c index 5b0559dc7..9f0995ba3 100644 --- a/cups/request.c +++ b/cups/request.c @@ -1,5 +1,5 @@ /* - * "$Id: request.c 7946 2008-09-16 23:27:54Z mike $" + * "$Id$" * * IPP utilities for CUPS. * @@ -1176,5 +1176,5 @@ _cupsSetHTTPError(http_status_t status) /* I - HTTP status code */ /* - * End of "$Id: request.c 7946 2008-09-16 23:27:54Z mike $". + * End of "$Id$". */ diff --git a/cups/sidechannel.c b/cups/sidechannel.c index 7bd626eaf..cec6372a7 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -1,5 +1,5 @@ /* - * "$Id: sidechannel.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * Side-channel API code for CUPS. * @@ -638,5 +638,5 @@ cupsSideChannelWrite( /* - * End of "$Id: sidechannel.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/cups/sidechannel.h b/cups/sidechannel.h index 5f97257e0..48353d1ee 100644 --- a/cups/sidechannel.h +++ b/cups/sidechannel.h @@ -1,5 +1,5 @@ /* - * "$Id: sidechannel.h 7616 2008-05-28 00:34:13Z mike $" + * "$Id$" * * Side-channel API definitions for CUPS. * @@ -143,5 +143,5 @@ extern cups_sc_status_t cupsSideChannelSNMPWalk(const char *oid, double timeout, #endif /* !_CUPS_SIDECHANNEL_H_ */ /* - * End of "$Id: sidechannel.h 7616 2008-05-28 00:34:13Z mike $". + * End of "$Id$". */ diff --git a/cups/snprintf.c b/cups/snprintf.c index 65f261d3f..9af6b90f8 100644 --- a/cups/snprintf.c +++ b/cups/snprintf.c @@ -1,5 +1,5 @@ /* - * "$Id: snprintf.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * snprintf functions for CUPS. * @@ -361,6 +361,6 @@ _cups_snprintf(char *buffer, /* O - Output buffer */ /* - * End of "$Id: snprintf.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cups/string.c b/cups/string.c index ad5b5bc61..7a862f661 100644 --- a/cups/string.c +++ b/cups/string.c @@ -1,5 +1,5 @@ /* - * "$Id: string.c 7460 2008-04-16 02:19:54Z mike $" + * "$Id$" * * String functions for CUPS. * @@ -759,5 +759,5 @@ compare_sp_items(_cups_sp_item_t *a, /* I - First item */ /* - * End of "$Id: string.c 7460 2008-04-16 02:19:54Z mike $". + * End of "$Id$". */ diff --git a/cups/tempfile.c b/cups/tempfile.c index ac59d9f8c..75c95d6fb 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -1,5 +1,5 @@ /* - * "$Id: tempfile.c 7337 2008-02-22 04:44:04Z mike $" + * "$Id$" * * Temp file utilities for CUPS. * @@ -229,5 +229,5 @@ cupsTempFile2(char *filename, /* I - Pointer to buffer */ /* - * End of "$Id: tempfile.c 7337 2008-02-22 04:44:04Z mike $". + * End of "$Id$". */ diff --git a/cups/testadmin.c b/cups/testadmin.c index 8119016ab..28dafa7f2 100644 --- a/cups/testadmin.c +++ b/cups/testadmin.c @@ -1,5 +1,5 @@ /* - * "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * Admin function test program for CUPS. * @@ -117,5 +117,5 @@ show_settings( /* - * End of "$Id: testadmin.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/cups/testarray.c b/cups/testarray.c index 5ae622606..d3e677427 100644 --- a/cups/testarray.c +++ b/cups/testarray.c @@ -1,5 +1,5 @@ /* - * "$Id: testarray.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Array test program for CUPS. * @@ -558,5 +558,5 @@ load_words(const char *filename, /* I - File to load */ /* - * End of "$Id: testarray.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cups/testfile.c b/cups/testfile.c index 2aa3fb99c..e3b44638b 100644 --- a/cups/testfile.c +++ b/cups/testfile.c @@ -1,5 +1,5 @@ /* - * "$Id: testfile.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * File test program for CUPS. * @@ -817,5 +817,5 @@ read_write_tests(int compression) /* I - Use compression? */ /* - * End of "$Id: testfile.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/cups/testhttp.c b/cups/testhttp.c index 5d1dc0adf..6b1a14d25 100644 --- a/cups/testhttp.c +++ b/cups/testhttp.c @@ -1,5 +1,5 @@ /* - * "$Id: testhttp.c 7742 2008-07-15 20:23:09Z mike $" + * "$Id$" * * HTTP test program for CUPS. * @@ -658,5 +658,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testhttp.c 7742 2008-07-15 20:23:09Z mike $". + * End of "$Id$". */ diff --git a/cups/testi18n.c b/cups/testi18n.c index d8eb4ba0f..84645a859 100644 --- a/cups/testi18n.c +++ b/cups/testi18n.c @@ -1,5 +1,5 @@ /* - * "$Id: testi18n.c 7560 2008-05-13 06:34:04Z mike $" + * "$Id$" * * Internationalization test for CUPS. * @@ -615,5 +615,5 @@ print_utf8(const char *msg, /* I - Message String */ /* - * End of "$Id: testi18n.c 7560 2008-05-13 06:34:04Z mike $" + * End of "$Id$" */ diff --git a/cups/testipp.c b/cups/testipp.c index 68c27c3d0..a0f6a686f 100644 --- a/cups/testipp.c +++ b/cups/testipp.c @@ -1,5 +1,5 @@ /* - * "$Id: testipp.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * IPP test program for CUPS. * @@ -1017,5 +1017,5 @@ write_cb(_ippdata_t *data, /* I - Data */ /* - * End of "$Id: testipp.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cups/testlang.c b/cups/testlang.c index 2cec8b6b8..701c14db4 100644 --- a/cups/testlang.c +++ b/cups/testlang.c @@ -1,5 +1,5 @@ /* - * "$Id: testlang.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Localization test program for CUPS. * @@ -110,5 +110,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testlang.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/cups/testppd.c b/cups/testppd.c index ef88425dc..aa4a06068 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -1,5 +1,5 @@ /* - * "$Id: testppd.c 7897 2008-09-02 19:33:19Z mike $" + * "$Id$" * * PPD test program for CUPS. * @@ -1108,5 +1108,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testppd.c 7897 2008-09-02 19:33:19Z mike $". + * End of "$Id$". */ diff --git a/cups/transcode.c b/cups/transcode.c index 8c58dab6f..380807f95 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -1,5 +1,5 @@ /* - * "$Id: transcode.c 9306 2010-09-16 21:43:57Z mike $" + * "$Id$" * * Transcoding support for CUPS. * @@ -716,5 +716,5 @@ cupsUTF32ToUTF8( /* - * End of "$Id: transcode.c 9306 2010-09-16 21:43:57Z mike $" + * End of "$Id$" */ diff --git a/cups/transcode.h b/cups/transcode.h index e2db9513b..cafea33c5 100644 --- a/cups/transcode.h +++ b/cups/transcode.h @@ -1,5 +1,5 @@ /* - * "$Id: transcode.h 7026 2007-10-19 00:57:45Z mike $" + * "$Id$" * * Transcoding definitions for CUPS. * @@ -77,5 +77,5 @@ extern int cupsUTF32ToUTF8(cups_utf8_t *dest, /* - * End of "$Id: transcode.h 7026 2007-10-19 00:57:45Z mike $" + * End of "$Id$" */ diff --git a/cups/usersys.c b/cups/usersys.c index e9f215ec0..1bcfe6423 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -1,5 +1,5 @@ /* - * "$Id: usersys.c 8498 2009-04-13 17:03:15Z mike $" + * "$Id$" * * User, system, and password routines for CUPS. * @@ -1135,5 +1135,5 @@ cups_read_client_conf( /* - * End of "$Id: usersys.c 8498 2009-04-13 17:03:15Z mike $". + * End of "$Id$". */ diff --git a/cups/util.c b/cups/util.c index 30e4ce81f..8b3070917 100644 --- a/cups/util.c +++ b/cups/util.c @@ -1,5 +1,5 @@ /* - * "$Id: util.c 7850 2008-08-20 00:07:25Z mike $" + * "$Id$" * * Printing utilities for CUPS. * @@ -1850,5 +1850,5 @@ cups_get_printer_uri( /* - * End of "$Id: util.c 7850 2008-08-20 00:07:25Z mike $". + * End of "$Id$". */ diff --git a/data/Makefile b/data/Makefile index 7df826095..4f7f68034 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" +# "$Id$" # # Datafile makefile for CUPS. # @@ -146,5 +146,5 @@ uninstall: # -# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". +# End of "$Id$". # diff --git a/doc/Makefile b/doc/Makefile index be7fe3d6a..b6af04c1f 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7941 2008-09-16 00:46:13Z mike $" +# "$Id$" # # Documentation makefile for CUPS. # diff --git a/filter/Makefile b/filter/Makefile index 11fedcba1..08451e9c4 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" +# "$Id$" # # Filter makefile for CUPS. # @@ -398,5 +398,5 @@ include Dependencies # -# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". +# End of "$Id$". # diff --git a/filter/common.c b/filter/common.c index 689253cce..b80f4d5b5 100644 --- a/filter/common.c +++ b/filter/common.c @@ -1,5 +1,5 @@ /* - * "$Id: common.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Common filter routines for CUPS. * @@ -531,5 +531,5 @@ WriteTextComment(const char *name, /* I - Comment name ("Title", etc.) */ /* - * End of "$Id: common.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/filter/common.h b/filter/common.h index 3501085af..bbaf99eed 100644 --- a/filter/common.h +++ b/filter/common.h @@ -1,5 +1,5 @@ /* - * "$Id: common.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Common filter definitions for CUPS. * @@ -74,5 +74,5 @@ extern void WriteTextComment(const char *name, const char *value); /* - * End of "$Id: common.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/filter/error.c b/filter/error.c index 08edebb67..c1cd0d3b1 100644 --- a/filter/error.c +++ b/filter/error.c @@ -1,5 +1,5 @@ /* - * "$Id: error.c 7460 2008-04-16 02:19:54Z mike $" + * "$Id$" * * Raster error handling for CUPS. * @@ -282,5 +282,5 @@ get_error_buffer(void) /* - * End of "$Id: error.c 7460 2008-04-16 02:19:54Z mike $". + * End of "$Id$". */ diff --git a/filter/gziptoany.c b/filter/gziptoany.c index 09a636b14..a1b1e2b84 100644 --- a/filter/gziptoany.c +++ b/filter/gziptoany.c @@ -1,5 +1,5 @@ /* - * "$Id: gziptoany.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * GZIP/raw pre-filter for CUPS. * @@ -108,5 +108,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: gziptoany.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/filter/interpret.c b/filter/interpret.c index 70d083c63..77157fb97 100644 --- a/filter/interpret.c +++ b/filter/interpret.c @@ -1,5 +1,5 @@ /* - * "$Id: interpret.c 7852 2008-08-21 04:19:45Z mike $" + * "$Id$" * * PPD command interpreter for CUPS. * @@ -1684,5 +1684,5 @@ DEBUG_stack(_cups_ps_stack_t *st) /* I - Stack */ /* - * End of "$Id: interpret.c 7852 2008-08-21 04:19:45Z mike $". + * End of "$Id$". */ diff --git a/filter/pstops.c b/filter/pstops.c index 8f406fe57..2230a8b61 100644 --- a/filter/pstops.c +++ b/filter/pstops.c @@ -1,5 +1,5 @@ /* - * "$Id: pstops.c 7977 2008-09-23 23:44:33Z mike $" + * "$Id$" * * PostScript filter for CUPS. * @@ -3430,5 +3430,5 @@ write_options( /* - * End of "$Id: pstops.c 7977 2008-09-23 23:44:33Z mike $". + * End of "$Id$". */ diff --git a/filter/raster.c b/filter/raster.c index 1ecd90dea..801129e60 100644 --- a/filter/raster.c +++ b/filter/raster.c @@ -1,5 +1,5 @@ /* - * "$Id: raster.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * Raster file routines for CUPS. * @@ -1475,5 +1475,5 @@ cups_write_fd(void *ctx, /* I - File descriptor pointer */ /* - * End of "$Id: raster.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/filter/rasterbench.c b/filter/rasterbench.c index 0e3c47af2..69e139d37 100644 --- a/filter/rasterbench.c +++ b/filter/rasterbench.c @@ -1,5 +1,5 @@ /* - * "$Id: rasterbench.c 7376 2008-03-19 21:07:45Z mike $" + * "$Id$" * * Raster benchmark program for CUPS. * @@ -351,5 +351,5 @@ write_test(int fd, /* I - File descriptor to write to */ /* - * End of "$Id: rasterbench.c 7376 2008-03-19 21:07:45Z mike $". + * End of "$Id$". */ diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c index 08135bcc1..8257fec5b 100644 --- a/filter/rastertoepson.c +++ b/filter/rastertoepson.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertoepson.c 7450 2008-04-14 19:39:02Z mike $" + * "$Id$" * * EPSON ESC/P and ESC/P2 filter for CUPS. * @@ -1153,5 +1153,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: rastertoepson.c 7450 2008-04-14 19:39:02Z mike $". + * End of "$Id$". */ diff --git a/filter/rastertohp.c b/filter/rastertohp.c index b7390c124..ee6358ba9 100644 --- a/filter/rastertohp.c +++ b/filter/rastertohp.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertohp.c 7834 2008-08-04 21:02:09Z mike $" + * "$Id$" * * Hewlett-Packard Page Control Language filter for CUPS. * @@ -882,5 +882,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: rastertohp.c 7834 2008-08-04 21:02:09Z mike $". + * End of "$Id$". */ diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c index 6420c60b8..f5d80256a 100644 --- a/filter/rastertolabel.c +++ b/filter/rastertolabel.c @@ -1,5 +1,5 @@ /* - * "$Id: rastertolabel.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * Label printer filter for CUPS. * @@ -1297,5 +1297,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: rastertolabel.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/filter/testraster.c b/filter/testraster.c index 4519aa25d..8920e2e77 100644 --- a/filter/testraster.c +++ b/filter/testraster.c @@ -1,5 +1,5 @@ /* - * "$Id: testraster.c 7376 2008-03-19 21:07:45Z mike $" + * "$Id$" * * Raster test program routines for CUPS. * @@ -1074,5 +1074,5 @@ print_changes( /* - * End of "$Id: testraster.c 7376 2008-03-19 21:07:45Z mike $". + * End of "$Id$". */ diff --git a/locale/Makefile b/locale/Makefile index 180497410..1a977101b 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" +# "$Id$" # # Locale file makefile for CUPS. # @@ -218,5 +218,5 @@ include Dependencies # -# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". +# End of "$Id$". # diff --git a/locale/checkpo.c b/locale/checkpo.c index eec10c4eb..64563f679 100644 --- a/locale/checkpo.c +++ b/locale/checkpo.c @@ -1,5 +1,5 @@ /* - * "$Id: checkpo.c 7223 2008-01-16 23:41:19Z mike $" + * "$Id$" * * Verify that translations in the .po file have the same number and type of * printf-style format strings. @@ -409,5 +409,5 @@ free_formats(cups_array_t *fmts) /* I - Array of format strings */ /* - * End of "$Id: checkpo.c 7223 2008-01-16 23:41:19Z mike $". + * End of "$Id$". */ diff --git a/locale/po2strings.c b/locale/po2strings.c index 75335bab0..754a487b4 100644 --- a/locale/po2strings.c +++ b/locale/po2strings.c @@ -1,5 +1,5 @@ /* - * "$Id: po2strings.c 6921 2007-09-06 13:38:37Z mike $" + * "$Id$" * * Convert a GNU gettext .po file to an Apple .strings file. * @@ -292,5 +292,5 @@ main(int argc, /* I - Number of command-line args */ /* - * End of "$Id: po2strings.c 6921 2007-09-06 13:38:37Z mike $". + * End of "$Id$". */ diff --git a/locale/strings2po.c b/locale/strings2po.c index 52eeeeff0..8df9059be 100644 --- a/locale/strings2po.c +++ b/locale/strings2po.c @@ -1,5 +1,5 @@ /* - * "$Id: strings2po.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * Convert Apple .strings file (UTF-16 BE text file) to GNU gettext .po files. * @@ -171,5 +171,5 @@ write_po(FILE *po, /* I - .po file */ /* - * End of "$Id: strings2po.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/locale/translate.c b/locale/translate.c index 53f799916..13228d27a 100644 --- a/locale/translate.c +++ b/locale/translate.c @@ -1,5 +1,5 @@ /* - * "$Id: translate.c 7922 2008-09-10 15:56:47Z mike $" + * "$Id$" * * HTTP-based translation program for CUPS. * @@ -435,5 +435,5 @@ write_string(cups_file_t *fp, /* I - File to write to */ /* - * End of "$Id: translate.c 7922 2008-09-10 15:56:47Z mike $". + * End of "$Id$". */ diff --git a/man/Makefile b/man/Makefile index f7930411c..29e0557aa 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7930 2008-09-10 22:25:54Z mike $" +# "$Id$" # # Man page makefile for CUPS. # @@ -237,5 +237,5 @@ mantohtml: mantohtml.o # -# End of "$Id: Makefile 7930 2008-09-10 22:25:54Z mike $". +# End of "$Id$". # diff --git a/man/mantohtml.c b/man/mantohtml.c index 3c18e82a5..13e733697 100644 --- a/man/mantohtml.c +++ b/man/mantohtml.c @@ -1,5 +1,5 @@ /* - * "$Id: mantohtml.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * Man page to HTML conversion program. * @@ -716,5 +716,5 @@ strmove(char *d, /* I - Destination */ /* - * End of "$Id: mantohtml.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/monitor/Makefile b/monitor/Makefile index 19ee382d1..7ba7c4230 100644 --- a/monitor/Makefile +++ b/monitor/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" +# "$Id$" # # Port monitor makefile for CUPS. # @@ -143,5 +143,5 @@ include Dependencies # -# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". +# End of "$Id$". # diff --git a/monitor/bcp.c b/monitor/bcp.c index ffd32d575..2354d102d 100644 --- a/monitor/bcp.c +++ b/monitor/bcp.c @@ -1,5 +1,5 @@ /* - * "$Id: bcp.c 6800 2007-08-16 18:28:44Z mike $" + * "$Id$" * * TBCP port monitor for CUPS. * @@ -288,5 +288,5 @@ pswrite(const char *buf, /* I - Buffer to write */ /* - * End of "$Id: bcp.c 6800 2007-08-16 18:28:44Z mike $". + * End of "$Id$". */ diff --git a/monitor/tbcp.c b/monitor/tbcp.c index e369975bc..9ed1e00e7 100644 --- a/monitor/tbcp.c +++ b/monitor/tbcp.c @@ -1,5 +1,5 @@ /* - * "$Id: tbcp.c 6800 2007-08-16 18:28:44Z mike $" + * "$Id$" * * TBCP port monitor for CUPS. * @@ -278,5 +278,5 @@ pswrite(const char *buf, /* I - Buffer to write */ /* - * End of "$Id: tbcp.c 6800 2007-08-16 18:28:44Z mike $". + * End of "$Id$". */ diff --git a/notifier/Makefile b/notifier/Makefile index 95f147fe0..e3d741351 100644 --- a/notifier/Makefile +++ b/notifier/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7920 2008-09-10 01:04:10Z mike $" +# "$Id$" # # Notifier makefile for CUPS. # @@ -161,5 +161,5 @@ include Dependencies # -# End of "$Id: Makefile 7920 2008-09-10 01:04:10Z mike $". +# End of "$Id$". # diff --git a/notifier/mailto.c b/notifier/mailto.c index da2db951d..7b2f8a1a2 100644 --- a/notifier/mailto.c +++ b/notifier/mailto.c @@ -1,5 +1,5 @@ /* - * "$Id: mailto.c 7460 2008-04-16 02:19:54Z mike $" + * "$Id$" * * "mailto" notifier for CUPS. * @@ -642,5 +642,5 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ /* - * End of "$Id: mailto.c 7460 2008-04-16 02:19:54Z mike $". + * End of "$Id$". */ diff --git a/notifier/rss.c b/notifier/rss.c index deee6b5b7..f16fbbd2e 100644 --- a/notifier/rss.c +++ b/notifier/rss.c @@ -1,5 +1,5 @@ /* - * "$Id: rss.c 7824 2008-08-01 21:11:55Z mike $" + * "$Id$" * * RSS notifier for CUPS. * @@ -737,5 +737,5 @@ xml_escape(const char *s) /* I - String to escape */ /* - * End of "$Id: rss.c 7824 2008-08-01 21:11:55Z mike $". + * End of "$Id$". */ diff --git a/notifier/testnotify.c b/notifier/testnotify.c index faa846d08..c42bd84fc 100644 --- a/notifier/testnotify.c +++ b/notifier/testnotify.c @@ -1,5 +1,5 @@ /* - * "$Id: testnotify.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Test notifier for CUPS. * @@ -123,5 +123,5 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ /* - * End of "$Id: testnotify.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/scheduler/Makefile b/scheduler/Makefile index b03d347cb..3c0fff3e1 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7875 2008-08-27 22:53:31Z mike $" +# "$Id$" # # Scheduler Makefile for CUPS. # @@ -561,5 +561,5 @@ include Dependencies # -# End of "$Id: Makefile 7875 2008-08-27 22:53:31Z mike $". +# End of "$Id$". # diff --git a/scheduler/auth.c b/scheduler/auth.c index 292a7f29c..5c7f05731 100644 --- a/scheduler/auth.c +++ b/scheduler/auth.c @@ -1,5 +1,5 @@ /* - * "$Id: auth.c 7830 2008-08-04 20:38:50Z mike $" + * "$Id$" * * Authorization routines for the CUPS scheduler. * @@ -2607,5 +2607,5 @@ to64(char *s, /* O - Output string */ /* - * End of "$Id: auth.c 7830 2008-08-04 20:38:50Z mike $". + * End of "$Id$". */ diff --git a/scheduler/auth.h b/scheduler/auth.h index fecee62d9..feb2fcd52 100644 --- a/scheduler/auth.h +++ b/scheduler/auth.h @@ -1,5 +1,5 @@ /* - * "$Id: auth.h 7317 2008-02-15 22:29:27Z mike $" + * "$Id$" * * Authorization definitions for the CUPS scheduler. * @@ -147,5 +147,5 @@ extern cupsd_location_t *cupsdNewLocation(const char *location); /* - * End of "$Id: auth.h 7317 2008-02-15 22:29:27Z mike $". + * End of "$Id$". */ diff --git a/scheduler/banners.c b/scheduler/banners.c index a4597964b..77ae797ae 100644 --- a/scheduler/banners.c +++ b/scheduler/banners.c @@ -1,5 +1,5 @@ /* - * "$Id: banners.c 7221 2008-01-16 22:20:08Z mike $" + * "$Id$" * * Banner routines for the CUPS scheduler. * @@ -220,5 +220,5 @@ free_banners(void) /* - * End of "$Id: banners.c 7221 2008-01-16 22:20:08Z mike $". + * End of "$Id$". */ diff --git a/scheduler/banners.h b/scheduler/banners.h index b215fe6ab..fb933aaae 100644 --- a/scheduler/banners.h +++ b/scheduler/banners.h @@ -1,5 +1,5 @@ /* - * "$Id: banners.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Banner definitions for the CUPS scheduler. * @@ -41,5 +41,5 @@ extern void cupsdLoadBanners(const char *d); /* - * End of "$Id: banners.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/scheduler/cert.c b/scheduler/cert.c index fa956034a..a2f8ff4f9 100644 --- a/scheduler/cert.c +++ b/scheduler/cert.c @@ -1,5 +1,5 @@ /* - * "$Id: cert.c 7673 2008-06-18 22:31:26Z mike $" + * "$Id$" * * Authentication certificate routines for the CUPS scheduler. * @@ -436,5 +436,5 @@ cupsdInitCerts(void) /* - * End of "$Id: cert.c 7673 2008-06-18 22:31:26Z mike $". + * End of "$Id$". */ diff --git a/scheduler/cert.h b/scheduler/cert.h index d479b2ec9..f2dc637bf 100644 --- a/scheduler/cert.h +++ b/scheduler/cert.h @@ -1,5 +1,5 @@ /* - * "$Id: cert.h 7383 2008-03-20 20:58:07Z mike $" + * "$Id$" * * Authentication certificate definitions for the CUPS scheduler. * @@ -49,5 +49,5 @@ extern void cupsdInitCerts(void); /* - * End of "$Id: cert.h 7383 2008-03-20 20:58:07Z mike $". + * End of "$Id$". */ diff --git a/scheduler/classes.c b/scheduler/classes.c index f5b5bcc62..5ced554f5 100644 --- a/scheduler/classes.c +++ b/scheduler/classes.c @@ -1,5 +1,5 @@ /* - * "$Id: classes.c 10104 2011-11-04 06:37:03Z mike $" + * "$Id$" * * Printer class routines for the CUPS scheduler. * @@ -814,5 +814,5 @@ cupsdSaveAllClasses(void) /* - * End of "$Id: classes.c 10104 2011-11-04 06:37:03Z mike $". + * End of "$Id$". */ diff --git a/scheduler/classes.h b/scheduler/classes.h index 0170b97e7..b24b7de11 100644 --- a/scheduler/classes.h +++ b/scheduler/classes.h @@ -1,5 +1,5 @@ /* - * "$Id: classes.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Printer class definitions for the CUPS scheduler. * @@ -31,5 +31,5 @@ extern void cupsdSaveAllClasses(void); /* - * End of "$Id: classes.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/scheduler/client.c b/scheduler/client.c index 141079fab..b5cf43319 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -1,5 +1,5 @@ /* - * "$Id: client.c 10886 2013-03-08 17:56:02Z mike $" + * "$Id$" * * Client routines for the CUPS scheduler. * @@ -2817,7 +2817,7 @@ cupsdWriteClient(cupsd_client_t *con) /* I - Client connection */ ipp_state_t ipp_state; /* IPP state value */ - cupsdLogMessage(CUPSD_LOG_DEBUG2, + cupsdLogMessage(CUPSD_LOG_DEBUG, "[Client %d] cupsdWriteClient " "error=%d, " "used=%d, " @@ -2882,7 +2882,9 @@ cupsdWriteClient(cupsd_client_t *con) /* I - Client connection */ * Write a single attribute or the IPP message header... */ - ipp_state = ippWrite(HTTP(con), con->response); +// ipp_state = ippWrite(HTTP(con), con->response); + ipp_state = ippWriteIO(HTTP(con), (ipp_iocb_t)httpWrite2, 1, NULL, + con->response); /* * If the write buffer has been flushed, stop buffering up attributes... @@ -2893,6 +2895,11 @@ cupsdWriteClient(cupsd_client_t *con) /* I - Client connection */ } while (ipp_state != IPP_STATE_DATA && ipp_state != IPP_STATE_ERROR); + cupsdLogMessage(CUPSD_LOG_DEBUG, + "[Client %d] Writing IPP response, ipp_state=%d, old " + "wused=%d, new wused=%d", con->http.fd, ipp_state, wused, + con->http.wused); + if (con->http.wused > 0) httpFlushWrite(HTTP(con)); @@ -4341,5 +4348,5 @@ write_pipe(cupsd_client_t *con) /* I - Client connection */ /* - * End of "$Id: client.c 10886 2013-03-08 17:56:02Z mike $". + * End of "$Id$". */ diff --git a/scheduler/client.h b/scheduler/client.h index 3f5475f0b..293597135 100644 --- a/scheduler/client.h +++ b/scheduler/client.h @@ -1,5 +1,5 @@ /* - * "$Id: client.h 7935 2008-09-11 01:54:11Z mike $" + * "$Id$" * * Client definitions for the CUPS scheduler. * @@ -140,5 +140,5 @@ extern int cupsdStartTLS(cupsd_client_t *con); /* - * End of "$Id: client.h 7935 2008-09-11 01:54:11Z mike $". + * End of "$Id$". */ diff --git a/scheduler/conf.c b/scheduler/conf.c index 28cfbd24c..b81211935 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -1,5 +1,5 @@ /* - * "$Id: conf.c 9352 2010-11-06 04:55:26Z mike $" + * "$Id$" * * Configuration routines for the CUPS scheduler. * @@ -4079,5 +4079,5 @@ set_policy_defaults(cupsd_policy_t *pol)/* I - Policy */ /* - * End of "$Id: conf.c 9352 2010-11-06 04:55:26Z mike $". + * End of "$Id$". */ diff --git a/scheduler/conf.h b/scheduler/conf.h index 714661eb0..e095ecfaa 100644 --- a/scheduler/conf.h +++ b/scheduler/conf.h @@ -1,5 +1,5 @@ /* - * "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $" + * "$Id$" * * Configuration file definitions for the CUPS scheduler. * @@ -295,5 +295,5 @@ extern int cupsdWriteErrorLog(int level, const char *message); /* - * End of "$Id: conf.h 7935 2008-09-11 01:54:11Z mike $". + * End of "$Id$". */ diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c index 1a1dbb264..0cd5b8ea8 100644 --- a/scheduler/cups-deviced.c +++ b/scheduler/cups-deviced.c @@ -1,5 +1,5 @@ /* - * "$Id: cups-deviced.c 7816 2008-07-30 20:53:31Z mike $" + * "$Id$" * * Device scanning mini-daemon for CUPS. * @@ -806,5 +806,5 @@ start_backend(const char *name, /* I - Backend to run */ /* - * End of "$Id: cups-deviced.c 7816 2008-07-30 20:53:31Z mike $". + * End of "$Id$". */ diff --git a/scheduler/cups-lpd.c b/scheduler/cups-lpd.c index 15b855072..f175f6669 100644 --- a/scheduler/cups-lpd.c +++ b/scheduler/cups-lpd.c @@ -1,5 +1,5 @@ /* - * "$Id: cups-lpd.c 7899 2008-09-03 12:57:17Z mike $" + * "$Id$" * * Line Printer Daemon interface for CUPS. * @@ -1622,5 +1622,5 @@ smart_gets(char *s, /* I - Pointer to line buffer */ /* - * End of "$Id: cups-lpd.c 7899 2008-09-03 12:57:17Z mike $". + * End of "$Id$". */ diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h index fb088329c..ddd642b8d 100644 --- a/scheduler/cupsd.h +++ b/scheduler/cupsd.h @@ -1,5 +1,5 @@ /* - * "$Id: cupsd.h 7928 2008-09-10 22:14:22Z mike $" + * "$Id$" * * Main header file for the CUPS scheduler. * @@ -231,5 +231,5 @@ extern void cupsdStopServer(void); /* - * End of "$Id: cupsd.h 7928 2008-09-10 22:14:22Z mike $". + * End of "$Id$". */ diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c index 84eefde5f..177766e53 100644 --- a/scheduler/cupsfilter.c +++ b/scheduler/cupsfilter.c @@ -1,5 +1,5 @@ /* - * "$Id: cupsfilter.c 7952 2008-09-17 00:56:20Z mike $" + * "$Id$" * * Filtering program for CUPS. * @@ -1500,5 +1500,5 @@ usage(const char *opt) /* I - Incorrect option, if any */ /* - * End of "$Id: cupsfilter.c 7952 2008-09-17 00:56:20Z mike $". + * End of "$Id$". */ diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index 74459f7f6..3eabf2f30 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -1,5 +1,5 @@ /* - * "$Id: dirsvc.c 7933 2008-09-11 00:44:58Z mike $" + * "$Id$" * * Directory services routines for the CUPS scheduler. * @@ -1668,5 +1668,5 @@ update_smb(int onoff) /* I - 1 = turn on, 0 = turn off */ /* - * End of "$Id: dirsvc.c 7933 2008-09-11 00:44:58Z mike $". + * End of "$Id$". */ diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h index 39b74ce9c..22f3f9c28 100644 --- a/scheduler/dirsvc.h +++ b/scheduler/dirsvc.h @@ -1,5 +1,5 @@ /* - * "$Id: dirsvc.h 7933 2008-09-11 00:44:58Z mike $" + * "$Id$" * * Directory services definitions for the CUPS scheduler. * @@ -80,5 +80,5 @@ extern void cupsdUpdateDNSSDName(void); /* - * End of "$Id: dirsvc.h 7933 2008-09-11 00:44:58Z mike $". + * End of "$Id$". */ diff --git a/scheduler/env.c b/scheduler/env.c index 5fbe52c55..b41fea118 100644 --- a/scheduler/env.c +++ b/scheduler/env.c @@ -1,5 +1,5 @@ /* - * "$Id: env.c 9459 2011-01-11 03:48:42Z mike $" + * "$Id$" * * Environment management routines for the CUPS scheduler. * @@ -269,5 +269,5 @@ find_env(const char *name) /* I - Variable name */ /* - * End of "$Id: env.c 9459 2011-01-11 03:48:42Z mike $". + * End of "$Id$". */ diff --git a/scheduler/filter.c b/scheduler/filter.c index b708fa368..d1446f654 100644 --- a/scheduler/filter.c +++ b/scheduler/filter.c @@ -1,5 +1,5 @@ /* - * "$Id: filter.c 7694 2008-06-26 00:23:20Z mike $" + * "$Id$" * * File type conversion routines for CUPS. * @@ -500,5 +500,5 @@ mime_find_filters( /* - * End of "$Id: filter.c 7694 2008-06-26 00:23:20Z mike $". + * End of "$Id$". */ diff --git a/scheduler/ipp.c b/scheduler/ipp.c index 3c18f01ab..83041d64b 100644 --- a/scheduler/ipp.c +++ b/scheduler/ipp.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp.c 7944 2008-09-16 22:32:42Z mike $" + * "$Id$" * * IPP routines for the CUPS scheduler. * @@ -11077,5 +11077,5 @@ validate_user(cupsd_job_t *job, /* I - Job */ /* - * End of "$Id: ipp.c 7944 2008-09-16 22:32:42Z mike $". + * End of "$Id$". */ diff --git a/scheduler/job.c b/scheduler/job.c index 021d78f31..3e17ba9e2 100644 --- a/scheduler/job.c +++ b/scheduler/job.c @@ -1,5 +1,5 @@ /* - * "$Id: job.c 7902 2008-09-03 14:20:17Z mike $" + * "$Id$" * * Job management routines for the CUPS scheduler. * @@ -5200,5 +5200,5 @@ update_job_attrs(cupsd_job_t *job, /* I - Job to update */ /* - * End of "$Id: job.c 7902 2008-09-03 14:20:17Z mike $". + * End of "$Id$". */ diff --git a/scheduler/job.h b/scheduler/job.h index e0250afee..f8527f956 100644 --- a/scheduler/job.h +++ b/scheduler/job.h @@ -1,5 +1,5 @@ /* - * "$Id: job.h 7883 2008-08-28 20:38:13Z mike $" + * "$Id$" * * Print job definitions for the CUPS scheduler. * @@ -171,5 +171,5 @@ extern void cupsdUpdateJobs(void); /* - * End of "$Id: job.h 7883 2008-08-28 20:38:13Z mike $". + * End of "$Id$". */ diff --git a/scheduler/listen.c b/scheduler/listen.c index 208cbbbae..fe5e9faff 100644 --- a/scheduler/listen.c +++ b/scheduler/listen.c @@ -1,5 +1,5 @@ /* - * "$Id: listen.c 7918 2008-09-08 22:03:01Z mike $" + * "$Id$" * * Server listening routines for the CUPS scheduler. * @@ -427,5 +427,5 @@ cupsdStopListening(void) /* - * End of "$Id: listen.c 7918 2008-09-08 22:03:01Z mike $". + * End of "$Id$". */ diff --git a/scheduler/log.c b/scheduler/log.c index 95768e846..0d4935736 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -1,5 +1,5 @@ /* - * "$Id: log.c 7918 2008-09-08 22:03:01Z mike $" + * "$Id$" * * Log file routines for the CUPS scheduler. * @@ -1103,5 +1103,5 @@ format_log_line(const char *message, /* I - Printf-style format string */ /* - * End of "$Id: log.c 7918 2008-09-08 22:03:01Z mike $". + * End of "$Id$". */ diff --git a/scheduler/main.c b/scheduler/main.c index a10025435..5a8da815e 100644 --- a/scheduler/main.c +++ b/scheduler/main.c @@ -1,5 +1,5 @@ /* - * "$Id: main.c 7925 2008-09-10 17:47:26Z mike $" + * "$Id$" * * Main loop for the CUPS scheduler. * @@ -2025,5 +2025,5 @@ usage(int status) /* O - Exit status */ /* - * End of "$Id: main.c 7925 2008-09-10 17:47:26Z mike $". + * End of "$Id$". */ diff --git a/scheduler/mime.c b/scheduler/mime.c index 15684cd0e..de3821c96 100644 --- a/scheduler/mime.c +++ b/scheduler/mime.c @@ -1,5 +1,5 @@ /* - * "$Id: mime.c 9750 2011-05-06 22:53:53Z mike $" + * "$Id$" * * MIME database file routines for CUPS. * @@ -956,5 +956,5 @@ mime_load_types(mime_t *mime, /* I - MIME database */ /* - * End of "$Id: mime.c 9750 2011-05-06 22:53:53Z mike $". + * End of "$Id$". */ diff --git a/scheduler/mime.h b/scheduler/mime.h index 4842c837c..6feceecc4 100644 --- a/scheduler/mime.h +++ b/scheduler/mime.h @@ -1,5 +1,5 @@ /* - * "$Id: mime.h 7694 2008-06-26 00:23:20Z mike $" + * "$Id$" * * MIME type/conversion database definitions for CUPS. * @@ -158,5 +158,5 @@ extern void mimeSetErrorCallback(mime_t *mime, mime_error_cb_t cb, #endif /* !_CUPS_MIME_H_ */ /* - * End of "$Id: mime.h 7694 2008-06-26 00:23:20Z mike $". + * End of "$Id$". */ diff --git a/scheduler/network.c b/scheduler/network.c index bf0dea758..054faa50f 100644 --- a/scheduler/network.c +++ b/scheduler/network.c @@ -1,5 +1,5 @@ /* - * "$Id: network.c 7861 2008-08-26 03:15:14Z mike $" + * "$Id$" * * Network interface functions for the CUPS scheduler. * @@ -296,5 +296,5 @@ compare_netif(cupsd_netif_t *a, /* I - First network interface */ /* - * End of "$Id: network.c 7861 2008-08-26 03:15:14Z mike $". + * End of "$Id$". */ diff --git a/scheduler/network.h b/scheduler/network.h index 95b6badc1..c7a6aa0c3 100644 --- a/scheduler/network.h +++ b/scheduler/network.h @@ -1,5 +1,5 @@ /* - * "$Id: network.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Network interface definitions for the CUPS scheduler. * @@ -48,5 +48,5 @@ extern void cupsdNetIFUpdate(void); /* - * End of "$Id: network.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/scheduler/policy.c b/scheduler/policy.c index 1e6e45e24..466067036 100644 --- a/scheduler/policy.c +++ b/scheduler/policy.c @@ -1,5 +1,5 @@ /* - * "$Id: policy.c 7673 2008-06-18 22:31:26Z mike $" + * "$Id$" * * Policy routines for the CUPS scheduler. * @@ -513,5 +513,5 @@ hash_op(cupsd_location_t *op) /* I - Operation */ /* - * End of "$Id: policy.c 7673 2008-06-18 22:31:26Z mike $". + * End of "$Id$". */ diff --git a/scheduler/policy.h b/scheduler/policy.h index 897b011f5..361271f2b 100644 --- a/scheduler/policy.h +++ b/scheduler/policy.h @@ -1,5 +1,5 @@ /* - * "$Id: policy.h 6895 2007-08-30 00:09:27Z mike $" + * "$Id$" * * Policy definitions for the CUPS scheduler. * @@ -59,5 +59,5 @@ extern cups_array_t *cupsdGetPrivateAttrs(cupsd_policy_t *p, /* - * End of "$Id: policy.h 6895 2007-08-30 00:09:27Z mike $". + * End of "$Id$". */ diff --git a/scheduler/printers.c b/scheduler/printers.c index 17ad5116e..540b536c5 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -1,5 +1,5 @@ /* - * "$Id: printers.c 7968 2008-09-19 23:03:01Z mike $" + * "$Id$" * * Printer routines for the CUPS scheduler. * @@ -5034,5 +5034,5 @@ write_xml_string(cups_file_t *fp, /* I - File to write to */ /* - * End of "$Id: printers.c 7968 2008-09-19 23:03:01Z mike $". + * End of "$Id$". */ diff --git a/scheduler/printers.h b/scheduler/printers.h index 2242ddd11..a5ced9f21 100644 --- a/scheduler/printers.h +++ b/scheduler/printers.h @@ -1,5 +1,5 @@ /* - * "$Id: printers.h 7564 2008-05-15 00:57:43Z mike $" + * "$Id$" * * Printer definitions for the CUPS scheduler. * @@ -189,5 +189,5 @@ extern void cupsdWritePrintcap(void); /* - * End of "$Id: printers.h 7564 2008-05-15 00:57:43Z mike $". + * End of "$Id$". */ diff --git a/scheduler/process.c b/scheduler/process.c index a5bc011a7..4a0985821 100644 --- a/scheduler/process.c +++ b/scheduler/process.c @@ -1,5 +1,5 @@ /* - * "$Id: process.c 7256 2008-01-25 00:48:54Z mike $" + * "$Id$" * * Process management routines for the CUPS scheduler. * @@ -655,5 +655,5 @@ cupsd_requote(char *dst, /* I - Destination buffer */ /* - * End of "$Id: process.c 7256 2008-01-25 00:48:54Z mike $". + * End of "$Id$". */ diff --git a/scheduler/quotas.c b/scheduler/quotas.c index e41c1cc1b..9f0b6c0a3 100644 --- a/scheduler/quotas.c +++ b/scheduler/quotas.c @@ -1,5 +1,5 @@ /* - * "$Id: quotas.c 6947 2007-09-12 21:09:49Z mike $" + * "$Id$" * * Quota routines for the CUPS scheduler. * @@ -240,5 +240,5 @@ compare_quotas(const cupsd_quota_t *q1, /* I - First quota record */ /* - * End of "$Id: quotas.c 6947 2007-09-12 21:09:49Z mike $". + * End of "$Id$". */ diff --git a/scheduler/select.c b/scheduler/select.c index 5af53416c..a44ec2e3f 100644 --- a/scheduler/select.c +++ b/scheduler/select.c @@ -1,5 +1,5 @@ /* - * "$Id: select.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * Select abstraction functions for the CUPS scheduler. * @@ -30,6 +30,7 @@ */ #include "cupsd.h" +#undef HAVE_KQUEUE #ifdef HAVE_EPOLL # include <sys/epoll.h> @@ -267,7 +268,7 @@ cupsdAddSelect(int fd, /* I - File descriptor */ * Range check input... */ - cupsdLogMessage(CUPSD_LOG_DEBUG2, + cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdAddSelect(fd=%d, read_cb=%p, write_cb=%p, data=%p)", fd, read_cb, write_cb, data); @@ -722,7 +723,7 @@ cupsdRemoveSelect(int fd) /* I - File descriptor */ * Range check input... */ - cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdRemoveSelect(fd=%d)", fd); + cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdRemoveSelect(fd=%d)", fd); if (fd < 0) return; @@ -812,7 +813,7 @@ cupsdRemoveSelect(int fd) /* I - File descriptor */ void cupsdStartSelect(void) { - cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdStartSelect()"); + cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdStartSelect()"); cupsd_fds = cupsArrayNew((cups_array_func_t)compare_fds, NULL); @@ -850,7 +851,7 @@ cupsdStopSelect(void) _cupsd_fd_t *fdptr; /* Current file descriptor */ - cupsdLogMessage(CUPSD_LOG_DEBUG2, "cupsdStopSelect()"); + cupsdLogMessage(CUPSD_LOG_DEBUG, "cupsdStopSelect()"); for (fdptr = (_cupsd_fd_t *)cupsArrayFirst(cupsd_fds); fdptr; @@ -946,5 +947,5 @@ find_fd(int fd) /* I - File descriptor */ /* - * End of "$Id: select.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/scheduler/server.c b/scheduler/server.c index a5a31c59b..3dc580e53 100644 --- a/scheduler/server.c +++ b/scheduler/server.c @@ -1,5 +1,5 @@ /* - * "$Id: server.c 7927 2008-09-10 22:05:29Z mike $" + * "$Id$" * * Server start/stop routines for the CUPS scheduler. * @@ -180,5 +180,5 @@ cupsdStopServer(void) /* - * End of "$Id: server.c 7927 2008-09-10 22:05:29Z mike $". + * End of "$Id$". */ diff --git a/scheduler/statbuf.c b/scheduler/statbuf.c index 7d500d4c1..644e3b0ba 100644 --- a/scheduler/statbuf.c +++ b/scheduler/statbuf.c @@ -1,5 +1,5 @@ /* - * "$Id: statbuf.c 7674 2008-06-18 23:18:32Z mike $" + * "$Id$" * * Status buffer routines for the CUPS scheduler. * @@ -331,5 +331,5 @@ cupsdStatBufUpdate( /* - * End of "$Id: statbuf.c 7674 2008-06-18 23:18:32Z mike $". + * End of "$Id$". */ diff --git a/scheduler/statbuf.h b/scheduler/statbuf.h index 1ca227213..212acdf18 100644 --- a/scheduler/statbuf.h +++ b/scheduler/statbuf.h @@ -1,5 +1,5 @@ /* - * "$Id: statbuf.h 7674 2008-06-18 23:18:32Z mike $" + * "$Id$" * * Status buffer definitions for the CUPS scheduler. * @@ -45,5 +45,5 @@ extern char *cupsdStatBufUpdate(cupsd_statbuf_t *sb, int *loglevel, /* - * End of "$Id: statbuf.h 7674 2008-06-18 23:18:32Z mike $". + * End of "$Id$". */ diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c index 15414fc1e..2e9eee377 100644 --- a/scheduler/subscriptions.c +++ b/scheduler/subscriptions.c @@ -1,5 +1,5 @@ /* - * "$Id: subscriptions.c 7824 2008-08-01 21:11:55Z mike $" + * "$Id$" * * Subscription routines for the CUPS scheduler. * @@ -1638,5 +1638,5 @@ cupsd_update_notifier(void) /* - * End of "$Id: subscriptions.c 7824 2008-08-01 21:11:55Z mike $". + * End of "$Id$". */ diff --git a/scheduler/subscriptions.h b/scheduler/subscriptions.h index 2a2714ec1..eac866956 100644 --- a/scheduler/subscriptions.h +++ b/scheduler/subscriptions.h @@ -1,5 +1,5 @@ /* - * "$Id: subscriptions.h 7824 2008-08-01 21:11:55Z mike $" + * "$Id$" * * Subscription definitions for the CUPS scheduler. * @@ -162,5 +162,5 @@ extern void cupsdStopAllNotifiers(void); /* - * End of "$Id: subscriptions.h 7824 2008-08-01 21:11:55Z mike $". + * End of "$Id$". */ diff --git a/scheduler/sysman.c b/scheduler/sysman.c index 945149f72..0a0aeea4c 100644 --- a/scheduler/sysman.c +++ b/scheduler/sysman.c @@ -1,5 +1,5 @@ /* - * "$Id: sysman.c 7928 2008-09-10 22:14:22Z mike $" + * "$Id$" * * System management functions for the CUPS scheduler. * @@ -1002,5 +1002,5 @@ sysUpdate(void) /* - * End of "$Id: sysman.c 7928 2008-09-10 22:14:22Z mike $". + * End of "$Id$". */ diff --git a/scheduler/sysman.h b/scheduler/sysman.h index d1672bf32..810b185f0 100644 --- a/scheduler/sysman.h +++ b/scheduler/sysman.h @@ -1,5 +1,5 @@ /* - * "$Id: sysman.h 7928 2008-09-10 22:14:22Z mike $" + * "$Id$" * * System management definitions for the CUPS scheduler. * @@ -60,5 +60,5 @@ extern void cupsdStopSystemMonitor(void); /* - * End of "$Id: sysman.h 7928 2008-09-10 22:14:22Z mike $". + * End of "$Id$". */ diff --git a/scheduler/testlpd.c b/scheduler/testlpd.c index c000ddc83..60076939e 100644 --- a/scheduler/testlpd.c +++ b/scheduler/testlpd.c @@ -1,5 +1,5 @@ /* - * "$Id: testlpd.c 6789 2007-08-13 19:52:43Z mike $" + * "$Id$" * * cups-lpd test program for CUPS. * @@ -546,5 +546,5 @@ usage(void) /* - * End of "$Id: testlpd.c 6789 2007-08-13 19:52:43Z mike $". + * End of "$Id$". */ diff --git a/scheduler/testmime.c b/scheduler/testmime.c index ad7914d20..e2534ca6a 100644 --- a/scheduler/testmime.c +++ b/scheduler/testmime.c @@ -1,5 +1,5 @@ /* - * "$Id: testmime.c 7670 2008-06-17 22:42:08Z mike $" + * "$Id$" * * MIME test program for CUPS. * @@ -527,5 +527,5 @@ type_dir(mime_t *mime, /* I - MIME database */ /* - * End of "$Id: testmime.c 7670 2008-06-17 22:42:08Z mike $". + * End of "$Id$". */ diff --git a/scheduler/testsub.c b/scheduler/testsub.c index 88294a357..4635c6536 100644 --- a/scheduler/testsub.c +++ b/scheduler/testsub.c @@ -1,5 +1,5 @@ /* - * "$Id: testsub.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Scheduler notification tester for CUPS. * @@ -519,5 +519,5 @@ usage(void) /* - * End of "$Id: testsub.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/scheduler/type.c b/scheduler/type.c index 1a59eaf16..7b8743882 100644 --- a/scheduler/type.c +++ b/scheduler/type.c @@ -1,5 +1,5 @@ /* - * "$Id: type.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * MIME typing routines for CUPS. * @@ -1212,5 +1212,5 @@ mime_patmatch(const char *s, /* I - String to match against */ /* - * End of "$Id: type.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/scheduler/util.c b/scheduler/util.c index 8611869be..a9356c3c7 100644 --- a/scheduler/util.c +++ b/scheduler/util.c @@ -1,5 +1,5 @@ /* - * "$Id: util.c 7621 2008-06-06 18:55:35Z mike $" + * "$Id$" * * Mini-daemon utility functions for CUPS. * @@ -467,5 +467,5 @@ cupsdSendIPPTrailer(void) /* - * End of "$Id: util.c 7621 2008-06-06 18:55:35Z mike $". + * End of "$Id$". */ diff --git a/scheduler/util.h b/scheduler/util.h index c31c045db..6c2a05ace 100644 --- a/scheduler/util.h +++ b/scheduler/util.h @@ -1,5 +1,5 @@ /* - * "$Id: util.h 7711 2008-07-02 04:39:27Z mike $" + * "$Id$" * * Mini-daemon utility definitions for CUPS. * @@ -67,5 +67,5 @@ extern void cupsdSendIPPTrailer(void); #endif /* !_CUPSD_UTIL_H_ */ /* - * End of "$Id: util.h 7711 2008-07-02 04:39:27Z mike $". + * End of "$Id$". */ diff --git a/systemv/Makefile b/systemv/Makefile index 377b10c8b..e8aed6ff2 100644 --- a/systemv/Makefile +++ b/systemv/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7929 2008-09-10 22:23:59Z mike $" +# "$Id$" # # System V commands makefile for CUPS. # @@ -290,5 +290,5 @@ include Dependencies # -# End of "$Id: Makefile 7929 2008-09-10 22:23:59Z mike $". +# End of "$Id$". # diff --git a/systemv/cancel.c b/systemv/cancel.c index 9c95d23ab..9ea549c93 100644 --- a/systemv/cancel.c +++ b/systemv/cancel.c @@ -1,5 +1,5 @@ /* - * "$Id: cancel.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * "cancel" command for CUPS. * @@ -383,5 +383,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: cancel.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/systemv/cupsaddsmb.c b/systemv/cupsaddsmb.c index 2ce91ccc4..dfce0022f 100644 --- a/systemv/cupsaddsmb.c +++ b/systemv/cupsaddsmb.c @@ -1,5 +1,5 @@ /* - * "$Id: cupsaddsmb.c 7033 2007-10-19 02:11:28Z mike $" + * "$Id$" * * "cupsaddsmb" command for CUPS. * @@ -295,5 +295,5 @@ usage(void) /* - * End of "$Id: cupsaddsmb.c 7033 2007-10-19 02:11:28Z mike $". + * End of "$Id$". */ diff --git a/systemv/cupstestdsc.c b/systemv/cupstestdsc.c index 5ec01aee7..de024c7ed 100644 --- a/systemv/cupstestdsc.c +++ b/systemv/cupstestdsc.c @@ -1,5 +1,5 @@ /* - * "$Id: cupstestdsc.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * DSC test program for CUPS. * @@ -438,5 +438,5 @@ usage(void) /* - * End of "$Id: cupstestdsc.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/systemv/cupstestppd.c b/systemv/cupstestppd.c index d266ffde5..7c080a936 100644 --- a/systemv/cupstestppd.c +++ b/systemv/cupstestppd.c @@ -1,5 +1,5 @@ /* - * "$Id: cupstestppd.c 7807 2008-07-28 21:54:24Z mike $" + * "$Id$" * * PPD test program for CUPS. * @@ -3992,5 +3992,5 @@ valid_utf8(const char *s) /* I - String to check */ /* - * End of "$Id: cupstestppd.c 7807 2008-07-28 21:54:24Z mike $". + * End of "$Id$". */ diff --git a/systemv/lp.c b/systemv/lp.c index ee1155aa0..96728b26e 100644 --- a/systemv/lp.c +++ b/systemv/lp.c @@ -1,5 +1,5 @@ /* - * "$Id: lp.c 7170 2008-01-04 02:21:30Z mike $" + * "$Id$" * * "lp" command for CUPS. * @@ -731,5 +731,5 @@ set_job_attrs(const char *command, /* I - Command name */ /* - * End of "$Id: lp.c 7170 2008-01-04 02:21:30Z mike $". + * End of "$Id$". */ diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c index 5fe0b9bbc..d954e75fb 100644 --- a/systemv/lpadmin.c +++ b/systemv/lpadmin.c @@ -1,5 +1,5 @@ /* - * "$Id: lpadmin.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * "lpadmin" command for CUPS. * @@ -1514,5 +1514,5 @@ validate_name(const char *name) /* I - Name to check */ /* - * End of "$Id: lpadmin.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/systemv/lpinfo.c b/systemv/lpinfo.c index f51019b78..acfe50108 100644 --- a/systemv/lpinfo.c +++ b/systemv/lpinfo.c @@ -1,5 +1,5 @@ /* - * "$Id: lpinfo.c 7810 2008-07-29 01:11:15Z mike $" + * "$Id$" * * "lpinfo" command for CUPS. * @@ -494,5 +494,5 @@ show_models( /* - * End of "$Id: lpinfo.c 7810 2008-07-29 01:11:15Z mike $". + * End of "$Id$". */ diff --git a/systemv/lpmove.c b/systemv/lpmove.c index d7c2dfb68..54424894f 100644 --- a/systemv/lpmove.c +++ b/systemv/lpmove.c @@ -1,5 +1,5 @@ /* - * "$Id: lpmove.c 7219 2008-01-14 22:00:02Z mike $" + * "$Id$" * * "lpmove" command for CUPS. * @@ -209,5 +209,5 @@ move_job(http_t *http, /* I - HTTP connection to server */ /* - * End of "$Id: lpmove.c 7219 2008-01-14 22:00:02Z mike $". + * End of "$Id$". */ diff --git a/systemv/lpoptions.c b/systemv/lpoptions.c index 06a1762c6..12dbe5f85 100644 --- a/systemv/lpoptions.c +++ b/systemv/lpoptions.c @@ -1,5 +1,5 @@ /* - * "$Id: lpoptions.c 7720 2008-07-11 22:46:21Z mike $" + * "$Id$" * * Printer option program for CUPS. * @@ -561,5 +561,5 @@ usage(void) /* - * End of "$Id: lpoptions.c 7720 2008-07-11 22:46:21Z mike $". + * End of "$Id$". */ diff --git a/systemv/lppasswd.c b/systemv/lppasswd.c index b9962ecfc..597408a67 100644 --- a/systemv/lppasswd.c +++ b/systemv/lppasswd.c @@ -1,5 +1,5 @@ /* - * "$Id: lppasswd.c 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * MD5 password program for CUPS. * @@ -485,5 +485,5 @@ usage(FILE *fp) /* I - File to send usage to */ /* - * End of "$Id: lppasswd.c 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ diff --git a/systemv/lpstat.c b/systemv/lpstat.c index 6c9d734d7..4d6495637 100644 --- a/systemv/lpstat.c +++ b/systemv/lpstat.c @@ -1,5 +1,5 @@ /* - * "$Id: lpstat.c 7921 2008-09-10 15:42:24Z mike $" + * "$Id$" * * "lpstat" command for CUPS. * @@ -2007,5 +2007,5 @@ show_scheduler(void) /* - * End of "$Id: lpstat.c 7921 2008-09-10 15:42:24Z mike $". + * End of "$Id$". */ diff --git a/templates/Makefile b/templates/Makefile index 9f32260ad..0abd47d9d 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7940 2008-09-16 00:45:16Z mike $" +# "$Id$" # # Template makefile for CUPS. # @@ -200,5 +200,5 @@ uninstall-langbundle: # -# End of "$Id: Makefile 7940 2008-09-16 00:45:16Z mike $". +# End of "$Id$". # diff --git a/test/Makefile b/test/Makefile index 74d7a5db8..c7c5c8e99 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" +# "$Id$" # # IPP test makefile for CUPS. # @@ -222,5 +222,5 @@ include Dependencies # -# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". +# End of "$Id$". # diff --git a/vcnet/config.h b/vcnet/config.h index c514e682d..537cf4c9e 100644 --- a/vcnet/config.h +++ b/vcnet/config.h @@ -1,5 +1,5 @@ /* - * "$Id: config.h 6649 2007-07-11 21:46:42Z mike $" + * "$Id$" * * Configuration file for CUPS on Windows. * @@ -771,5 +771,5 @@ static __inline int _cups_abs(int i) { return (i < 0 ? -i : i); } #endif /* !_CUPS_CONFIG_H_ */ /* - * End of "$Id: config.h 6649 2007-07-11 21:46:42Z mike $". + * End of "$Id$". */ |