diff options
| author | Michael R Sweet <michaelrsweet@gmail.com> | 2016-04-11 20:28:30 -0400 |
|---|---|---|
| committer | Michael R Sweet <michaelrsweet@gmail.com> | 2016-04-11 20:28:30 -0400 |
| commit | 503b54c9302c8de6207e079a80a89a787eb612ea (patch) | |
| tree | ecd089feea134385d580d6e5a2af147ddb47be64 | |
| parent | e34d1ec4b926b3d31cfc00408faf99e69aa48ce8 (diff) | |
Remove all of the Subversion keywords from various source files.
409 files changed, 1142 insertions, 5141 deletions
diff --git a/Makedefs.in b/Makedefs.in index 5d261c39d..332a12742 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -1,6 +1,4 @@ # -# "$Id$" -# # Common makefile definitions for CUPS. # # Copyright 2007-2014 by Apple Inc. @@ -261,8 +259,3 @@ USBQUIRKS = @USBQUIRKS@ echo -n Compressing $<... $(RM) $@ gzip -v9 <$< >$@ - - -# -# End of "$Id$" -# @@ -1,6 +1,4 @@ # -# "$Id$" -# # Top-level Makefile for CUPS. # # Copyright 2007-2014 by Apple Inc. @@ -348,8 +346,3 @@ dist: all # .NOTPARALLEL: - - -# -# End of "$Id$". -# diff --git a/backend/Makefile b/backend/Makefile index 639a0d7ae..a4017bf77 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -1,18 +1,16 @@ # -# "$Id$" +# Backend makefile for CUPS. # -# Backend makefile for CUPS. +# Copyright 2007-2014 by Apple Inc. +# Copyright 1997-2007 by Easy Software Products, all rights reserved. # -# Copyright 2007-2014 by Apple Inc. -# Copyright 1997-2007 by Easy Software Products, all rights reserved. +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". -# -# This file is subject to the Apple OS-Developed Software exception. +# This file is subject to the Apple OS-Developed Software exception. # include ../Makedefs @@ -312,8 +310,3 @@ usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c # include Dependencies - - -# -# End of "$Id$". -# diff --git a/backend/backend-private.h b/backend/backend-private.h index 1d211e3ed..04bf51674 100644 --- a/backend/backend-private.h +++ b/backend/backend-private.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Backend support definitions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -331,8 +329,3 @@ extern int backendWaitLoop(int snmp_fd, http_addr_t *addr, } # endif /* __cplusplus */ #endif /* !_CUPS_BACKEND_PRIVATE_H_ */ - - -/* - * End of "$Id$". - */ diff --git a/backend/dnssd.c b/backend/dnssd.c index b46d8cf5f..20beaae29 100644 --- a/backend/dnssd.c +++ b/backend/dnssd.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * DNS-SD discovery backend for CUPS. * * Copyright 2008-2015 by Apple Inc. @@ -1315,8 +1313,3 @@ unquote(char *dst, /* I - Destination buffer */ *dst = '\0'; } - - -/* - * End of "$Id$". - */ diff --git a/backend/ieee1284.c b/backend/ieee1284.c index 6ffa31af7..c77403b0b 100644 --- a/backend/ieee1284.c +++ b/backend/ieee1284.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * IEEE-1284 support functions for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -473,8 +471,3 @@ backendGetMakeModel( return (0); } - - -/* - * End of "$Id$". - */ diff --git a/backend/lpd.c b/backend/lpd.c index 41f14913e..2b811076b 100644 --- a/backend/lpd.c +++ b/backend/lpd.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Line Printer Daemon backend for CUPS. * * Copyright 2007-2016 by Apple Inc. @@ -1313,8 +1311,3 @@ sigterm_handler(int sig) /* I - Signal */ abort_job = 1; } - - -/* - * End of "$Id$". - */ diff --git a/backend/network.c b/backend/network.c index 4560fb033..8beced8d2 100644 --- a/backend/network.c +++ b/backend/network.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Common backend network APIs for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -301,8 +299,3 @@ backendNetworkSideCB( return (cupsSideChannelWrite(command, status, data, datalen, 1.0)); } - - -/* - * End of "$Id$". - */ diff --git a/backend/pseudo b/backend/pseudo index 3a82a522a..fb7facdcc 100644 --- a/backend/pseudo +++ b/backend/pseudo @@ -1,18 +1,16 @@ #!/bin/sh # -# "$Id$" +# Psuedo-backend for CUPS testing purposes. # -# Psuedo-backend for CUPS testing purposes. +# Copyright 2011 by Apple Inc. # -# Copyright 2011 by Apple Inc. +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". -# -# This file is subject to the Apple OS-Developed Software exception. +# This file is subject to the Apple OS-Developed Software exception. # if test $# = 0; then @@ -24,7 +22,3 @@ fi cat $6 >/dev/null sleep 5 exit 0 - -# -# End of "$Id$". -# diff --git a/backend/runloop.c b/backend/runloop.c index 2a0ec5f9c..baa346273 100644 --- a/backend/runloop.c +++ b/backend/runloop.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Common run loop APIs for CUPS backends. * * Copyright 2007-2014 by Apple Inc. @@ -525,8 +523,3 @@ backendWaitLoop( return (1); } - - -/* - * End of "$Id$". - */ diff --git a/backend/snmp-supplies.c b/backend/snmp-supplies.c index 129f70026..c26e72a23 100644 --- a/backend/snmp-supplies.c +++ b/backend/snmp-supplies.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * SNMP supplies functions for CUPS. * * Copyright 2008-2015 by Apple Inc. @@ -1096,8 +1094,3 @@ utf16_to_utf8( cupsUTF32ToUTF8(dst, temp, (int)dstsize); } - - -/* - * End of "$Id$". - */ diff --git a/backend/snmp.c b/backend/snmp.c index 876ca6520..e66edc980 100644 --- a/backend/snmp.c +++ b/backend/snmp.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * SNMP discovery backend for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -1361,8 +1359,3 @@ update_cache(snmp_cache_t *device, /* I - Device */ list_device(device); } - - -/* - * End of "$Id$". - */ diff --git a/backend/socket.c b/backend/socket.c index d7f98d9b0..e51582394 100644 --- a/backend/socket.c +++ b/backend/socket.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * AppSocket backend for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -514,8 +512,3 @@ wait_bc(int device_fd, /* I - Socket */ else return (-1); } - - -/* - * End of "$Id$". - */ diff --git a/backend/test1284.c b/backend/test1284.c index 49bef87ee..85ac8b5b3 100644 --- a/backend/test1284.c +++ b/backend/test1284.c @@ -1,22 +1,16 @@ /* - * "$Id$" + * IEEE-1284 support functions test program for CUPS. * - * IEEE-1284 support functions test program for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products, all rights reserved. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products, all rights reserved. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * "LICENSE" which should have been included with this file. If this + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * "LICENSE" which should have been included with this file. If this - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * main() - Test the device-ID functions. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -77,8 +71,3 @@ main(int argc, /* I - Number of command-line args */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/backend/testbackend.c b/backend/testbackend.c index 046fc3e30..969083abf 100644 --- a/backend/testbackend.c +++ b/backend/testbackend.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Backend test program for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -677,8 +675,3 @@ walk_cb(const char *oid, /* I - OID */ printf("CUPS_SC_CMD_SNMP_WALK %s, %d bytes (%s)\n", oid, datalen, temp); } - - -/* - * End of "$Id$". - */ diff --git a/backend/testsupplies.c b/backend/testsupplies.c index 6cbdf8091..f5414847e 100644 --- a/backend/testsupplies.c +++ b/backend/testsupplies.c @@ -1,21 +1,15 @@ /* - * "$Id$" + * SNMP supplies test program for CUPS. * - * SNMP supplies test program for CUPS. + * Copyright 2008-2011 by Apple Inc. * - * Copyright 2008-2011 by Apple Inc. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * "LICENSE" which should have been included with this file. If this + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * "LICENSE" which should have been included with this file. If this - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * main() - Show the supplies state of a printer. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -76,8 +70,3 @@ main(int argc, /* I - Number of command-line args */ sleep(5); } } - - -/* - * End of "$Id$". - */ diff --git a/backend/usb-darwin.c b/backend/usb-darwin.c index 17d62902b..e39c83740 100644 --- a/backend/usb-darwin.c +++ b/backend/usb-darwin.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Copyright 2005-2015 Apple Inc. All rights reserved. * * IMPORTANT: This Apple software is supplied to you by Apple Computer, @@ -2535,8 +2533,3 @@ log_usb_class_driver(int is_64bit) /* I - Is the USB class driver 64-bit? */ asl_free(aslm); } } - - -/* - * End of "$Id$". - */ diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c index c89727e51..c48c6ecb5 100644 --- a/backend/usb-libusb.c +++ b/backend/usb-libusb.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * LIBUSB interface code for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -2019,9 +2017,3 @@ soft_reset_printer( return (errcode); } - - -/* - * End of "$Id$". - */ - diff --git a/backend/usb-unix.c b/backend/usb-unix.c index 870cbfd68..41a56062a 100644 --- a/backend/usb-unix.c +++ b/backend/usb-unix.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * USB port backend for CUPS. * * This file is included from "usb.c" when compiled on UNIX/Linux. @@ -600,8 +598,3 @@ side_cb(int print_fd, /* I - Print file */ return (cupsSideChannelWrite(command, status, data, datalen, 1.0)); } - - -/* - * End of "$Id$". - */ diff --git a/backend/usb.c b/backend/usb.c index ee8c1f4ed..a3b6fba09 100644 --- a/backend/usb.c +++ b/backend/usb.c @@ -1,24 +1,16 @@ /* - * "$Id$" + * USB printer backend for CUPS. * - * USB port backend for CUPS. + * Copyright 2007-2012 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * "LICENSE" which should have been included with this file. If this + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * "LICENSE" which should have been included with this file. If this - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * list_devices() - List all available USB devices to stdout. - * print_device() - Print a file to a USB device. - * main() - Send a file to the specified USB port. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -257,8 +249,3 @@ main(int argc, /* I - Number of command-line arguments (6 or 7) */ return (status); } - - -/* - * End of "$Id$". - */ diff --git a/berkeley/Makefile b/berkeley/Makefile index 991481ac0..688efedb0 100644 --- a/berkeley/Makefile +++ b/berkeley/Makefile @@ -1,16 +1,14 @@ # -# "$Id$" +# Berkeley commands makefile for CUPS. # -# Berkeley commands makefile for CUPS. +# Copyright 2007-2012 by Apple Inc. +# Copyright 1997-2006 by Easy Software Products, all rights reserved. # -# Copyright 2007-2012 by Apple Inc. -# Copyright 1997-2006 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs @@ -161,8 +159,3 @@ lprm: lprm.o ../cups/$(LIBCUPS) # include Dependencies - - -# -# End of "$Id$". -# diff --git a/berkeley/lpc.c b/berkeley/lpc.c index b2e2e4130..93e029fa7 100644 --- a/berkeley/lpc.c +++ b/berkeley/lpc.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * "lpc" command for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -435,8 +433,3 @@ show_status(http_t *http, /* I - HTTP connection to server */ ippDelete(response); } } - - -/* - * End of "$Id$". - */ diff --git a/berkeley/lpq.c b/berkeley/lpq.c index 323870686..592a83665 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * "lpq" command for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -638,8 +636,3 @@ usage(void) "[-l] [+interval]")); exit(1); } - - -/* - * End of "$Id$". - */ diff --git a/berkeley/lpr.c b/berkeley/lpr.c index 4bda358d5..eb58c8bd9 100644 --- a/berkeley/lpr.c +++ b/berkeley/lpr.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * "lpr" command for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -429,8 +427,3 @@ main(int argc, /* I - Number of command-line arguments */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/berkeley/lprm.c b/berkeley/lprm.c index e2d03e359..981b94b55 100644 --- a/berkeley/lprm.c +++ b/berkeley/lprm.c @@ -1,20 +1,14 @@ /* - * "$Id$" + * "lprm" command for CUPS. * - * "lprm" command for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * main() - Parse options and cancel jobs. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -109,7 +103,7 @@ main(int argc, /* I - Number of command-line arguments */ cupsSetUser(argv[i]); } break; - + case 'h' : /* Connect to host */ if (argv[i][2] != '\0') cupsSetServer(argv[i] + 2); @@ -210,8 +204,3 @@ main(int argc, /* I - Number of command-line arguments */ return (1); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index f1f0a4302..eb136728a 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -1,6 +1,4 @@ # -# "$Id$" -# # CGI makefile for CUPS. # # Copyright 2007-2014 by Apple Inc. @@ -350,8 +348,3 @@ testtemplate: testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) # include Dependencies - - -# -# End of "$Id$". -# diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c index e3123986e..c44a42706 100644 --- a/cgi-bin/admin.c +++ b/cgi-bin/admin.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Administration CGI for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -4274,8 +4272,3 @@ get_printer_ppd(const char *uri, /* I - Printer URI */ else return (NULL); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/cgi-private.h b/cgi-bin/cgi-private.h index 1f9690273..3bae75046 100644 --- a/cgi-bin/cgi-private.h +++ b/cgi-bin/cgi-private.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Private CGI definitions for CUPS. * - * Private CGI definitions for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -29,8 +27,3 @@ */ #define CUPS_PAGE_MAX 100 /* Maximum items per page */ - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/cgi.h b/cgi-bin/cgi.h index 61eb7fc75..9604f97a2 100644 --- a/cgi-bin/cgi.h +++ b/cgi-bin/cgi.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * CGI support library definitions for CUPS. * - * CGI support library definitions for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPS_CGI_H_ @@ -113,7 +111,3 @@ extern const char *cgiText(const char *message); # endif /* __cplusplus */ #endif /* !_CUPS_CGI_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/classes.c b/cgi-bin/classes.c index 2685e66a3..7c4ac9d25 100644 --- a/cgi-bin/classes.c +++ b/cgi-bin/classes.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Class status CGI for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -543,8 +541,3 @@ show_class(http_t *http, /* I - Connection to server */ cgiEndHTML(); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/help-index.c b/cgi-bin/help-index.c index 42b4ab910..60cda8754 100644 --- a/cgi-bin/help-index.c +++ b/cgi-bin/help-index.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Online help index routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1303,8 +1301,3 @@ help_sort_words(help_word_t *w1, /* I - Second word */ return (_cups_strcasecmp(w1->text, w2->text)); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/help-index.h b/cgi-bin/help-index.h index 41d8d93db..5fb1ac1f5 100644 --- a/cgi-bin/help-index.h +++ b/cgi-bin/help-index.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Online help index definitions for CUPS. * - * Online help index definitions for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPS_HELP_INDEX_H_ @@ -81,7 +79,3 @@ extern help_index_t *helpSearchIndex(help_index_t *hi, const char *query, # endif /* __cplusplus */ #endif /* !_CUPS_HELP_INDEX_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/help.c b/cgi-bin/help.c index 215c98bc4..314be87e8 100644 --- a/cgi-bin/help.c +++ b/cgi-bin/help.c @@ -1,20 +1,14 @@ /* - * "$Id$" + * Online help CGI for CUPS. * - * Online help CGI for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * main() - Main entry for CGI. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -390,8 +384,3 @@ main(int argc, /* I - Number of command-line arguments */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/html.c b/cgi-bin/html.c index 9db5438eb..e10e2d6a6 100644 --- a/cgi-bin/html.c +++ b/cgi-bin/html.c @@ -1,26 +1,14 @@ /* - * "$Id$" + * HTML support functions for CUPS. * - * HTML support functions for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * cgiEndHTML() - End a HTML page. - * cgiEndMultipart() - End the delivery of a multipart web page. - * cgiFormEncode() - Encode a string as a form variable. - * cgiStartHTML() - Start a HTML page. - * cgiStartMultipart() - Start a multipart delivery of a web page. - * cgiSupportsMultipart() - Does the browser support multi-part documents? - * cgi_null_passwd() - Return a NULL password for authentication. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -232,8 +220,3 @@ cgi_null_passwd(const char *prompt) /* I - Prompt string (unused) */ return (NULL); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/ipp-var.c b/cgi-bin/ipp-var.c index 4b43e9cc0..3e2f68c59 100644 --- a/cgi-bin/ipp-var.c +++ b/cgi-bin/ipp-var.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * CGI <-> IPP variable routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1547,8 +1545,3 @@ cgiText(const char *message) /* I - Message */ return (_cupsLangString(language, message)); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/jobs.c b/cgi-bin/jobs.c index 35f913ca3..a0d7c4b22 100644 --- a/cgi-bin/jobs.c +++ b/cgi-bin/jobs.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Job status CGI for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -201,8 +199,3 @@ do_job_op(http_t *http, /* I - HTTP connection */ cgiEndHTML(); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/makedocset.c b/cgi-bin/makedocset.c index 4aee5d9a4..97e130fc6 100644 --- a/cgi-bin/makedocset.c +++ b/cgi-bin/makedocset.c @@ -1,30 +1,18 @@ /* - * "$Id$" + * Xcode documentation set generator. * - * Xcode documentation set generator. + * Copyright 2007-2012 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * * Usage: * * makedocset directory *.tokens - * - * Contents: - * - * main() - Test the help index code. - * compare_html() - Compare the titles of two HTML files. - * compare_sections() - Compare the names of two help sections. - * compare_sections_files() - Compare the number of files and section names. - * write_index() - Write an index file for the CUPS help. - * write_info() - Write the Info.plist file. - * write_nodes() - Write the Nodes.xml file. */ /* @@ -479,8 +467,3 @@ write_nodes(const char *path, /* I - File to write */ cupsFileClose(fp); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/printers.c b/cgi-bin/printers.c index c713c68f4..7d2d5d6be 100644 --- a/cgi-bin/printers.c +++ b/cgi-bin/printers.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Printer status CGI for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -563,8 +561,3 @@ show_printer(http_t *http, /* I - Connection to server */ cgiEndHTML(); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/search.c b/cgi-bin/search.c index b475d9600..95efb3632 100644 --- a/cgi-bin/search.c +++ b/cgi-bin/search.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Search routines for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -368,8 +366,3 @@ cgiFreeSearch(void *search) /* I - Search context */ { regfree((regex_t *)search); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/template.c b/cgi-bin/template.c index 532544174..c7d2144f8 100644 --- a/cgi-bin/template.c +++ b/cgi-bin/template.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * CGI template function. * * Copyright 2007-2015 by Apple Inc. @@ -683,8 +681,3 @@ cgi_puturi(const char *s, /* I - String to output */ s ++; } } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/testcgi.c b/cgi-bin/testcgi.c index ca0158298..fe58bab8a 100644 --- a/cgi-bin/testcgi.c +++ b/cgi-bin/testcgi.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * CGI test program for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -62,8 +60,3 @@ main(void) return (0); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/testhi.c b/cgi-bin/testhi.c index ce1b94b01..1fbe9063b 100644 --- a/cgi-bin/testhi.c +++ b/cgi-bin/testhi.c @@ -1,21 +1,14 @@ /* - * "$Id$" + * Help index test program for CUPS. * - * Help index test program for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * main() - Test the help index code. - * list_nodes() - List nodes in an array... + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -106,8 +99,3 @@ list_nodes(const char *title, /* I - Title string */ printf(" (%d words)\n", cupsArrayCount(node->words)); } } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/testtemplate.c b/cgi-bin/testtemplate.c index 02c017365..046af47d9 100644 --- a/cgi-bin/testtemplate.c +++ b/cgi-bin/testtemplate.c @@ -1,20 +1,14 @@ /* - * "$Id$" + * CGI template test program for CUPS. * - * CGI template test program for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 2006 by Easy Software Products. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * main() - Test the template code. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -96,8 +90,3 @@ main(int argc, /* I - Number of command-line arguments */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/cgi-bin/var.c b/cgi-bin/var.c index 3935508fc..6d02e1079 100644 --- a/cgi-bin/var.c +++ b/cgi-bin/var.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * CGI form variable and array functions for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1294,8 +1292,3 @@ cgi_unlink_file(void) form_file = NULL; } } - - -/* - * End of "$Id$". - */ diff --git a/conf/Makefile b/conf/Makefile index c6ff49c0a..bc1f3f944 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,16 +1,14 @@ # -# "$Id$" +# Configuration file makefile for CUPS. # -# Configuration file makefile for CUPS. +# Copyright 2007-2015 by Apple Inc. +# Copyright 1993-2006 by Easy Software Products. # -# Copyright 2007-2015 by Apple Inc. -# Copyright 1993-2006 by Easy Software Products. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs @@ -136,8 +134,3 @@ uninstall: $(RM) $(BUILDROOT)$(PAMDIR)/cups; \ $(RMDIR) $(BUILDROOT)$(PAMDIR); \ fi - - -# -# End of "$Id$". -# diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 0b583cd17..8c2e95a6e 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Common configuration stuff for CUPS. dnl dnl Copyright 2007-2015 by Apple Inc. @@ -472,7 +470,3 @@ case "$COMPONENTS" in esac AC_SUBST(BUILDDIRS) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4 index 3c2076aa1..4e71f0c3c 100644 --- a/config-scripts/cups-compiler.m4 +++ b/config-scripts/cups-compiler.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Compiler stuff for CUPS. dnl dnl Copyright 2007-2014 by Apple Inc. @@ -244,7 +242,3 @@ case $uname in OPTIM="$OPTIM -D_GNU_SOURCE" ;; esac - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-defaults.m4 b/config-scripts/cups-defaults.m4 index 599825ca7..7c2080a04 100644 --- a/config-scripts/cups-defaults.m4 +++ b/config-scripts/cups-defaults.m4 @@ -1,16 +1,14 @@ dnl -dnl "$Id$" +dnl Default cupsd configuration settings for CUPS. dnl -dnl Default cupsd configuration settings for CUPS. +dnl Copyright 2007-2015 by Apple Inc. +dnl Copyright 2006-2007 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2015 by Apple Inc. -dnl Copyright 2006-2007 by Easy Software Products, all rights reserved. -dnl -dnl These coded instructions, statements, and computer programs are the -dnl property of Apple Inc. and are protected by Federal copyright -dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" -dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl These coded instructions, statements, and computer programs are the +dnl property of Apple Inc. and are protected by Federal copyright +dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" +dnl which should have been included with this file. If this file is +dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl dnl Default languages... @@ -407,7 +405,3 @@ esac AC_SUBST(CUPS_WEBIF) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_WEBIF, $CUPS_DEFAULT_WEBIF) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-directories.m4 b/config-scripts/cups-directories.m4 index 40a17038a..a9dc67b50 100644 --- a/config-scripts/cups-directories.m4 +++ b/config-scripts/cups-directories.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Directory stuff for CUPS. dnl dnl Copyright 2007-2014 by Apple Inc. @@ -303,7 +301,3 @@ AC_ARG_WITH(rundir, [ --with-rundir set transient run-time state dire esac]) AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR") AC_SUBST(CUPS_STATEDIR) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-dnssd.m4 b/config-scripts/cups-dnssd.m4 index 3b5bee801..86a8de088 100644 --- a/config-scripts/cups-dnssd.m4 +++ b/config-scripts/cups-dnssd.m4 @@ -1,15 +1,13 @@ dnl -dnl "$Id$" +dnl DNS Service Discovery (aka Bonjour) stuff for CUPS. dnl -dnl DNS Service Discovery (aka Bonjour) stuff for CUPS. +dnl Copyright 2007-2015 by Apple Inc. dnl -dnl Copyright 2007-2015 by Apple Inc. -dnl -dnl These coded instructions, statements, and computer programs are the -dnl property of Apple Inc. and are protected by Federal copyright -dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" -dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl These coded instructions, statements, and computer programs are the +dnl property of Apple Inc. and are protected by Federal copyright +dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" +dnl which should have been included with this file. If this file is +dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl AC_ARG_ENABLE(avahi, [ --disable-avahi disable DNS Service Discovery support using Avahi]) @@ -80,7 +78,3 @@ AC_SUBST(DNSSDLIBS) AC_SUBST(DNSSD_BACKEND) AC_SUBST(IPPFIND_BIN) AC_SUBST(IPPFIND_MAN) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-gssapi.m4 b/config-scripts/cups-gssapi.m4 index 531308d86..548898495 100644 --- a/config-scripts/cups-gssapi.m4 +++ b/config-scripts/cups-gssapi.m4 @@ -1,19 +1,17 @@ dnl -dnl "$Id$" +dnl GSSAPI/Kerberos library detection for CUPS. dnl -dnl GSSAPI/Kerberos library detection for CUPS. +dnl Copyright 2007-2013 by Apple Inc. +dnl Copyright 2006-2007 by Easy Software Products. dnl -dnl Copyright 2007-2013 by Apple Inc. -dnl Copyright 2006-2007 by Easy Software Products. +dnl This file contains Kerberos support code, copyright 2006 by +dnl Jelmer Vernooij. dnl -dnl This file contains Kerberos support code, copyright 2006 by -dnl Jelmer Vernooij. -dnl -dnl These coded instructions, statements, and computer programs are the -dnl property of Apple Inc. and are protected by Federal copyright -dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" -dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl These coded instructions, statements, and computer programs are the +dnl property of Apple Inc. and are protected by Federal copyright +dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" +dnl which should have been included with this file. If this file is +dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl AC_ARG_ENABLE(gssapi, [ --disable-gssapi disable GSSAPI support]) @@ -127,7 +125,3 @@ fi AC_SUBST(CUPS_DEFAULT_GSSSERVICENAME) AC_DEFINE_UNQUOTED(CUPS_DEFAULT_GSSSERVICENAME, "$CUPS_DEFAULT_GSSSERVICENAME") - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-largefile.m4 b/config-scripts/cups-largefile.m4 index 6ef4b81e1..1f0c5388c 100644 --- a/config-scripts/cups-largefile.m4 +++ b/config-scripts/cups-largefile.m4 @@ -1,16 +1,14 @@ dnl -dnl "$Id$" +dnl Large file support stuff for CUPS. dnl -dnl Large file support stuff for CUPS. +dnl Copyright 2007-2011 by Apple Inc. +dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2011 by Apple Inc. -dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. -dnl -dnl These coded instructions, statements, and computer programs are the -dnl property of Apple Inc. and are protected by Federal copyright -dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" -dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl These coded instructions, statements, and computer programs are the +dnl property of Apple Inc. and are protected by Federal copyright +dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" +dnl which should have been included with this file. If this file is +dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl dnl Check for largefile support... @@ -46,7 +44,3 @@ if test $ac_cv_c_long_long = yes; then fi AC_CHECK_FUNC(strtoll, AC_DEFINE(HAVE_STRTOLL)) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4 index 5fc0d6e3c..805e806d3 100644 --- a/config-scripts/cups-libtool.m4 +++ b/config-scripts/cups-libtool.m4 @@ -1,16 +1,14 @@ dnl -dnl "$Id$" +dnl Libtool stuff for CUPS. dnl -dnl Libtool stuff for CUPS. +dnl Copyright 2007-2011 by Apple Inc. +dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2011 by Apple Inc. -dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. -dnl -dnl These coded instructions, statements, and computer programs are the -dnl property of Apple Inc. and are protected by Federal copyright -dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" -dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl These coded instructions, statements, and computer programs are the +dnl property of Apple Inc. and are protected by Federal copyright +dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" +dnl which should have been included with this file. If this file is +dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl AC_ARG_ENABLE(libtool_unsupported, [ --enable-libtool-unsupported @@ -33,7 +31,3 @@ if test x$LIBTOOL != x; then LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)" DSO="\$(CC)" fi - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-manpages.m4 b/config-scripts/cups-manpages.m4 index 08aad8459..4224addef 100644 --- a/config-scripts/cups-manpages.m4 +++ b/config-scripts/cups-manpages.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Manpage stuff for CUPS. dnl dnl Copyright 2007-2013 by Apple Inc. @@ -76,7 +74,3 @@ AC_SUBST(MAN5EXT) AC_SUBST(MAN7EXT) AC_SUBST(MAN8EXT) AC_SUBST(MAN8DIR) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-network.m4 b/config-scripts/cups-network.m4 index 636518fb6..1c2604a73 100644 --- a/config-scripts/cups-network.m4 +++ b/config-scripts/cups-network.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Networking stuff for CUPS. dnl dnl Copyright 2007-2014 by Apple Inc. @@ -70,7 +68,3 @@ fi AC_SUBST(CUPS_DEFAULT_DOMAINSOCKET) AC_SUBST(CUPS_LISTEN_DOMAINSOCKET) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-opsys.m4 b/config-scripts/cups-opsys.m4 index 700a284d0..549b27a21 100644 --- a/config-scripts/cups-opsys.m4 +++ b/config-scripts/cups-opsys.m4 @@ -1,16 +1,14 @@ dnl -dnl "$Id$" +dnl Operating system stuff for CUPS. dnl -dnl Operating system stuff for CUPS. +dnl Copyright 2007-2012 by Apple Inc. +dnl Copyright 1997-2006 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2012 by Apple Inc. -dnl Copyright 1997-2006 by Easy Software Products, all rights reserved. -dnl -dnl These coded instructions, statements, and computer programs are the -dnl property of Apple Inc. and are protected by Federal copyright -dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" -dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl These coded instructions, statements, and computer programs are the +dnl property of Apple Inc. and are protected by Federal copyright +dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" +dnl which should have been included with this file. If this file is +dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl dnl Get the operating system, version number, and architecture... @@ -33,7 +31,3 @@ case "$uname" in uname="Linux" ;; esac - -dnl -dnl "$Id$" -dnl diff --git a/config-scripts/cups-pam.m4 b/config-scripts/cups-pam.m4 index 0d7d9adb8..de9c476be 100644 --- a/config-scripts/cups-pam.m4 +++ b/config-scripts/cups-pam.m4 @@ -1,7 +1,5 @@ dnl -dnl "$Id$" -dnl -dnl PAM stuff for CUPS. +dnl PAM stuff for CUPS. dnl dnl Copyright 2007-2013 by Apple Inc. dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. @@ -91,7 +89,3 @@ AC_SUBST(PAMFILE) AC_SUBST(PAMLIBS) AC_SUBST(PAMMOD) AC_SUBST(PAMMODAUTH) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-poll.m4 b/config-scripts/cups-poll.m4 index 901068c27..96361969c 100644 --- a/config-scripts/cups-poll.m4 +++ b/config-scripts/cups-poll.m4 @@ -1,22 +1,16 @@ dnl -dnl "$Id$" +dnl Select/poll stuff for CUPS. dnl -dnl Select/poll stuff for CUPS. +dnl Copyright 2007-2011 by Apple Inc. +dnl Copyright 2006 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2011 by Apple Inc. -dnl Copyright 2006 by Easy Software Products, all rights reserved. -dnl -dnl These coded instructions, statements, and computer programs are the -dnl property of Apple Inc. and are protected by Federal copyright -dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" -dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl These coded instructions, statements, and computer programs are the +dnl property of Apple Inc. and are protected by Federal copyright +dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" +dnl which should have been included with this file. If this file is +dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl AC_CHECK_FUNC(poll, AC_DEFINE(HAVE_POLL)) AC_CHECK_FUNC(epoll_create, AC_DEFINE(HAVE_EPOLL)) AC_CHECK_FUNC(kqueue, AC_DEFINE(HAVE_KQUEUE)) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-scripting.m4 b/config-scripts/cups-scripting.m4 index af97a94dc..10b454185 100644 --- a/config-scripts/cups-scripting.m4 +++ b/config-scripts/cups-scripting.m4 @@ -1,16 +1,14 @@ dnl -dnl "$Id$" +dnl Scripting configuration stuff for CUPS. dnl -dnl Scripting configuration stuff for CUPS. +dnl Copyright 2007-2010 by Apple Inc. +dnl Copyright 1997-2006 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2010 by Apple Inc. -dnl Copyright 1997-2006 by Easy Software Products, all rights reserved. -dnl -dnl These coded instructions, statements, and computer programs are the -dnl property of Apple Inc. and are protected by Federal copyright -dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" -dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl These coded instructions, statements, and computer programs are the +dnl property of Apple Inc. and are protected by Federal copyright +dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" +dnl which should have been included with this file. If this file is +dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl dnl Do we have Java? @@ -83,7 +81,3 @@ AC_DEFINE_UNQUOTED(CUPS_PYTHON, "$CUPS_PYTHON") if test "x$CUPS_PYTHON" != x; then AC_DEFINE(HAVE_PYTHON) fi - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index 23b1adfb7..33bb30f53 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Shared library support for CUPS. dnl dnl Copyright 2007-2013 by Apple Inc. @@ -156,7 +154,3 @@ fi AC_SUBST(DSOLIBS) AC_SUBST(IMGLIBS) AC_SUBST(EXPORT_LDFLAGS) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-ssl.m4 b/config-scripts/cups-ssl.m4 index d48681ea1..d9d858109 100644 --- a/config-scripts/cups-ssl.m4 +++ b/config-scripts/cups-ssl.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl TLS stuff for CUPS. dnl dnl Copyright 2007-2015 by Apple Inc. @@ -106,7 +104,3 @@ AC_SUBST(SSLLIBS) EXPORT_SSLLIBS="$SSLLIBS" AC_SUBST(EXPORT_SSLLIBS) - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-startup.m4 b/config-scripts/cups-startup.m4 index 223cf2bde..bbd6b891d 100644 --- a/config-scripts/cups-startup.m4 +++ b/config-scripts/cups-startup.m4 @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Launch-on-demand/startup stuff for CUPS. dnl dnl Copyright 2007-2015 by Apple Inc. @@ -185,8 +183,3 @@ if test "x$xinetd" = x; then elif test "x$xinetd" != xno; then XINETD="$xinetd" fi - - -dnl -dnl End of "$Id$". -dnl diff --git a/config-scripts/cups-threads.m4 b/config-scripts/cups-threads.m4 index bd5c69867..017b91008 100644 --- a/config-scripts/cups-threads.m4 +++ b/config-scripts/cups-threads.m4 @@ -1,16 +1,14 @@ dnl -dnl "$Id$" +dnl Threading stuff for CUPS. dnl -dnl Threading stuff for CUPS. +dnl Copyright 2007-2011 by Apple Inc. +dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. dnl -dnl Copyright 2007-2011 by Apple Inc. -dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. -dnl -dnl These coded instructions, statements, and computer programs are the -dnl property of Apple Inc. and are protected by Federal copyright -dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" -dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl These coded instructions, statements, and computer programs are the +dnl property of Apple Inc. and are protected by Federal copyright +dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" +dnl which should have been included with this file. If this file is +dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl AC_ARG_ENABLE(threads, [ --disable-threads disable multi-threading support]) @@ -48,7 +46,3 @@ if test "x$enable_threads" != xno; then fi AC_SUBST(PTHREAD_FLAGS) - -dnl -dnl End of "$Id$". -dnl @@ -1,11 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for CUPS 2.2svn. +# Generated by GNU Autoconf 2.68 for CUPS 2.2svn. # # Report bugs to <https://www.cups.org/str.php>. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,31 +136,6 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -192,8 +169,7 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1 -test -x / || exit 1" +test x\$exitcode = x0 || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -238,25 +214,21 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -359,14 +331,6 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -488,10 +452,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -526,16 +486,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -547,8 +507,28 @@ else as_mkdir_p=false fi -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1380,6 +1360,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1706,9 +1688,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF CUPS configure 2.2svn -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.68 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1859,7 +1841,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - test -x conftest$ac_exeext + $as_test_x conftest$ac_exeext }; then : ac_retval=0 else @@ -2170,7 +2152,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by CUPS $as_me 2.2svn, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2540,7 +2522,6 @@ case "$uname" in esac - ac_config_headers="$ac_config_headers config.h" @@ -2604,7 +2585,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2652,7 +2633,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2696,7 +2677,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3140,7 +3121,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -struct stat; +#include <sys/types.h> +#include <sys/stat.h> /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3390,7 +3372,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3434,7 +3416,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3636,7 +3618,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3676,7 +3658,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3729,7 +3711,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3769,7 +3751,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_CHMOD="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3809,7 +3791,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GZIP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3849,7 +3831,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LD="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3889,7 +3871,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3929,7 +3911,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MV="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3969,7 +3951,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4009,7 +3991,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_RMDIR="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4049,7 +4031,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4089,7 +4071,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XDGOPEN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4165,7 +4147,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4208,7 +4190,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4618,7 +4600,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4684,7 +4666,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5955,7 +5937,6 @@ esac - if test "$prefix" = "NONE"; then prefix="/" fi @@ -6350,7 +6331,6 @@ _ACEOF - if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then # New GNU "standards" break previous ones, so make sure we use # the right default location for the operating system... @@ -6415,7 +6395,6 @@ esac - PICFLAG=1 DSOFLAGS="${DSOFLAGS:=}" @@ -6564,7 +6543,6 @@ fi - # Check whether --enable-libtool_unsupported was given. if test "${enable_libtool_unsupported+set}" = set; then : enableval=$enable_libtool_unsupported; if test x$enable_libtool_unsupported != xno; then @@ -6589,7 +6567,6 @@ if test x$LIBTOOL != x; then fi - INSTALL_STRIP="" OPTIM="" @@ -6953,7 +6930,6 @@ esac - ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" " #include <sys/socket.h> #include <netinet/in.h> @@ -7598,7 +7574,6 @@ fi - ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" if test "x$ac_cv_func_poll" = xyes; then : $as_echo "#define HAVE_POLL 1" >>confdefs.h @@ -7619,7 +7594,6 @@ fi - # Check whether --enable-gssapi was given. if test "${enable_gssapi+set}" = set; then : enableval=$enable_gssapi; @@ -7649,7 +7623,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7692,7 +7666,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_KRB5CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8055,7 +8029,6 @@ _ACEOF - # Check whether --enable-threads was given. if test "${enable_threads+set}" = set; then : enableval=$enable_threads; @@ -8118,7 +8091,6 @@ fi - # Check whether --enable-ssl was given. if test "${enable_ssl+set}" = set; then : enableval=$enable_ssl; @@ -8246,7 +8218,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8289,7 +8261,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_LIBGNUTLSCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8344,7 +8316,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_LIBGCRYPTCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8387,7 +8359,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_LIBGCRYPTCONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8483,7 +8455,6 @@ EXPORT_SSLLIBS="$SSLLIBS" - # Check whether --enable-pam was given. if test "${enable_pam+set}" = set; then : enableval=$enable_pam; @@ -8751,7 +8722,6 @@ fi - # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then : enableval=$enable_largefile; @@ -8948,8 +8918,6 @@ _ACEOF esac rm -rf conftest* fi - - fi @@ -9010,7 +8978,6 @@ fi - # Check whether --enable-avahi was given. if test "${enable_avahi+set}" = set; then : enableval=$enable_avahi; @@ -9124,7 +9091,6 @@ fi - ONDEMANDFLAGS="" ONDEMANDLIBS="" @@ -9376,8 +9342,6 @@ elif test "x$xinetd" != xno; then fi - - LANGUAGES="`ls -1 locale/cups_*.po 2>/dev/null | sed -e '1,$s/locale\/cups_//' -e '1,$s/\.po//' | tr '\n' ' '`" @@ -9941,7 +9905,6 @@ _ACEOF - # Check whether --with-java was given. if test "${with_java+set}" = set; then : withval=$with_java; CUPS_JAVA="$withval" @@ -9969,7 +9932,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_JAVA="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10032,7 +9995,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10095,7 +10058,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PHPCGI="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10136,7 +10099,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PHP="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10204,7 +10167,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10240,7 +10203,6 @@ if test "x$CUPS_PYTHON" != x; then fi - INSTALL_LANGUAGES="" UNINSTALL_LANGUAGES="" LANGFILES="" @@ -10673,16 +10635,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -10742,16 +10704,28 @@ else as_mkdir_p=false fi - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -10773,7 +10747,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by CUPS $as_me 2.2svn, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -10836,10 +10810,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ CUPS config.status 2.2svn -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -10928,7 +10902,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -11569,4 +11543,3 @@ fi chmod +x cups-config - diff --git a/configure.ac b/configure.ac index f55148f46..79aea7920 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,4 @@ dnl -dnl "$Id$" -dnl dnl Configuration script for CUPS. dnl dnl Copyright 2007-2015 by Apple Inc. @@ -93,7 +91,3 @@ AC_OUTPUT(Makedefs $LANGFILES) chmod +x cups-config - -dnl -dnl End of "$Id$". -dnl diff --git a/cups-config.in b/cups-config.in index 436800a64..4c69250f5 100755 --- a/cups-config.in +++ b/cups-config.in @@ -1,17 +1,15 @@ #! /bin/sh # -# "$Id$" +# CUPS configuration utility. # -# CUPS configuration utility. +# Copyright 2007-2011 by Apple Inc. +# Copyright 2001-2006 by Easy Software Products, all rights reserved. # -# Copyright 2007-2011 by Apple Inc. -# Copyright 2001-2006 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # VERSION="@CUPS_VERSION@" @@ -140,7 +138,3 @@ while test $# -gt 0; do shift done - -# -# End of "$Id$". -# diff --git a/cups/Makefile b/cups/Makefile index 473328b51..593113abc 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -1,6 +1,4 @@ # -# "$Id$" -# # API library Makefile for CUPS. # # Copyright 2007-2015 by Apple Inc. @@ -676,8 +674,3 @@ sloc: include Dependencies tls.o: tls-darwin.c tls-gnutls.c tls-sspi.c - - -# -# End of "$Id$". -# diff --git a/cups/adminutil.c b/cups/adminutil.c index 7b487b378..ec660d8cc 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Administration utility API definitions for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -2367,8 +2365,3 @@ write_option(cups_file_t *dstfp, /* I - PPD file */ cupsFilePrintf(dstfp, "*JCLCloseUI: *%s\n\n", name); } - - -/* - * End of "$Id$". - */ diff --git a/cups/adminutil.h b/cups/adminutil.h index 52dfe9260..8c0643143 100644 --- a/cups/adminutil.h +++ b/cups/adminutil.h @@ -1,18 +1,16 @@ /* - * "$Id$" + * Administration utility API definitions for CUPS. * - * Administration utility API definitions for CUPS. + * Copyright 2007-2012 by Apple Inc. + * Copyright 2001-2007 by Easy Software Products. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 2001-2007 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_ADMINUTIL_H_ @@ -75,7 +73,3 @@ extern int cupsAdminSetServerSettings(http_t *http, # endif /* __cplusplus */ #endif /* !_CUPS_ADMINUTIL_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/api-array.header b/cups/api-array.header index 4d5acf0d1..557833e58 100644 --- a/cups/api-array.header +++ b/cups/api-array.header @@ -1,6 +1,4 @@ <!-- - "$Id: api-array.header 7266 2008-01-29 02:15:29Z mike $" - Array API header for CUPS. Copyright 2008-2011 by Apple Inc. diff --git a/cups/api-array.shtml b/cups/api-array.shtml index 7246a7bd6..374ef5bfb 100644 --- a/cups/api-array.shtml +++ b/cups/api-array.shtml @@ -1,6 +1,4 @@ <!-- - "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" - Array API introduction for CUPS. Copyright 2007-2011 by Apple Inc. diff --git a/cups/api-cups.header b/cups/api-cups.header index ac781af42..23b3794d8 100644 --- a/cups/api-cups.header +++ b/cups/api-cups.header @@ -1,6 +1,4 @@ <!-- - "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" - CUPS API header for CUPS. Copyright 2008-2011 by Apple Inc. diff --git a/cups/api-cups.shtml b/cups/api-cups.shtml index caa96b953..918efe77b 100644 --- a/cups/api-cups.shtml +++ b/cups/api-cups.shtml @@ -1,6 +1,4 @@ <!-- - "$Id: api-cups.shtml 7337 2008-02-22 04:44:04Z mike $" - API introduction for CUPS. Copyright 2007-2013 by Apple Inc. diff --git a/cups/api-filedir.header b/cups/api-filedir.header index f9f529805..87744eedc 100644 --- a/cups/api-filedir.header +++ b/cups/api-filedir.header @@ -1,6 +1,4 @@ <!-- - "$Id: api-filedir.header 7279 2008-01-31 01:50:44Z mike $" - File and Directory API header for CUPS. Copyright 2008-2011 by Apple Inc. diff --git a/cups/api-filedir.shtml b/cups/api-filedir.shtml index 96bf0facb..8fdbee646 100644 --- a/cups/api-filedir.shtml +++ b/cups/api-filedir.shtml @@ -1,6 +1,4 @@ <!-- - "$Id: api-filedir.shtml 7279 2008-01-31 01:50:44Z mike $" - File and directory API introduction for CUPS. Copyright 2007-2011 by Apple Inc. diff --git a/cups/api-filter.header b/cups/api-filter.header index 303145212..d2cca7af2 100644 --- a/cups/api-filter.header +++ b/cups/api-filter.header @@ -1,6 +1,4 @@ <!-- - "$Id: api-filter.header 7616 2008-05-28 00:34:13Z mike $" - Filter and backend programming header for CUPS. Copyright 2008-2014 by Apple Inc. diff --git a/cups/api-filter.shtml b/cups/api-filter.shtml index 7c33179c8..d61b140f3 100644 --- a/cups/api-filter.shtml +++ b/cups/api-filter.shtml @@ -1,6 +1,4 @@ <!-- - "$Id: api-filter.shtml 7677 2008-06-19 23:22:19Z mike $" - Filter and backend programming introduction for CUPS. Copyright 2007-2014 by Apple Inc. diff --git a/cups/api-httpipp.header b/cups/api-httpipp.header index 5f245d750..844b67835 100644 --- a/cups/api-httpipp.header +++ b/cups/api-httpipp.header @@ -1,6 +1,4 @@ <!-- - "$Id: api-httpipp.header 7258 2008-01-28 00:15:05Z mike $" - HTTP and IPP API header for CUPS. Copyright 2007-2011 by Apple Inc. diff --git a/cups/api-httpipp.shtml b/cups/api-httpipp.shtml index cd0fd53b5..33bf5ad34 100644 --- a/cups/api-httpipp.shtml +++ b/cups/api-httpipp.shtml @@ -1,6 +1,4 @@ <!-- - "$Id: api-httpipp.shtml 7684 2008-06-23 16:47:38Z mike $" - HTTP and IPP API introduction for CUPS. Copyright 2007-2012 by Apple Inc. diff --git a/cups/api-overview.header b/cups/api-overview.header index ecb14b601..a42c7fb22 100644 --- a/cups/api-overview.header +++ b/cups/api-overview.header @@ -1,6 +1,4 @@ <!-- - "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" - Introduction to CUPS programming header for CUPS. Copyright 2008-2011 by Apple Inc. diff --git a/cups/api-overview.shtml b/cups/api-overview.shtml index 3ece1033c..9903152d8 100644 --- a/cups/api-overview.shtml +++ b/cups/api-overview.shtml @@ -1,6 +1,4 @@ <!-- - "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" - Introduction to CUPS programming content for CUPS. Copyright 2008-2011 by Apple Inc. diff --git a/cups/api-ppd.header b/cups/api-ppd.header index ef0d05122..6c0551f5f 100644 --- a/cups/api-ppd.header +++ b/cups/api-ppd.header @@ -1,6 +1,4 @@ <!-- - "$Id: api-ppd.header 7616 2008-05-28 00:34:13Z mike $" - PPD API header for CUPS. Copyright 2008-2012 by Apple Inc. diff --git a/cups/api-ppd.shtml b/cups/api-ppd.shtml index 6319f23f1..381035380 100644 --- a/cups/api-ppd.shtml +++ b/cups/api-ppd.shtml @@ -1,6 +1,4 @@ <!-- - "$Id: api-ppd.shtml 7616 2008-05-28 00:34:13Z mike $" - PPD API introduction for CUPS. Copyright 2007-2012 by Apple Inc. diff --git a/cups/array-private.h b/cups/array-private.h index 4d3c29734..c563e25df 100644 --- a/cups/array-private.h +++ b/cups/array-private.h @@ -1,17 +1,15 @@ /* - * "$Id$" + * Private array definitions for CUPS. * - * Private array definitions for CUPS. + * Copyright 2011-2012 by Apple Inc. * - * Copyright 2011-2012 by Apple Inc. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_ARRAY_PRIVATE_H_ @@ -46,7 +44,3 @@ extern cups_array_t *_cupsArrayNewStrings(const char *s, char delim) } # endif /* __cplusplus */ #endif /* !_CUPS_ARRAY_PRIVATE_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/array.c b/cups/array.c index cbe52e59f..fa54cc8d3 100644 --- a/cups/array.c +++ b/cups/array.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Sorted array routines for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -1325,8 +1323,3 @@ cups_array_find(cups_array_t *a, /* I - Array */ return (current); } - - -/* - * End of "$Id$". - */ diff --git a/cups/array.h b/cups/array.h index 385b7dffc..c7478310c 100644 --- a/cups/array.h +++ b/cups/array.h @@ -1,18 +1,16 @@ /* - * "$Id$" + * Sorted array definitions for CUPS. * - * Sorted array definitions for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_ARRAY_H_ @@ -86,7 +84,3 @@ extern void *cupsArrayUserData(cups_array_t *a) _CUPS_API_1_2; } # endif /* __cplusplus */ #endif /* !_CUPS_ARRAY_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/auth.c b/cups/auth.c index 5802a504e..f9e9f98ba 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Authentication functions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -871,8 +869,3 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ return (1); #endif /* WIN32 || __EMX__ */ } - - -/* - * End of "$Id$". - */ diff --git a/cups/backchannel.c b/cups/backchannel.c index 06a6d2308..c4c96acbe 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Backchannel functions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -186,8 +184,3 @@ cups_setup(fd_set *set, /* I - Set for select() */ FD_ZERO(set); FD_SET(3, set); } - - -/* - * End of "$Id$". - */ diff --git a/cups/backend.c b/cups/backend.c index 6e12c0f35..b84ea5ca3 100644 --- a/cups/backend.c +++ b/cups/backend.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Backend functions for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -142,8 +140,3 @@ quote_string(const char *s) /* I - String to write */ putchar('\"'); } - - -/* - * End of "$Id$". - */ diff --git a/cups/backend.h b/cups/backend.h index 85941c71a..709fd6eb5 100644 --- a/cups/backend.h +++ b/cups/backend.h @@ -1,18 +1,16 @@ /* - * "$Id$" + * Backend definitions for CUPS. * - * Backend definitions for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_BACKEND_H_ @@ -72,7 +70,3 @@ extern void cupsBackendReport(const char *device_scheme, # endif /* __cplusplus */ #endif /* !_CUPS_BACKEND_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/cups-private.h b/cups/cups-private.h index c36fde6ee..134aa8b03 100644 --- a/cups/cups-private.h +++ b/cups/cups-private.h @@ -1,18 +1,16 @@ /* - * "$Id$" + * Private definitions for CUPS. * - * Private definitions for CUPS. + * Copyright 2007-2015 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * Copyright 2007-2015 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_CUPS_PRIVATE_H_ @@ -272,7 +270,3 @@ extern char *_cupsUserDefault(char *name, size_t namesize); } # endif /* __cplusplus */ #endif /* !_CUPS_CUPS_PRIVATE_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/cups.h b/cups/cups.h index 0e374b450..50f954565 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * API definitions for CUPS. * * Copyright 2007-2016 by Apple Inc. @@ -621,7 +619,3 @@ extern ssize_t cupsHashData(const char *algorithm, const void *data, size_t dat # endif /* __cplusplus */ #endif /* !_CUPS_CUPS_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/debug-private.h b/cups/debug-private.h index 26c75a379..8d9861cb4 100644 --- a/cups/debug-private.h +++ b/cups/debug-private.h @@ -1,18 +1,16 @@ /* - * "$Id$" + * Private debugging macros for CUPS. * - * Private debugging macros for CUPS. + * Copyright 2007-2012 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_DEBUG_PRIVATE_H_ @@ -111,7 +109,3 @@ extern int _cups_gettimeofday(struct timeval *tv, void *tz); # endif /* __cplusplus */ #endif /* !_CUPS_DEBUG_PRIVATE_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/debug.c b/cups/debug.c index 3ee3a1900..a25e4b1ae 100644 --- a/cups/debug.c +++ b/cups/debug.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Debugging functions for CUPS. * * Copyright 2008-2015 by Apple Inc. @@ -642,8 +640,3 @@ _cups_safe_vsnprintf( return (bytes); } - - -/* - * End of "$Id$". - */ diff --git a/cups/dest-localization.c b/cups/dest-localization.c index 5439465d3..195869e60 100644 --- a/cups/dest-localization.c +++ b/cups/dest-localization.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Destination localization support for CUPS. * * Copyright 2012-2014 by Apple Inc. @@ -531,9 +529,3 @@ cups_scan_strings(char *buffer) /* I - Start of string */ return (bufptr); } - - - -/* - * End of "$Id$". - */ diff --git a/cups/dest-options.c b/cups/dest-options.c index 82f5a4275..438e6f681 100644 --- a/cups/dest-options.c +++ b/cups/dest-options.c @@ -883,7 +883,7 @@ cupsGetDestMediaByIndex( _cupsSetError(IPP_STATUS_ERROR_INTERNAL, strerror(EINVAL), 0); return (0); } - + if (nsize->size_name) strlcpy(size->media, nsize->size_name, sizeof(size->media)); else if (nsize->key) @@ -2263,8 +2263,3 @@ cups_update_ready(http_t *http, /* I - Connection to destination */ dinfo->ready_time = time(NULL); } - - -/* - * End of "$Id$". - */ diff --git a/cups/dir.c b/cups/dir.c index 04706d467..7abe39be8 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -1,30 +1,16 @@ /* - * "$Id$" + * Directory routines for CUPS. * - * Directory routines for CUPS. + * This set of APIs abstracts enumeration of directory entries. * - * This set of APIs abstracts enumeration of directory entries. + * Copyright 2007-2012 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products, all rights reserved. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * _cups_dir_time() - Convert a FILETIME value to a UNIX time value. - * cupsDirClose() - Close a directory. - * cupsDirOpen() - Open a directory. - * cupsDirRead() - Read the next directory entry. - * cupsDirRewind() - Rewind to the start of the directory. - * cupsDirClose() - Close a directory. - * cupsDirOpen() - Open a directory. - * cupsDirRead() - Read the next directory entry. - * cupsDirRewind() - Rewind to the start of the directory. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -463,10 +449,4 @@ cupsDirRewind(cups_dir_t *dp) /* I - Directory pointer */ rewinddir(dp->dir); } - - #endif /* WIN32 */ - -/* - * End of "$Id$". - */ diff --git a/cups/dir.h b/cups/dir.h index 75e5b1e61..98a6767d4 100644 --- a/cups/dir.h +++ b/cups/dir.h @@ -1,18 +1,16 @@ /* - * "$Id$" + * Public directory definitions for CUPS. * - * Public directory definitions for CUPS. + * This set of APIs abstracts enumeration of directory entries. * - * This set of APIs abstracts enumeration of directory entries. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products, all rights reserved. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPS_DIR_H_ @@ -63,7 +61,3 @@ extern void cupsDirRewind(cups_dir_t *dp) _CUPS_API_1_2; } # endif /* __cplusplus */ #endif /* !_CUPS_DIR_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/encode.c b/cups/encode.c index 757d53bf7..6416cd524 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Option encoding routines for CUPS. * * Copyright 2007-2016 by Apple Inc. @@ -848,8 +846,3 @@ compare_ipp_options(_ipp_option_t *a, /* I - First option */ { return (strcmp(a->name, b->name)); } - - -/* - * End of "$Id$". - */ diff --git a/cups/file-private.h b/cups/file-private.h index 219480fdb..6ce11cf90 100644 --- a/cups/file-private.h +++ b/cups/file-private.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Private file definitions for CUPS. * * Since stdio files max out at 256 files on many systems, we have to @@ -133,7 +131,3 @@ extern void _cupsFileCheckFilter(void *context, # endif /* __cplusplus */ #endif /* !_CUPS_FILE_PRIVATE_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/file.c b/cups/file.c index 7814dba99..03d0f33e4 100644 --- a/cups/file.c +++ b/cups/file.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * File functions for CUPS. * * Since stdio files max out at 256 files on many systems, we have to @@ -2735,8 +2733,3 @@ cups_write(cups_file_t *fp, /* I - CUPS file */ return ((ssize_t)total); } - - -/* - * End of "$Id$". - */ diff --git a/cups/file.h b/cups/file.h index 6e73fea1b..8a4289f3e 100644 --- a/cups/file.h +++ b/cups/file.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Public file definitions for CUPS. * * Since stdio files max out at 256 files on many systems, we have to @@ -112,7 +110,3 @@ extern ssize_t cupsFileWrite(cups_file_t *fp, const char *buf, } # endif /* __cplusplus */ #endif /* !_CUPS_FILE_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/getdevices.c b/cups/getdevices.c index 9ecc722d7..c3e828785 100644 --- a/cups/getdevices.c +++ b/cups/getdevices.c @@ -1,21 +1,15 @@ /* - * "$Id$" + * cupsGetDevices implementation for CUPS. * - * cupsGetDevices implementation for CUPS. + * Copyright 2008-2013 by Apple Inc. * - * Copyright 2008-2013 by Apple Inc. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * cupsGetDevices() - Get available printer devices. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -272,8 +266,3 @@ cupsGetDevices( return (cupsLastError()); } - - -/* - * End of "$Id$". - */ diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c index 8111e224d..82653a91c 100644 --- a/cups/getifaddrs.c +++ b/cups/getifaddrs.c @@ -1,21 +1,14 @@ /* - * "$Id$" + * Network interface functions for CUPS. * - * Network interface functions for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products, all rights reserved. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * "LICENSE" which should have been included with this file. If this - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * _cups_getifaddrs() - Get a list of network interfaces on the system. - * _cups_freeifaddrs() - Free an interface list... + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * "LICENSE" which should have been included with this file. If this + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -259,8 +252,3 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */ } } #endif /* !HAVE_GETIFADDRS */ - - -/* - * End of "$Id$". - */ diff --git a/cups/getputfile.c b/cups/getputfile.c index 478c55cb2..d71d52797 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Get/put file functions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -506,8 +504,3 @@ cupsPutFile(http_t *http, /* I - Connection to server or @code CUPS_HTTP_DE return (status); } - - -/* - * End of "$Id$". - */ diff --git a/cups/globals.c b/cups/globals.c index fa0feb4c5..6131a5cfb 100644 --- a/cups/globals.c +++ b/cups/globals.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Global variable access routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -379,8 +377,3 @@ cups_globals_init(void) pthread_key_create(&cups_globals_key, (void (*)(void *))cups_globals_free); } #endif /* HAVE_PTHREAD_H */ - - -/* - * End of "$Id$". - */ diff --git a/cups/hash.c b/cups/hash.c index e20590f26..ca6a69c4c 100644 --- a/cups/hash.c +++ b/cups/hash.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Hashing function for CUPS. * * Copyright 2015 by Apple Inc. @@ -245,8 +243,3 @@ cupsHashData(const char *algorithm, /* I - Algorithm name */ _cupsSetError(IPP_STATUS_ERROR_INTERNAL, _("Hash buffer too small."), 1); return (-1); } - - -/* - * End of "$Id$". - */ diff --git a/cups/http-addr.c b/cups/http-addr.c index 7ae25e449..ad202c1f2 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * HTTP address routines for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -920,8 +918,3 @@ httpResolveHostname(http_t *http, /* I - HTTP connection */ else return (http->hostname); } - - -/* - * End of "$Id$". - */ diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index 9f5cad56d..c68b629dd 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * HTTP address list routines for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -888,8 +886,3 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p return (first); } - - -/* - * End of "$Id$". - */ diff --git a/cups/http.c b/cups/http.c index 47ac8e4ab..565306ddb 100644 --- a/cups/http.c +++ b/cups/http.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * HTTP routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -4813,8 +4811,3 @@ http_write_chunk(http_t *http, /* I - HTTP connection */ return (bytes); } - - -/* - * End of "$Id$". - */ diff --git a/cups/http.h b/cups/http.h index 4f72c678c..03906393a 100644 --- a/cups/http.h +++ b/cups/http.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Hyper-Text Transport Protocol definitions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -654,7 +652,3 @@ extern const char *httpURIStatusString(http_uri_status_t status) _CUPS_API_2_0; } # endif /* __cplusplus */ #endif /* !_CUPS_HTTP_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/ipp-private.h b/cups/ipp-private.h index 2d8840842..0dbd97e1d 100644 --- a/cups/ipp-private.h +++ b/cups/ipp-private.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Private IPP definitions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -75,7 +73,3 @@ extern _ipp_option_t *_ippFindOption(const char *name); } # endif /* __cplusplus */ #endif /* !_CUPS_IPP_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 40c01eb60..7847a35f0 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Internet Printing Protocol support functions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -2286,8 +2284,3 @@ ipp_col_string(ipp_t *col, /* I - Collection attribute */ return ((size_t)(bufptr - buffer)); } - - -/* - * End of "$Id$". - */ diff --git a/cups/ipp.c b/cups/ipp.c index 440432049..4e1e8c8d4 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Internet Printing Protocol functions for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -7015,8 +7013,3 @@ ipp_write_file(int *fd, /* I - File descriptor */ return (write(*fd, buffer, length)); #endif /* WIN32 */ } - - -/* - * End of "$Id$". - */ diff --git a/cups/ipp.h b/cups/ipp.h index aefdcbfa4..de509bc7d 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Internet Printing Protocol definitions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -1034,7 +1032,3 @@ extern const char *ippStateString(ipp_state_t state) _CUPS_API_2_0; } # endif /* __cplusplus */ #endif /* !_CUPS_IPP_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/langprintf.c b/cups/langprintf.c index f5f92a948..40a6688e3 100644 --- a/cups/langprintf.c +++ b/cups/langprintf.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Localized printf/puts functions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -334,8 +332,3 @@ _cupsSetLocale(char *argv[]) /* IO - Command-line arguments */ } } } - - -/* - * End of "$Id$". - */ diff --git a/cups/language-private.h b/cups/language-private.h index cf5b482b4..a597cd3f0 100644 --- a/cups/language-private.h +++ b/cups/language-private.h @@ -1,18 +1,16 @@ /* - * "$Id$" + * Private localization support for CUPS. * - * Private localization support for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_LANGUAGE_PRIVATE_H_ @@ -80,7 +78,3 @@ extern void _cupsSetLocale(char *argv[]); # endif /* __cplusplus */ #endif /* !_CUPS_LANGUAGE_PRIVATE_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/language.c b/cups/language.c index aa167ad24..32a2af641 100644 --- a/cups/language.c +++ b/cups/language.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * I18N/language support for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1621,8 +1619,3 @@ cups_unquote(char *d, /* O - Unquoted string */ *d = '\0'; } - - -/* - * End of "$Id$". - */ diff --git a/cups/language.h b/cups/language.h index 0b8acdee4..c378e9863 100644 --- a/cups/language.h +++ b/cups/language.h @@ -1,18 +1,16 @@ /* - * "$Id$" + * Multi-language support for CUPS. * - * Multi-language support for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_LANGUAGE_H_ @@ -109,7 +107,3 @@ extern cups_lang_t *cupsLangGet(const char *language); # endif /* __cplusplus */ #endif /* !_CUPS_LANGUAGE_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/md5-private.h b/cups/md5-private.h index 3667cf0b3..8b9bf125b 100644 --- a/cups/md5-private.h +++ b/cups/md5-private.h @@ -1,31 +1,29 @@ /* - * "$Id$" + * Private MD5 definitions for CUPS. * - * Private MD5 definitions for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 2005 by Easy Software Products * - * Copyright 2007-2010 by Apple Inc. - * Copyright 2005 by Easy Software Products + * Copyright (C) 1999 Aladdin Enterprises. All rights reserved. * - * Copyright (C) 1999 Aladdin Enterprises. All rights reserved. + * This software is provided 'as-is', without any express or implied + * warranty. In no event will the authors be held liable for any damages + * arising from the use of this software. * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. + * Permission is granted to anyone to use this software for any purpose, + * including commercial applications, and to alter it and redistribute it + * freely, subject to the following restrictions: * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: + * 1. The origin of this software must not be misrepresented; you must not + * claim that you wrote the original software. If you use this software + * in a product, an acknowledgment in the product documentation would be + * appreciated but is not required. + * 2. Altered source versions must be plainly marked as such, and must not be + * misrepresented as being the original software. + * 3. This notice may not be removed or altered from any source distribution. * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - * L. Peter Deutsch - * ghost@aladdin.com + * L. Peter Deutsch + * ghost@aladdin.com */ /* @@ -73,7 +71,3 @@ void _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]); } /* end extern "C" */ # endif /* __cplusplus */ #endif /* !_CUPS_MD5_PRIVATE_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/md5.c b/cups/md5.c index 851715ff1..c0f5dd73f 100644 --- a/cups/md5.c +++ b/cups/md5.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Private MD5 implementation for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -339,8 +337,3 @@ _cupsMD5Finish(_cups_md5_state_t *pms, unsigned char digest[16]) for (i = 0; i < 16; ++i) digest[i] = (unsigned char)(pms->abcd[i >> 2] >> ((i & 3) << 3)); } - - -/* - * End of "$Id$". - */ diff --git a/cups/md5passwd.c b/cups/md5passwd.c index a0dc2cf5b..9714aaaea 100644 --- a/cups/md5passwd.c +++ b/cups/md5passwd.c @@ -1,25 +1,16 @@ /* - * "$Id$" + * MD5 password support for CUPS. * - * MD5 password support for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * httpMD5() - Compute the MD5 sum of the username:group:password. - * httpMD5Nonce() - Combine the MD5 sum of the username, group, and password - * with the server-supplied nonce value. - * httpMD5String() - Convert an MD5 sum to a character string. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -135,8 +126,3 @@ httpMD5String(const unsigned char *sum, /* I - MD5 sum data */ return (md5); } - - -/* - * End of "$Id$". - */ diff --git a/cups/notify.c b/cups/notify.c index 69363aa15..cb005497d 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -1,24 +1,16 @@ /* - * "$Id$" + * Notification routines for CUPS. * - * Notification routines for CUPS. + * Copyright 2007-2013 by Apple Inc. + * Copyright 2005-2006 by Easy Software Products. * - * Copyright 2007-2013 by Apple Inc. - * Copyright 2005-2006 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * cupsNotifySubject() - Return the subject for the given notification - * message. - * cupsNotifyText() - Return the text for the given notification message. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -195,8 +187,3 @@ cupsNotifyText(cups_lang_t *lang, /* I - Language data */ return (strdup(notify_text->values[0].string.text)); } - - -/* - * End of "$Id$". - */ diff --git a/cups/options.c b/cups/options.c index 798728905..986ae1ca2 100644 --- a/cups/options.c +++ b/cups/options.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Option routines for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -684,8 +682,3 @@ cups_find_option( return (current); } - - -/* - * End of "$Id$". - */ diff --git a/cups/ppd-attr.c b/cups/ppd-attr.c index c98a36b47..4a57d09ff 100644 --- a/cups/ppd-attr.c +++ b/cups/ppd-attr.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PPD model-specific attribute routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -314,8 +312,3 @@ _ppdNormalizeMakeAndModel( return (buffer[0] ? buffer : NULL); } - - -/* - * End of "$Id$". - */ diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c index e02d44355..0f12870b6 100644 --- a/cups/ppd-cache.c +++ b/cups/ppd-cache.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PPD cache implementation for CUPS. * * Copyright 2010-2015 by Apple Inc. @@ -3832,8 +3830,3 @@ pwg_unppdize_name(const char *ppd, /* I - PPD keyword */ *ptr = '\0'; } - - -/* - * End of "$Id$". - */ diff --git a/cups/ppd-conflicts.c b/cups/ppd-conflicts.c index 31a82d779..26e104e92 100644 --- a/cups/ppd-conflicts.c +++ b/cups/ppd-conflicts.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Option conflict management routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1193,8 +1191,3 @@ ppd_test_constraints( return (active); } - - -/* - * End of "$Id$". - */ diff --git a/cups/ppd-custom.c b/cups/ppd-custom.c index 5f5272ce3..25516b607 100644 --- a/cups/ppd-custom.c +++ b/cups/ppd-custom.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PPD custom option routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -109,8 +107,3 @@ ppdNextCustomParam(ppd_coption_t *opt) /* I - Custom option */ return ((ppd_cparam_t *)cupsArrayNext(opt->params)); } - - -/* - * End of "$Id$". - */ diff --git a/cups/ppd-emit.c b/cups/ppd-emit.c index e750029ef..1c3d32005 100644 --- a/cups/ppd-emit.c +++ b/cups/ppd-emit.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PPD code emission routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1200,8 +1198,3 @@ ppd_handle_media(ppd_file_t *ppd) /* I - PPD file */ } } } - - -/* - * End of "$Id$". - */ diff --git a/cups/ppd-localize.c b/cups/ppd-localize.c index 9f837b87e..64d710886 100644 --- a/cups/ppd-localize.c +++ b/cups/ppd-localize.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PPD localization routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -772,8 +770,3 @@ ppd_ll_CC(char *ll_CC, /* O - Country-specific locale name */ lang->language, ll_CC)); return (lang); } - - -/* - * End of "$Id$". - */ diff --git a/cups/ppd-mark.c b/cups/ppd-mark.c index 0fddab5c3..3b0c51306 100644 --- a/cups/ppd-mark.c +++ b/cups/ppd-mark.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Option marking routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1082,8 +1080,3 @@ ppd_mark_option(ppd_file_t *ppd, /* I - PPD file */ cupsArrayAdd(ppd->marked, c); } - - -/* - * End of "$Id$". - */ diff --git a/cups/ppd-page.c b/cups/ppd-page.c index f7eb62b4a..246907017 100644 --- a/cups/ppd-page.c +++ b/cups/ppd-page.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Page size functions for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -382,8 +380,3 @@ ppdPageLength(ppd_file_t *ppd, /* I - PPD file */ else return (size->length); } - - -/* - * End of "$Id$". - */ diff --git a/cups/ppd-private.h b/cups/ppd-private.h index b8254446a..83f048e29 100644 --- a/cups/ppd-private.h +++ b/cups/ppd-private.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Private PPD definitions for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -247,7 +245,3 @@ extern const char *_pwgPageSizeForMedia(pwg_media_t *media, } # endif /* __cplusplus */ #endif /* !_CUPS_PPD_PRIVATE_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/ppd-util.c b/cups/ppd-util.c index 918ab78d6..527549164 100644 --- a/cups/ppd-util.c +++ b/cups/ppd-util.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PPD utilities for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -716,8 +714,3 @@ cups_get_printer_uri( DEBUG_puts("5cups_get_printer_uri: Printer URI not found."); return (0); } - - -/* - * End of "$Id$". - */ diff --git a/cups/ppd.c b/cups/ppd.c index 21443e6b0..7721b74fa 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PPD file routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -3453,8 +3451,3 @@ ppd_update_filters(ppd_file_t *ppd, /* I - PPD file */ DEBUG_puts("5ppd_update_filters: Completed OK."); return (1); } - - -/* - * End of "$Id$". - */ diff --git a/cups/ppd.h b/cups/ppd.h index c5989835d..a95dac17f 100644 --- a/cups/ppd.h +++ b/cups/ppd.h @@ -1,31 +1,29 @@ /* - * "$Id$" + * PostScript Printer Description definitions for CUPS. * - * PostScript Printer Description definitions for CUPS. + * THESE APIS ARE DEPRECATED. TO COMPILE WITHOUT WARNINGS ADD + * -D_PPD_DEPRECATED="" TO YOUR COMPILE OPTIONS. THIS HEADER AND THESE + * FUNCTIONS WILL BE REMOVED IN A FUTURE RELEASE OF CUPS. * - * THESE APIS ARE DEPRECATED. TO COMPILE WITHOUT WARNINGS ADD - * -D_PPD_DEPRECATED="" TO YOUR COMPILE OPTIONS. THIS HEADER AND THESE - * FUNCTIONS WILL BE REMOVED IN A FUTURE RELEASE OF CUPS. + * Copyright 2007-2015 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * Copyright 2007-2015 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * PostScript is a trademark of Adobe Systems, Inc. * - * PostScript is a trademark of Adobe Systems, Inc. + * This code and any derivative of it may be used and distributed + * freely under the terms of the GNU General Public License when + * used with GNU Ghostscript or its derivatives. Use of the code + * (or any derivative of it) with software other than GNU + * GhostScript (or its derivatives) is governed by the CUPS license + * agreement. * - * This code and any derivative of it may be used and distributed - * freely under the terms of the GNU General Public License when - * used with GNU Ghostscript or its derivatives. Use of the code - * (or any derivative of it) with software other than GNU - * GhostScript (or its derivatives) is governed by the CUPS license - * agreement. - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_PPD_H_ @@ -482,7 +480,3 @@ extern int ppdPageSizeLimits(ppd_file_t *ppd, } # endif /* __cplusplus */ #endif /* !_CUPS_PPD_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/pwg.h b/cups/pwg.h index 505778e15..f663246ca 100644 --- a/cups/pwg.h +++ b/cups/pwg.h @@ -1,17 +1,15 @@ /* - * "$Id$" + * PWG media API definitions for CUPS. * - * PWG media API definitions for CUPS. + * Copyright 2009-2013 by Apple Inc. * - * Copyright 2009-2013 by Apple Inc. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_PWG_H_ @@ -88,7 +86,3 @@ extern pwg_media_t *pwgMediaForSize(int width, int length) _CUPS_API_1_7; # endif /* __cplusplus */ #endif /* !_CUPS_PWG_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/raster-private.h b/cups/raster-private.h index 95e54dc02..7656b2796 100644 --- a/cups/raster-private.h +++ b/cups/raster-private.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Private image library definitions for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -60,7 +58,3 @@ extern void _cupsRasterAddError(const char *f, ...) extern void _cupsRasterClearError(void); #endif /* !_CUPS_RASTER_PRIVATE_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/request.c b/cups/request.c index 1ab0cc3c5..8d6d95c0c 100644 --- a/cups/request.c +++ b/cups/request.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * IPP utilities for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -1172,8 +1170,3 @@ _cupsSetHTTPError(http_status_t status) /* I - HTTP status code */ break; } } - - -/* - * End of "$Id$". - */ diff --git a/cups/sidechannel.c b/cups/sidechannel.c index 8dc2ce0ff..beabef33a 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Side-channel API code for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -622,8 +620,3 @@ cupsSideChannelWrite( return (0); } - - -/* - * End of "$Id$". - */ diff --git a/cups/sidechannel.h b/cups/sidechannel.h index 48353d1ee..3512fa32e 100644 --- a/cups/sidechannel.h +++ b/cups/sidechannel.h @@ -1,18 +1,16 @@ /* - * "$Id$" + * Side-channel API definitions for CUPS. * - * Side-channel API definitions for CUPS. + * Copyright 2007-2012 by Apple Inc. + * Copyright 2006 by Easy Software Products. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 2006 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_SIDECHANNEL_H_ @@ -141,7 +139,3 @@ extern cups_sc_status_t cupsSideChannelSNMPWalk(const char *oid, double timeout, # endif /* __cplusplus */ #endif /* !_CUPS_SIDECHANNEL_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/snmp-private.h b/cups/snmp-private.h index 604456191..920ea3682 100644 --- a/cups/snmp-private.h +++ b/cups/snmp-private.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Private SNMP definitions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -139,8 +137,3 @@ extern int _cupsSNMPWrite(int fd, http_addr_t *address, int version, } # endif /* __cplusplus */ #endif /* !_CUPS_SNMP_PRIVATE_H_ */ - - -/* - * End of "$Id$". - */ diff --git a/cups/snmp.c b/cups/snmp.c index 4c62f959f..fffa2182b 100644 --- a/cups/snmp.c +++ b/cups/snmp.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * SNMP functions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -1674,8 +1672,3 @@ snmp_set_error(cups_snmp_t *packet, /* I - Packet */ packet->error = _cupsLangString(cg->lang_default, message); } - - -/* - * End of "$Id$". - */ diff --git a/cups/snprintf.c b/cups/snprintf.c index 9af6b90f8..d586ce92a 100644 --- a/cups/snprintf.c +++ b/cups/snprintf.c @@ -1,23 +1,16 @@ /* - * "$Id$" + * snprintf functions for CUPS. * - * snprintf functions for CUPS. + * Copyright 2007-2013 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. * - * Copyright 2007-2013 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * _cups_vsnprintf() - Format a string into a fixed size buffer. - * _cups_snprintf() - Format a string into a fixed size buffer. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -358,9 +351,3 @@ _cups_snprintf(char *buffer, /* O - Output buffer */ return (bytes); } #endif /* !HAVE_SNPRINTF */ - - -/* - * End of "$Id$". - */ - diff --git a/cups/string-private.h b/cups/string-private.h index 845bfc9d2..0868cbacd 100644 --- a/cups/string-private.h +++ b/cups/string-private.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Private string definitions for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -217,7 +215,3 @@ extern char *_cupsStrDate(char *buf, size_t bufsize, time_t timeval); # endif /* __cplusplus */ #endif /* !_CUPS_STRING_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/string.c b/cups/string.c index 19d1224f4..23b04398e 100644 --- a/cups/string.c +++ b/cups/string.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * String functions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -769,8 +767,3 @@ compare_sp_items(_cups_sp_item_t *a, /* I - First item */ { return (strcmp(a->str, b->str)); } - - -/* - * End of "$Id$". - */ diff --git a/cups/tempfile.c b/cups/tempfile.c index 772ca4ef5..77c025594 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Temp file utilities for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -192,8 +190,3 @@ cupsTempFile2(char *filename, /* I - Pointer to buffer */ else return (file); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testadmin.c b/cups/testadmin.c index 28dafa7f2..f15c80815 100644 --- a/cups/testadmin.c +++ b/cups/testadmin.c @@ -1,23 +1,16 @@ /* - * "$Id$" + * Admin function test program for CUPS. * - * Admin function test program for CUPS. + * Copyright 2007-2013 by Apple Inc. + * Copyright 2006 by Easy Software Products. * - * Copyright 2007-2013 by Apple Inc. - * Copyright 2006 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * main() - Main entry. - * show_settings() - Show settings in the array... + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -114,8 +107,3 @@ show_settings( num_settings --; } } - - -/* - * End of "$Id$". - */ diff --git a/cups/testarray.c b/cups/testarray.c index dc90951ba..5ae7315d2 100644 --- a/cups/testarray.c +++ b/cups/testarray.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Array test program for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -548,8 +546,3 @@ load_words(const char *filename, /* I - File to load */ return (1); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testcache.c b/cups/testcache.c index 2c92dbdc7..9025a0df1 100644 --- a/cups/testcache.c +++ b/cups/testcache.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PPD cache testing program for CUPS. * * Copyright 2009-2014 by Apple Inc. @@ -91,8 +89,3 @@ main(int argc, /* I - Number of command-line args */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testconflicts.c b/cups/testconflicts.c index 269c53ec3..d07b088ea 100644 --- a/cups/testconflicts.c +++ b/cups/testconflicts.c @@ -1,21 +1,15 @@ /* - * "$Id$" + * PPD constraint test program for CUPS. * - * PPD constraint test program for CUPS. + * Copyright 2008-2012 by Apple Inc. * - * Copyright 2008-2012 by Apple Inc. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * main() - Main entry. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -131,8 +125,3 @@ main(int argc, /* I - Number of command-line arguments */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testcups.c b/cups/testcups.c index 74d0660bf..b6bf78fa3 100644 --- a/cups/testcups.c +++ b/cups/testcups.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * CUPS API test program for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -582,8 +580,3 @@ show_diffs(cups_dest_t *a, /* I - First destination */ printf(" %-20.20s %-20.20s %-20.20s\n", aoption->name, aoption->value, bval ? bval : "(null)"); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testdest.c b/cups/testdest.c index 50835eceb..de6f1daa5 100644 --- a/cups/testdest.c +++ b/cups/testdest.c @@ -358,7 +358,7 @@ localize(http_t *http, /* I - Connection to destination */ break; } } - + } else puts(cupsLocalizeDestValue(http, dest, dinfo, option, value)); @@ -674,7 +674,7 @@ show_supported(http_t *http, /* I - Connection to destination */ break; } } - + } else if (cupsCheckDestSupported(http, dest, dinfo, option, value)) puts("YES"); @@ -710,8 +710,3 @@ usage(const char *arg) /* I - Argument for usage message */ exit(arg != NULL); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testfile.c b/cups/testfile.c index 9dbd8d549..dae50fa23 100644 --- a/cups/testfile.c +++ b/cups/testfile.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * File test program for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -138,9 +136,9 @@ main(int argc, /* I - Number of command-line arguments */ puts("PASS"); fputs("cupsFileGets: ", stdout); - if ((count = count_lines(fp)) != 208) + if ((count = count_lines(fp)) != 201) { - printf("FAIL (got %d lines, expected 208)\n", count); + printf("FAIL (got %d lines, expected 201)\n", count); status ++; } else @@ -158,9 +156,9 @@ main(int argc, /* I - Number of command-line arguments */ puts("PASS"); fputs("cupsFileGets: ", stdout); - if ((count = count_lines(fp)) != 208) + if ((count = count_lines(fp)) != 201) { - printf("FAIL (got %d lines, expected 208)\n", count); + printf("FAIL (got %d lines, expected 201)\n", count); status ++; } else @@ -822,8 +820,3 @@ read_write_tests(int compression) /* I - Use compression? */ return (status); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testhttp.c b/cups/testhttp.c index 1c6bcb2cb..20c6625ae 100644 --- a/cups/testhttp.c +++ b/cups/testhttp.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * HTTP test program for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -886,8 +884,3 @@ main(int argc, /* I - Number of command-line arguments */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testi18n.c b/cups/testi18n.c index e478428bd..a88f1e1f4 100644 --- a/cups/testi18n.c +++ b/cups/testi18n.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Internationalization test for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -607,8 +605,3 @@ print_utf8(const char *msg, /* I - Message String */ putchar('\n'); } - - -/* - * End of "$Id$" - */ diff --git a/cups/testipp.c b/cups/testipp.c index 2540ff482..150abe068 100644 --- a/cups/testipp.c +++ b/cups/testipp.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * IPP test program for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -1048,8 +1046,3 @@ write_cb(_ippdata_t *data, /* I - Data */ return ((ssize_t)count); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testlang.c b/cups/testlang.c index cc7b4f699..6f0691e00 100644 --- a/cups/testlang.c +++ b/cups/testlang.c @@ -1,22 +1,16 @@ /* - * "$Id$" + * Localization test program for CUPS. * - * Localization test program for CUPS. + * Copyright 2007-2015 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2015 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * main() - Load the specified language and show the strings for yes and no. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -150,8 +144,3 @@ main(int argc, /* I - Number of command-line arguments */ return (errors > 0); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testoptions.c b/cups/testoptions.c index 6c939e8c3..44a3c71d9 100644 --- a/cups/testoptions.c +++ b/cups/testoptions.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Option unit test program for CUPS. * * Copyright 2008-2016 by Apple Inc. @@ -174,8 +172,3 @@ main(int argc, /* I - Number of command-line arguments */ exit (status); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testppd.c b/cups/testppd.c index b211d1d75..6d5065c66 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PPD test program for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1168,8 +1166,3 @@ main(int argc, /* I - Number of command-line arguments */ return (status); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testpwg.c b/cups/testpwg.c index 582c8deb1..05aba45e3 100644 --- a/cups/testpwg.c +++ b/cups/testpwg.c @@ -569,8 +569,3 @@ test_ppd_cache(_ppd_cache_t *pc, /* I - PWG mapping data */ return (status); } - - -/* - * End of "$Id$". - */ diff --git a/cups/testsnmp.c b/cups/testsnmp.c index 66e2d76ee..3ab48af24 100644 --- a/cups/testsnmp.c +++ b/cups/testsnmp.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * SNMP test program for CUPS. * * Copyright 2008-2014 by Apple Inc. @@ -290,8 +288,3 @@ usage(void) exit (1); } - - -/* - * End of "$Id$". - */ diff --git a/cups/thread-private.h b/cups/thread-private.h index 67dbe5418..9acae0ec7 100644 --- a/cups/thread-private.h +++ b/cups/thread-private.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Private threading definitions for CUPS. * * Copyright 2009-2014 by Apple Inc. @@ -94,7 +92,3 @@ extern int _cupsThreadCreate(_cups_thread_func_t func, void *arg); } # endif /* __cplusplus */ #endif /* !_CUPS_THREAD_PRIVATE_H_ */ - -/* - * End of "$Id$". - */ diff --git a/cups/thread.c b/cups/thread.c index c9c5cfb49..558ac9aaf 100644 --- a/cups/thread.c +++ b/cups/thread.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Threading primitives for CUPS. * * Copyright 2009-2014 by Apple Inc. @@ -320,8 +318,3 @@ _cupsThreadCreate( return (0); } #endif /* HAVE_PTHREAD_H */ - - -/* - * End of "$Id$". - */ diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c index e29dd3186..be81894c7 100644 --- a/cups/tls-gnutls.c +++ b/cups/tls-gnutls.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * TLS support code for CUPS using GNU TLS. * * Copyright 2007-2015 by Apple Inc. @@ -1338,8 +1336,3 @@ _httpTLSWrite(http_t *http, /* I - Connection to server */ return ((int)result); } - - -/* - * End of "$Id$". - */ diff --git a/cups/tls-sspi.c b/cups/tls-sspi.c index 25be327d1..0b41cf3d6 100644 --- a/cups/tls-sspi.c +++ b/cups/tls-sspi.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * TLS support for CUPS on Windows using the Security Support Provider * Interface (SSPI). * @@ -2424,8 +2422,3 @@ http_sspi_verify( return (status); } - - -/* - * End of "$Id$". - */ diff --git a/cups/tls.c b/cups/tls.c index 3f88df2c6..c1db80d29 100644 --- a/cups/tls.c +++ b/cups/tls.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * TLS routines for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -105,8 +103,3 @@ httpSaveCredentials(const char *path, cups_array_t *credentials, const char *com return (-1); } #endif /* HAVE_SSL */ - - -/* - * End of "$Id$". - */ diff --git a/cups/tlscheck.c b/cups/tlscheck.c index e78bf28c6..919726102 100644 --- a/cups/tlscheck.c +++ b/cups/tlscheck.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * TLS check program for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -743,8 +741,3 @@ usage(void) exit(1); } #endif /* !HAVE_SSL */ - - -/* - * End of "$Id$". - */ diff --git a/cups/transcode.c b/cups/transcode.c index e0342ecdb..2aa1a8bc3 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Transcoding support for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -710,8 +708,3 @@ cupsUTF32ToUTF8( return ((int)(dest - start)); } - - -/* - * End of "$Id$" - */ diff --git a/cups/transcode.h b/cups/transcode.h index cafea33c5..20d13db0e 100644 --- a/cups/transcode.h +++ b/cups/transcode.h @@ -1,18 +1,16 @@ /* - * "$Id$" + * Transcoding definitions for CUPS. * - * Transcoding definitions for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_TRANSCODE_H_ @@ -74,8 +72,3 @@ extern int cupsUTF32ToUTF8(cups_utf8_t *dest, # endif /* __cplusplus */ #endif /* !_CUPS_TRANSCODE_H_ */ - - -/* - * End of "$Id$" - */ diff --git a/cups/usersys.c b/cups/usersys.c index 7c4c189b1..538966872 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * User, system, and password routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1281,8 +1279,3 @@ cups_set_user( { strlcpy(cc->user, value, sizeof(cc->user)); } - - -/* - * End of "$Id$". - */ diff --git a/cups/util.c b/cups/util.c index 42cf176eb..d67df61b9 100644 --- a/cups/util.c +++ b/cups/util.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Printing utilities for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -953,8 +951,3 @@ cupsStartDocument( return (status); } - - -/* - * End of "$Id$". - */ diff --git a/cups/versioning.h b/cups/versioning.h index ff52d6088..90a2b42b9 100644 --- a/cups/versioning.h +++ b/cups/versioning.h @@ -1,17 +1,15 @@ /* - * "$Id$" + * API versioning definitions for CUPS. * - * API versioning definitions for CUPS. + * Copyright 2007-2016 by Apple Inc. * - * Copyright 2007-2015 by Apple Inc. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_VERSIONING_H_ @@ -30,7 +28,7 @@ * provided by the compiler. */ -# if defined(__APPLE__) && !defined(_CUPS_SOURCE) +# if defined(__APPLE__) && !defined(_CUPS_SOURCE) && !TARGET_OS_IOS # include <AvailabilityMacros.h> # ifndef AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER # define AVAILABLE_MAC_OS_X_VERSION_10_3_AND_LATER __attribute__((unavailable)) @@ -162,7 +160,3 @@ # endif /* !__GNUC__ */ #endif /* !_CUPS_VERSIONING_H_ */ - -/* - * End of "$Id$". - */ diff --git a/data/Makefile b/data/Makefile index 6bc4a197d..a3f9e36a9 100644 --- a/data/Makefile +++ b/data/Makefile @@ -1,16 +1,14 @@ # -# "$Id$" +# Datafile makefile for CUPS. # -# Datafile makefile for CUPS. +# Copyright 2007-2014 by Apple Inc. +# Copyright 1993-2006 by Easy Software Products. # -# Copyright 2007-2014 by Apple Inc. -# Copyright 1993-2006 by Easy Software Products. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs @@ -120,8 +118,3 @@ uninstall: -$(RMDIR) $(DATADIR)/data -$(RMDIR) $(DATADIR)/banners -$(RMDIR) $(DATADIR) - - -# -# End of "$Id$". -# diff --git a/data/epson.h b/data/epson.h index 13cb1a346..f7d52ba01 100644 --- a/data/epson.h +++ b/data/epson.h @@ -1,17 +1,15 @@ /* - * "$Id$" + * This file contains model number definitions for the CUPS sample + * ESC/P driver. * - * This file contains model number definitions for the CUPS sample - * ESC/P driver. + * Copyright 2007 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products. * - * Copyright 2007 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ #define EPSON_9PIN 0 /* 9-pin dot matrix */ @@ -20,8 +18,3 @@ #define EPSON_PHOTO 3 /* Epson Stylus Photo with ESC . */ #define EPSON_ICOLOR 4 /* Epson Stylus Color with ESC i */ #define EPSON_IPHOTO 5 /* Epson Stylus Photo with ESC i */ - - -/* - * End of "$Id$". - */ @@ -1,24 +1,17 @@ /* - * "$Id$" + * This file contains model number definitions for the CUPS sample + * HP driver. * - * This file contains model number definitions for the CUPS sample - * HP driver. + * Copyright 2007 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products. * - * Copyright 2007 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ #define HP_LASERJET 0 /* HP LaserJet */ #define HP_DESKJET 1 /* HP DeskJet with simple color */ #define HP_DESKJET2 2 /* HP DeskJet with CRet color */ - - -/* - * End of "$Id$". - */ diff --git a/data/label.h b/data/label.h index 4b6fba64f..c0d99034c 100644 --- a/data/label.h +++ b/data/label.h @@ -1,17 +1,15 @@ /* - * "$Id$" + * This file contains model number definitions for the CUPS sample + * label printer driver. * - * This file contains model number definitions for the CUPS sample - * label printer driver. + * Copyright 2007 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products. * - * Copyright 2007 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ #define DYMO_3x0 0 /* Dymo Labelwriter 300/330/330 Turbo */ @@ -22,7 +20,3 @@ #define ZEBRA_CPCL 0x13 /* Zebra CPCL-based printers */ #define INTELLITECH_PCL 0x20 /* Intellitech PCL-based printers */ - -/* - * End of "$Id$". - */ diff --git a/desktop/Makefile b/desktop/Makefile index 9d786f6f0..97f530d10 100644 --- a/desktop/Makefile +++ b/desktop/Makefile @@ -1,16 +1,14 @@ # -# "$Id$" +# Desktop makefile for CUPS. # -# Desktop makefile for CUPS. +# Copyright 2007-2009 by Apple Inc. +# Copyright 1993-2006 by Easy Software Products. # -# Copyright 2007-2009 by Apple Inc. -# Copyright 1993-2006 by Easy Software Products. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs @@ -128,8 +126,3 @@ uninstall: $(RM) $(BUILDROOT)$(ICONDIR)/hicolor/64x64/apps/cups.png; \ $(RM) $(BUILDROOT)$(ICONDIR)/hicolor/128x128/apps/cups.png; \ fi - - -# -# End of "$Id$". -# diff --git a/doc/Makefile b/doc/Makefile index dc454bdcf..df3f2f7a0 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,6 +1,4 @@ # -# "$Id$" -# # Documentation makefile for CUPS. # # Copyright 2007-2014 by Apple Inc. @@ -49,7 +47,6 @@ HELPFILES = \ help/api-array.html \ help/api-cgi.html \ help/api-cups.html \ - help/api-driver.html \ help/api-filedir.html \ help/api-filter.html \ help/api-httpipp.html \ @@ -254,8 +251,3 @@ docset: cp $(HELPFILES) ../org.cups.docset/Contents/Resources/Documentation/help cp cups-printable.css ../org.cups.docset/Contents/Resources/Documentation cp $(HELPIMAGES) ../org.cups.docset/Contents/Resources/Documentation/images - - -# -# End of Makefile. -# diff --git a/doc/help/api-array.html b/doc/help/api-array.html index 220c0f1cb..f1e367ce6 100644 --- a/doc/help/api-array.html +++ b/doc/help/api-array.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-array.header 7266 2008-01-29 02:15:29Z mike $" - Array API header for CUPS. Copyright 2008-2011 by Apple Inc. @@ -425,8 +423,6 @@ div.contents ul.subcontents li { </ul></li> </ul> <!-- - "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" - Array API introduction for CUPS. Copyright 2007-2011 by Apple Inc. diff --git a/doc/help/api-cups.html b/doc/help/api-cups.html index e3917d814..648ad04c1 100644 --- a/doc/help/api-cups.html +++ b/doc/help/api-cups.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" - CUPS API header for CUPS. Copyright 2008-2011 by Apple Inc. @@ -557,8 +555,6 @@ constants">cups_ptype_e</a></li> </ul></li> </ul> <!-- - "$Id: api-cups.shtml 7337 2008-02-22 04:44:04Z mike $" - API introduction for CUPS. Copyright 2007-2013 by Apple Inc. @@ -1172,8 +1168,9 @@ ipp_status_t cupsCancelDestJob (<br> <p class="description">Cancel a job on a destination.</p> <p class="discussion">The "job_id" is the number returned by cupsCreateDestJob.<br> <br> -Returns IPP_STATUS_OK on success and IPP_NOT_AUTHORIZED or IPP_FORBIDDEN on -failure. +Returns <code>IPP_STATUS_OK</code> on success and +<code>IPP_STATUS_ERRPR_NOT_AUTHORIZED</code> or +<code>IPP_STATUS_ERROR_FORBIDDEN</code> on failure. </p> <h3 class="function"><a name="cupsCancelJob">cupsCancelJob</a></h3> @@ -3555,7 +3552,7 @@ constants</p> <h4 class="constants">Constants</h4> <dl> <dt>CUPS_PRINTER_3D <span class="info"> CUPS 2.1 </span></dt> -<dd class="description">3D Printing </dd> +<dd class="description">Printer with 3D capabilities </dd> <dt>CUPS_PRINTER_AUTHENTICATED <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> <dd class="description">Printer requires authentication </dd> diff --git a/doc/help/api-driver.html b/doc/help/api-driver.html deleted file mode 100644 index d0e4a55ed..000000000 --- a/doc/help/api-driver.html +++ /dev/null @@ -1,1156 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html> -<!-- SECTION: Programming --> -<head> - <title>Printer Driver API </title> - <meta name="keywords" content="Programming"> - <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> - <meta name="creator" content="Mini-XML v2.7"> -<style type="text/css"><!-- -BODY { - font-family: lucida grande, geneva, helvetica, arial, sans-serif; -} - -H1, H2, H3, H4, H5, H6, P, TD, TH { - font-family: lucida grande, geneva, helvetica, arial, sans-serif; -} - -KBD { - font-family: monaco, courier, monospace; - font-weight: bold; -} - -PRE { - font-family: monaco, courier, monospace; -} - -PRE.command { - border: dotted thin #7f7f7f; - margin-left: 36pt; - padding: 10px; -} - -P.compact { - margin: 0; -} - -P.example { - font-style: italic; - margin-left: 36pt; -} - -PRE.example { - background: #eeeeee; - border: dotted thin #999999; - margin-left: 36pt; - padding: 10pt; -} - -PRE.command EM, PRE.example EM { - font-family: lucida grande, geneva, helvetica, arial, sans-serif; -} - -P.command { - font-family: monaco, courier, monospace; - margin-left: 36pt; -} - -P.formula { - font-style: italic; - margin-left: 36pt; -} - -BLOCKQUOTE { - background: #eeeeee; - border: solid thin #999999; - padding: 10pt; -} - -A IMG { - border: none; -} - -A:link:hover IMG { - background: #f0f0f0; - border-radius: 10px; - -moz-border-radius: 10px; -} - -A:link, A:visited { - font-weight: normal; - text-decoration: none; -} - -A:link:hover, A:visited:hover, A:active { - text-decoration: underline; -} - -SUB, SUP { - font-size: 50%; -} - -TR.data, TD.data, TR.data TD { - margin-top: 10pt; - padding: 5pt; - border-bottom: solid 1pt #999999; -} - -TR.data TH { - border-bottom: solid 1pt #999999; - padding-top: 10pt; - padding-left: 5pt; - text-align: left; -} - -DIV.table TABLE { - border: solid thin #999999; - border-collapse: collapse; - border-spacing: 0; - margin-left: auto; - margin-right: auto; -} - -DIV.table CAPTION { - caption-side: top; - font-size: 120%; - font-style: italic; - font-weight: bold; - margin-left: auto; - margin-right: auto; -} - -DIV.table TABLE TD { - border: solid thin #cccccc; - padding-top: 5pt; -} - -DIV.table TABLE TH { - background: #cccccc; - border: none; - border-bottom: solid thin #999999; -} - -DIV.figure TABLE { - margin-left: auto; - margin-right: auto; -} - -DIV.figure CAPTION { - caption-side: bottom; - font-size: 120%; - font-style: italic; - font-weight: bold; - margin-left: auto; - margin-right: auto; -} - -TH.label { - text-align: right; - vertical-align: top; -} - -TH.sublabel { - text-align: right; - font-weight: normal; -} - -HR { - border: solid thin; -} - -SPAN.info { - background: black; - border: thin solid black; - color: white; - font-size: 80%; - font-style: italic; - font-weight: bold; - white-space: nowrap; -} - -H2 SPAN.info, H3 SPAN.info, H4 SPAN.info { - float: right; - font-size: 100%; -} - -H1.title { -} - -H2.title, H3.title { - border-bottom: solid 2pt #000000; -} - -DIV.indent, TABLE.indent { - margin-top: 2em; - margin-left: auto; - margin-right: auto; - width: 90%; -} - -TABLE.indent { - border-collapse: collapse; -} - -TABLE.indent TD, TABLE.indent TH { - padding: 0; -} - -TABLE.list { - border-collapse: collapse; - margin-left: auto; - margin-right: auto; - width: 90%; -} - -TABLE.list TH { - background: white; - border-bottom: solid thin #cccccc; - color: #444444; - padding-top: 10pt; - padding-left: 5pt; - text-align: left; - vertical-align: bottom; - white-space: nowrap; -} - -TABLE.list TH A { - color: #4444cc; -} - -TABLE.list TD { - border-bottom: solid thin #eeeeee; - padding-top: 5pt; - padding-left: 5pt; -} - -TABLE.list TR:nth-child(even) { - background: #f8f8f8; -} - -TABLE.list TR:nth-child(odd) { - background: #f4f4f4; -} - -DT { - margin-left: 36pt; - margin-top: 12pt; -} - -DD { - margin-left: 54pt; -} - -DL.category DT { - font-weight: bold; -} - -P.summary { - margin-left: 36pt; - font-family: monaco, courier, monospace; -} - -DIV.summary TABLE { - border: solid thin #999999; - border-collapse: collapse; - border-spacing: 0; - margin: 10px; -} - -DIV.summary TABLE TD, DIV.summary TABLE TH { - border: solid thin #999999; - padding: 5px; - text-align: left; - vertical-align: top; -} - -DIV.summary TABLE THEAD TH { - background: #eeeeee; -} - -/* API documentation styles... */ -div.body h1 { - margin: 0; -} -div.body h2 { - margin-top: 1.5em; -} -div.body h3, div.body h4, div.body h5 { - margin-bottom: 0.5em; - margin-top: 1.5em; -} -.class, .enumeration, .function, .struct, .typedef, .union { - border-bottom: solid thin #999999; - margin-bottom: 0; - margin-top: 2em; -} -.description { - margin-top: 0.5em; -} -code, p.code, pre, ul.code li { - font-family: monaco, courier, monospace; - font-size: 90%; -} -ul.code, ul.contents, ul.subcontents { - list-style-type: none; - margin: 0; - padding-left: 0; -} -ul.code li { - margin: 0; -} -ul.contents > li { - margin-top: 1em; -} -ul.contents li ul.code, ul.contents li ul.subcontents { - padding-left: 2em; -} -div.body dl { - margin-left: 0; - margin-top: 0; -} -div.body dt { - font-style: italic; - margin-left: 0; - margin-top: 0; -} -div.body dd { - margin-bottom: 0.5em; -} - -/* This is just for the HTML files generated with the framedhelp target */ -div.contents { - background: #e8e8e8; - border: solid thin black; - padding: 10px; -} -div.contents h1 { - font-size: 110%; -} -div.contents h2 { - font-size: 100%; -} -div.contents ul.contents { - font-size: 80%; -} -div.contents ul.subcontents li { - margin-left: 1em; - text-indent: -1em; -} ---></style> -</head> -<body> -<div class='body'> -<!-- - "$Id$" - - Driver API header for CUPS. - - Copyright 2009 by Apple Inc. - - These coded instructions, statements, and computer programs are the - property of Apple Inc. and are protected by Federal copyright - law. Distribution and use rights are outlined in the file "LICENSE.txt" - which should have been included with this file. If this file is - file is missing or damaged, see the license at "http://www.cups.org/". ---> - -<h1 class='title'>Driver API</h1> - -<div class='summary'><table summary='General Information'> -<thead> -<tr> - <th>Header</th> - <th>cups/driver.h</th> -</tr> -</thead> -<tbody> -<tr> - <th>Library</th> - <td>-lcupsdriver</td> -</tr> -<tr> - <th>See Also</th> - <td>Programming: <a href='api-overview.html' target='_top'>Introduction to CUPS Programming</a></td> -</tr> -</tbody> -</table></div> -<h2 class="title">Contents</h2> -<ul class="contents"> -<li><a href="#OVERVIEW">Overview</a></li> -<li><a href="#FUNCTIONS">Functions</a><ul class="code"> - <li><a href="#cupsCMYKDelete" title="Delete a color separation.">cupsCMYKDelete</a></li> - <li><a href="#cupsCMYKDoBlack" title="Do a black separation...">cupsCMYKDoBlack</a></li> - <li><a href="#cupsCMYKDoCMYK" title="Do a CMYK separation...">cupsCMYKDoCMYK</a></li> - <li><a href="#cupsCMYKDoGray" title="Do a grayscale separation...">cupsCMYKDoGray</a></li> - <li><a href="#cupsCMYKDoRGB" title="Do an sRGB separation...">cupsCMYKDoRGB</a></li> - <li><a href="#cupsCMYKLoad" title="Load a CMYK color profile from PPD attributes.">cupsCMYKLoad</a></li> - <li><a href="#cupsCMYKNew" title="Create a new CMYK color separation.">cupsCMYKNew</a></li> - <li><a href="#cupsCMYKSetBlack" title="Set the transition range for CMY to black.">cupsCMYKSetBlack</a></li> - <li><a href="#cupsCMYKSetCurve" title="Set a color transform curve using points.">cupsCMYKSetCurve</a></li> - <li><a href="#cupsCMYKSetGamma" title="Set a color transform curve using gamma and density.">cupsCMYKSetGamma</a></li> - <li><a href="#cupsCMYKSetInkLimit" title="Set the limit on the amount of ink.">cupsCMYKSetInkLimit</a></li> - <li><a href="#cupsCMYKSetLtDk" title="Set light/dark ink transforms.">cupsCMYKSetLtDk</a></li> - <li><a href="#cupsCheckBytes" title="Check to see if all bytes are zero.">cupsCheckBytes</a></li> - <li><a href="#cupsCheckValue" title="Check to see if all bytes match the given value.">cupsCheckValue</a></li> - <li><a href="#cupsDitherDelete" title="Free a dithering buffer.">cupsDitherDelete</a></li> - <li><a href="#cupsDitherLine" title="Dither a line of pixels...">cupsDitherLine</a></li> - <li><a href="#cupsDitherNew" title="Create an error-diffusion dithering buffer.">cupsDitherNew</a></li> - <li><a href="#cupsFindAttr" title="Find a PPD attribute based on the colormodel, -media, and resolution.">cupsFindAttr</a></li> - <li><a href="#cupsLutDelete" title="Free the memory used by a lookup table.">cupsLutDelete</a></li> - <li><a href="#cupsLutLoad" title="Load a LUT from a PPD file.">cupsLutLoad</a></li> - <li><a href="#cupsLutNew" title="Make a lookup table from a list of pixel values.">cupsLutNew</a></li> - <li><a href="#cupsPackHorizontal" title="Pack pixels horizontally...">cupsPackHorizontal</a></li> - <li><a href="#cupsPackHorizontal2" title="Pack 2-bit pixels horizontally...">cupsPackHorizontal2</a></li> - <li><a href="#cupsPackHorizontalBit" title="Pack pixels horizontally by bit...">cupsPackHorizontalBit</a></li> - <li><a href="#cupsPackVertical" title="Pack pixels vertically...">cupsPackVertical</a></li> - <li><a href="#cupsRGBDelete" title="Delete a color separation.">cupsRGBDelete</a></li> - <li><a href="#cupsRGBDoGray" title="Do a grayscale separation...">cupsRGBDoGray</a></li> - <li><a href="#cupsRGBDoRGB" title="Do a RGB separation...">cupsRGBDoRGB</a></li> - <li><a href="#cupsRGBLoad" title="Load a RGB color profile from a PPD file.">cupsRGBLoad</a></li> - <li><a href="#cupsRGBNew" title="Create a new RGB color separation.">cupsRGBNew</a></li> -</ul></li> -<li><a href="#TYPES">Data Types</a><ul class="code"> - <li><a href="#cups_cmyk_t" title="Simple CMYK lookup table">cups_cmyk_t</a></li> - <li><a href="#cups_dither_t" title="Dithering State">cups_dither_t</a></li> - <li><a href="#cups_lut_t" title="Lookup Table for Dithering">cups_lut_t</a></li> - <li><a href="#cups_rgb_t" title="Color separation lookup table">cups_rgb_t</a></li> - <li><a href="#cups_sample_t" title="Color sample point">cups_sample_t</a></li> -</ul></li> -<li><a href="#STRUCTURES">Structures</a><ul class="code"> - <li><a href="#cups_cmyk_s" title="Simple CMYK lookup table">cups_cmyk_s</a></li> - <li><a href="#cups_dither_s" title="Dithering State">cups_dither_s</a></li> - <li><a href="#cups_lut_s" title="Lookup Table for Dithering">cups_lut_s</a></li> - <li><a href="#cups_rgb_s" title="Color separation lookup table">cups_rgb_s</a></li> - <li><a href="#cups_sample_s" title="Color sample point">cups_sample_s</a></li> -</ul></li> -<li><a href="#VARIABLES">Variables</a><ul class="code"> - <li><a href="#cups_scmy_lut[256]" title="sRGB gamma lookup table (inverted)">cups_scmy_lut[256]</a></li> - <li><a href="#cups_srgb_lut[256]" title="sRGB gamma lookup table">cups_srgb_lut[256]</a></li> -</ul></li> -</ul> -<!-- - "$Id$" - - Driver API introduction for CUPS. - - Copyright 2009 by Apple Inc. - - These coded instructions, statements, and computer programs are the - property of Apple Inc. and are protected by Federal copyright - law. Distribution and use rights are outlined in the file "LICENSE.txt" - which should have been included with this file. If this file is - file is missing or damaged, see the license at "http://www.cups.org/". ---> - -<h2 class='title'><a name='OVERVIEW'>Overview</a></h2> - -<p>The driver API provides common dithering, color conversion, and utility -functions for CUPS drivers.</p> -<h2 class="title"><a name="FUNCTIONS">Functions</a></h2> -<h3 class="function"><a name="cupsCMYKDelete">cupsCMYKDelete</a></h3> -<p class="description">Delete a color separation.</p> -<p class="code"> -void cupsCMYKDelete (<br> - <a href="#cups_cmyk_t">cups_cmyk_t</a> *cmyk<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>cmyk</dt> -<dd class="description">Color separation</dd> -</dl> -<h3 class="function"><a name="cupsCMYKDoBlack">cupsCMYKDoBlack</a></h3> -<p class="description">Do a black separation...</p> -<p class="code"> -void cupsCMYKDoBlack (<br> - const <a href="#cups_cmyk_t">cups_cmyk_t</a> *cmyk,<br> - const unsigned char *input,<br> - short *output,<br> - int num_pixels<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>cmyk</dt> -<dd class="description">Color separation</dd> -<dt>input</dt> -<dd class="description">Input grayscale pixels</dd> -<dt>output</dt> -<dd class="description">Output Device-N pixels</dd> -<dt>num_pixels</dt> -<dd class="description">Number of pixels</dd> -</dl> -<h3 class="function"><a name="cupsCMYKDoCMYK">cupsCMYKDoCMYK</a></h3> -<p class="description">Do a CMYK separation...</p> -<p class="code"> -void cupsCMYKDoCMYK (<br> - const <a href="#cups_cmyk_t">cups_cmyk_t</a> *cmyk,<br> - const unsigned char *input,<br> - short *output,<br> - int num_pixels<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>cmyk</dt> -<dd class="description">Color separation</dd> -<dt>input</dt> -<dd class="description">Input grayscale pixels</dd> -<dt>output</dt> -<dd class="description">Output Device-N pixels</dd> -<dt>num_pixels</dt> -<dd class="description">Number of pixels</dd> -</dl> -<h3 class="function"><a name="cupsCMYKDoGray">cupsCMYKDoGray</a></h3> -<p class="description">Do a grayscale separation...</p> -<p class="code"> -void cupsCMYKDoGray (<br> - const <a href="#cups_cmyk_t">cups_cmyk_t</a> *cmyk,<br> - const unsigned char *input,<br> - short *output,<br> - int num_pixels<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>cmyk</dt> -<dd class="description">Color separation</dd> -<dt>input</dt> -<dd class="description">Input grayscale pixels</dd> -<dt>output</dt> -<dd class="description">Output Device-N pixels</dd> -<dt>num_pixels</dt> -<dd class="description">Number of pixels</dd> -</dl> -<h3 class="function"><a name="cupsCMYKDoRGB">cupsCMYKDoRGB</a></h3> -<p class="description">Do an sRGB separation...</p> -<p class="code"> -void cupsCMYKDoRGB (<br> - const <a href="#cups_cmyk_t">cups_cmyk_t</a> *cmyk,<br> - const unsigned char *input,<br> - short *output,<br> - int num_pixels<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>cmyk</dt> -<dd class="description">Color separation</dd> -<dt>input</dt> -<dd class="description">Input grayscale pixels</dd> -<dt>output</dt> -<dd class="description">Output Device-N pixels</dd> -<dt>num_pixels</dt> -<dd class="description">Number of pixels</dd> -</dl> -<h3 class="function"><a name="cupsCMYKLoad">cupsCMYKLoad</a></h3> -<p class="description">Load a CMYK color profile from PPD attributes.</p> -<p class="code"> -<a href="#cups_cmyk_t">cups_cmyk_t</a> *cupsCMYKLoad (<br> - ppd_file_t *ppd,<br> - const char *colormodel,<br> - const char *media,<br> - const char *resolution<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>ppd</dt> -<dd class="description">PPD file</dd> -<dt>colormodel</dt> -<dd class="description">ColorModel value</dd> -<dt>media</dt> -<dd class="description">MediaType value</dd> -<dt>resolution</dt> -<dd class="description">Resolution value</dd> -</dl> -<h4 class="returnvalue">Return Value</h4> -<p class="description">CMYK color separation</p> -<h3 class="function"><a name="cupsCMYKNew">cupsCMYKNew</a></h3> -<p class="description">Create a new CMYK color separation.</p> -<p class="code"> -<a href="#cups_cmyk_t">cups_cmyk_t</a> *cupsCMYKNew (<br> - int num_channels<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>num_channels</dt> -<dd class="description">Number of color components</dd> -</dl> -<h4 class="returnvalue">Return Value</h4> -<p class="description">New CMYK separation or NULL</p> -<h3 class="function"><a name="cupsCMYKSetBlack">cupsCMYKSetBlack</a></h3> -<p class="description">Set the transition range for CMY to black.</p> -<p class="code"> -void cupsCMYKSetBlack (<br> - <a href="#cups_cmyk_t">cups_cmyk_t</a> *cmyk,<br> - float lower,<br> - float upper<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>cmyk</dt> -<dd class="description">CMYK color separation</dd> -<dt>lower</dt> -<dd class="description">No black ink</dd> -<dt>upper</dt> -<dd class="description">Only black ink</dd> -</dl> -<h3 class="function"><a name="cupsCMYKSetCurve">cupsCMYKSetCurve</a></h3> -<p class="description">Set a color transform curve using points.</p> -<p class="code"> -void cupsCMYKSetCurve (<br> - <a href="#cups_cmyk_t">cups_cmyk_t</a> *cmyk,<br> - int channel,<br> - int num_xypoints,<br> - const float *xypoints<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>cmyk</dt> -<dd class="description">CMYK color separation</dd> -<dt>channel</dt> -<dd class="description">Color channel</dd> -<dt>num_xypoints</dt> -<dd class="description">Number of X,Y points</dd> -<dt>xypoints</dt> -<dd class="description">X,Y points</dd> -</dl> -<h3 class="function"><a name="cupsCMYKSetGamma">cupsCMYKSetGamma</a></h3> -<p class="description">Set a color transform curve using gamma and density.</p> -<p class="code"> -void cupsCMYKSetGamma (<br> - <a href="#cups_cmyk_t">cups_cmyk_t</a> *cmyk,<br> - int channel,<br> - float gamval,<br> - float density<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>cmyk</dt> -<dd class="description">CMYK color separation</dd> -<dt>channel</dt> -<dd class="description">Ink channel</dd> -<dt>gamval</dt> -<dd class="description">Gamma correction</dd> -<dt>density</dt> -<dd class="description">Maximum density</dd> -</dl> -<h3 class="function"><a name="cupsCMYKSetInkLimit">cupsCMYKSetInkLimit</a></h3> -<p class="description">Set the limit on the amount of ink.</p> -<p class="code"> -void cupsCMYKSetInkLimit (<br> - <a href="#cups_cmyk_t">cups_cmyk_t</a> *cmyk,<br> - float limit<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>cmyk</dt> -<dd class="description">CMYK color separation</dd> -<dt>limit</dt> -<dd class="description">Limit of ink</dd> -</dl> -<h3 class="function"><a name="cupsCMYKSetLtDk">cupsCMYKSetLtDk</a></h3> -<p class="description">Set light/dark ink transforms.</p> -<p class="code"> -void cupsCMYKSetLtDk (<br> - <a href="#cups_cmyk_t">cups_cmyk_t</a> *cmyk,<br> - int channel,<br> - float light,<br> - float dark<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>cmyk</dt> -<dd class="description">CMYK color separation</dd> -<dt>channel</dt> -<dd class="description">Dark ink channel (+1 for light)</dd> -<dt>light</dt> -<dd class="description">Light ink only level</dd> -<dt>dark</dt> -<dd class="description">Dark ink only level</dd> -</dl> -<h3 class="function"><a name="cupsCheckBytes">cupsCheckBytes</a></h3> -<p class="description">Check to see if all bytes are zero.</p> -<p class="code"> -int cupsCheckBytes (<br> - const unsigned char *bytes,<br> - int length<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>bytes</dt> -<dd class="description">Bytes to check</dd> -<dt>length</dt> -<dd class="description">Number of bytes to check</dd> -</dl> -<h4 class="returnvalue">Return Value</h4> -<p class="description">1 if they match</p> -<h3 class="function"><a name="cupsCheckValue">cupsCheckValue</a></h3> -<p class="description">Check to see if all bytes match the given value.</p> -<p class="code"> -int cupsCheckValue (<br> - const unsigned char *bytes,<br> - int length,<br> - const unsigned char value<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>bytes</dt> -<dd class="description">Bytes to check</dd> -<dt>length</dt> -<dd class="description">Number of bytes to check</dd> -<dt>value</dt> -<dd class="description">Value to check</dd> -</dl> -<h4 class="returnvalue">Return Value</h4> -<p class="description">1 if they match</p> -<h3 class="function"><a name="cupsDitherDelete">cupsDitherDelete</a></h3> -<p class="description">Free a dithering buffer.</p> -<p class="code"> -void cupsDitherDelete (<br> - <a href="#cups_dither_t">cups_dither_t</a> *d<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>d</dt> -<dd class="description">Dithering buffer</dd> -</dl> -<h4 class="discussion">Discussion</h4> -<p class="discussion">Returns 0 on success, -1 on failure.</p> -<h3 class="function"><a name="cupsDitherLine">cupsDitherLine</a></h3> -<p class="description">Dither a line of pixels...</p> -<p class="code"> -void cupsDitherLine (<br> - <a href="#cups_dither_t">cups_dither_t</a> *d,<br> - const <a href="#cups_lut_t">cups_lut_t</a> *lut,<br> - const short *data,<br> - int num_channels,<br> - unsigned char *p<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>d</dt> -<dd class="description">Dither data</dd> -<dt>lut</dt> -<dd class="description">Lookup table</dd> -<dt>data</dt> -<dd class="description">Separation data</dd> -<dt>num_channels</dt> -<dd class="description">Number of components</dd> -<dt>p</dt> -<dd class="description">Pixels</dd> -</dl> -<h3 class="function"><a name="cupsDitherNew">cupsDitherNew</a></h3> -<p class="description">Create an error-diffusion dithering buffer.</p> -<p class="code"> -<a href="#cups_dither_t">cups_dither_t</a> *cupsDitherNew (<br> - int width<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>width</dt> -<dd class="description">Width of output in pixels</dd> -</dl> -<h4 class="returnvalue">Return Value</h4> -<p class="description">New state array</p> -<h3 class="function"><a name="cupsFindAttr">cupsFindAttr</a></h3> -<p class="description">Find a PPD attribute based on the colormodel, -media, and resolution.</p> -<p class="code"> -ppd_attr_t *cupsFindAttr (<br> - ppd_file_t *ppd,<br> - const char *name,<br> - const char *colormodel,<br> - const char *media,<br> - const char *resolution,<br> - char *spec,<br> - int specsize<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>ppd</dt> -<dd class="description">PPD file</dd> -<dt>name</dt> -<dd class="description">Attribute name</dd> -<dt>colormodel</dt> -<dd class="description">Color model</dd> -<dt>media</dt> -<dd class="description">Media type</dd> -<dt>resolution</dt> -<dd class="description">Resolution</dd> -<dt>spec</dt> -<dd class="description">Final selection string</dd> -<dt>specsize</dt> -<dd class="description">Size of string buffer</dd> -</dl> -<h4 class="returnvalue">Return Value</h4> -<p class="description">Matching attribute or NULL</p> -<h3 class="function"><a name="cupsLutDelete">cupsLutDelete</a></h3> -<p class="description">Free the memory used by a lookup table.</p> -<p class="code"> -void cupsLutDelete (<br> - <a href="#cups_lut_t">cups_lut_t</a> *lut<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>lut</dt> -<dd class="description">Lookup table to free</dd> -</dl> -<h3 class="function"><a name="cupsLutLoad">cupsLutLoad</a></h3> -<p class="description">Load a LUT from a PPD file.</p> -<p class="code"> -<a href="#cups_lut_t">cups_lut_t</a> *cupsLutLoad (<br> - ppd_file_t *ppd,<br> - const char *colormodel,<br> - const char *media,<br> - const char *resolution,<br> - const char *ink<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>ppd</dt> -<dd class="description">PPD file</dd> -<dt>colormodel</dt> -<dd class="description">Color model</dd> -<dt>media</dt> -<dd class="description">Media type</dd> -<dt>resolution</dt> -<dd class="description">Resolution</dd> -<dt>ink</dt> -<dd class="description">Ink name</dd> -</dl> -<h4 class="returnvalue">Return Value</h4> -<p class="description">New lookup table</p> -<h3 class="function"><a name="cupsLutNew">cupsLutNew</a></h3> -<p class="description">Make a lookup table from a list of pixel values.</p> -<p class="code"> -<a href="#cups_lut_t">cups_lut_t</a> *cupsLutNew (<br> - int num_values,<br> - const float *values<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>num_values</dt> -<dd class="description">Number of values</dd> -<dt>values</dt> -<dd class="description">Lookup table values</dd> -</dl> -<h4 class="returnvalue">Return Value</h4> -<p class="description">New lookup table</p> -<h4 class="discussion">Discussion</h4> -<p class="discussion">Returns a pointer to the lookup table on success, NULL on failure.</p> -<h3 class="function"><a name="cupsPackHorizontal">cupsPackHorizontal</a></h3> -<p class="description">Pack pixels horizontally...</p> -<p class="code"> -void cupsPackHorizontal (<br> - const unsigned char *ipixels,<br> - unsigned char *obytes,<br> - int width,<br> - const unsigned char clearto,<br> - const int step<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>ipixels</dt> -<dd class="description">Input pixels</dd> -<dt>obytes</dt> -<dd class="description">Output bytes</dd> -<dt>width</dt> -<dd class="description">Number of pixels</dd> -<dt>clearto</dt> -<dd class="description">Initial value of bytes</dd> -<dt>step</dt> -<dd class="description">Step value between pixels</dd> -</dl> -<h3 class="function"><a name="cupsPackHorizontal2">cupsPackHorizontal2</a></h3> -<p class="description">Pack 2-bit pixels horizontally...</p> -<p class="code"> -void cupsPackHorizontal2 (<br> - const unsigned char *ipixels,<br> - unsigned char *obytes,<br> - int width,<br> - const int step<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>ipixels</dt> -<dd class="description">Input pixels</dd> -<dt>obytes</dt> -<dd class="description">Output bytes</dd> -<dt>width</dt> -<dd class="description">Number of pixels</dd> -<dt>step</dt> -<dd class="description">Stepping value</dd> -</dl> -<h3 class="function"><a name="cupsPackHorizontalBit">cupsPackHorizontalBit</a></h3> -<p class="description">Pack pixels horizontally by bit...</p> -<p class="code"> -void cupsPackHorizontalBit (<br> - const unsigned char *ipixels,<br> - unsigned char *obytes,<br> - int width,<br> - const unsigned char clearto,<br> - const unsigned char bit<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>ipixels</dt> -<dd class="description">Input pixels</dd> -<dt>obytes</dt> -<dd class="description">Output bytes</dd> -<dt>width</dt> -<dd class="description">Number of pixels</dd> -<dt>clearto</dt> -<dd class="description">Initial value of bytes</dd> -<dt>bit</dt> -<dd class="description">Bit to check</dd> -</dl> -<h3 class="function"><a name="cupsPackVertical">cupsPackVertical</a></h3> -<p class="description">Pack pixels vertically...</p> -<p class="code"> -void cupsPackVertical (<br> - const unsigned char *ipixels,<br> - unsigned char *obytes,<br> - int width,<br> - const unsigned char bit,<br> - const int step<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>ipixels</dt> -<dd class="description">Input pixels</dd> -<dt>obytes</dt> -<dd class="description">Output bytes</dd> -<dt>width</dt> -<dd class="description">Number of input pixels</dd> -<dt>bit</dt> -<dd class="description">Output bit</dd> -<dt>step</dt> -<dd class="description">Number of bytes between columns</dd> -</dl> -<h3 class="function"><a name="cupsRGBDelete">cupsRGBDelete</a></h3> -<p class="description">Delete a color separation.</p> -<p class="code"> -void cupsRGBDelete (<br> - <a href="#cups_rgb_t">cups_rgb_t</a> *rgbptr<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>rgbptr</dt> -<dd class="description">Color separation</dd> -</dl> -<h3 class="function"><a name="cupsRGBDoGray">cupsRGBDoGray</a></h3> -<p class="description">Do a grayscale separation...</p> -<p class="code"> -void cupsRGBDoGray (<br> - <a href="#cups_rgb_t">cups_rgb_t</a> *rgbptr,<br> - const unsigned char *input,<br> - unsigned char *output,<br> - int num_pixels<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>rgbptr</dt> -<dd class="description">Color separation</dd> -<dt>input</dt> -<dd class="description">Input grayscale pixels</dd> -<dt>output</dt> -<dd class="description">Output Device-N pixels</dd> -<dt>num_pixels</dt> -<dd class="description">Number of pixels</dd> -</dl> -<h3 class="function"><a name="cupsRGBDoRGB">cupsRGBDoRGB</a></h3> -<p class="description">Do a RGB separation...</p> -<p class="code"> -void cupsRGBDoRGB (<br> - <a href="#cups_rgb_t">cups_rgb_t</a> *rgbptr,<br> - const unsigned char *input,<br> - unsigned char *output,<br> - int num_pixels<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>rgbptr</dt> -<dd class="description">Color separation</dd> -<dt>input</dt> -<dd class="description">Input RGB pixels</dd> -<dt>output</dt> -<dd class="description">Output Device-N pixels</dd> -<dt>num_pixels</dt> -<dd class="description">Number of pixels</dd> -</dl> -<h3 class="function"><a name="cupsRGBLoad">cupsRGBLoad</a></h3> -<p class="description">Load a RGB color profile from a PPD file.</p> -<p class="code"> -<a href="#cups_rgb_t">cups_rgb_t</a> *cupsRGBLoad (<br> - ppd_file_t *ppd,<br> - const char *colormodel,<br> - const char *media,<br> - const char *resolution<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>ppd</dt> -<dd class="description">PPD file</dd> -<dt>colormodel</dt> -<dd class="description">Color model</dd> -<dt>media</dt> -<dd class="description">Media type</dd> -<dt>resolution</dt> -<dd class="description">Resolution</dd> -</dl> -<h4 class="returnvalue">Return Value</h4> -<p class="description">New color profile</p> -<h3 class="function"><a name="cupsRGBNew">cupsRGBNew</a></h3> -<p class="description">Create a new RGB color separation.</p> -<p class="code"> -<a href="#cups_rgb_t">cups_rgb_t</a> *cupsRGBNew (<br> - int num_samples,<br> - <a href="#cups_sample_t">cups_sample_t</a> *samples,<br> - int cube_size,<br> - int num_channels<br> -);</p> -<h4 class="parameters">Parameters</h4> -<dl> -<dt>num_samples</dt> -<dd class="description">Number of samples</dd> -<dt>samples</dt> -<dd class="description">Samples</dd> -<dt>cube_size</dt> -<dd class="description">Size of LUT cube</dd> -<dt>num_channels</dt> -<dd class="description">Number of color components</dd> -</dl> -<h4 class="returnvalue">Return Value</h4> -<p class="description">New color separation or NULL</p> -<h2 class="title"><a name="TYPES">Data Types</a></h2> -<h3 class="typedef"><a name="cups_cmyk_t">cups_cmyk_t</a></h3> -<p class="description">Simple CMYK lookup table</p> -<p class="code"> -typedef struct <a href="#cups_cmyk_s">cups_cmyk_s</a> cups_cmyk_t; -</p> -<h3 class="typedef"><a name="cups_dither_t">cups_dither_t</a></h3> -<p class="description">Dithering State</p> -<p class="code"> -typedef struct <a href="#cups_dither_s">cups_dither_s</a> cups_dither_t; -</p> -<h3 class="typedef"><a name="cups_lut_t">cups_lut_t</a></h3> -<p class="description">Lookup Table for Dithering</p> -<p class="code"> -typedef struct <a href="#cups_lut_s">cups_lut_s</a> cups_lut_t; -</p> -<h3 class="typedef"><a name="cups_rgb_t">cups_rgb_t</a></h3> -<p class="description">Color separation lookup table</p> -<p class="code"> -typedef struct <a href="#cups_rgb_s">cups_rgb_s</a> cups_rgb_t; -</p> -<h3 class="typedef"><a name="cups_sample_t">cups_sample_t</a></h3> -<p class="description">Color sample point</p> -<p class="code"> -typedef struct <a href="#cups_sample_s">cups_sample_s</a> cups_sample_t; -</p> -<h2 class="title"><a name="STRUCTURES">Structures</a></h2> -<h3 class="struct"><a name="cups_cmyk_s">cups_cmyk_s</a></h3> -<p class="description">Simple CMYK lookup table</p> -<p class="code">struct cups_cmyk_s {<br> - unsigned char black_lut[256];<br> - short *channels[CUPS_MAX_CHAN];<br> - unsigned char color_lut[256];<br> - int ink_limit;<br> - int num_channels;<br> -};</p> -<h4 class="members">Members</h4> -<dl> -<dt>black_lut[256] </dt> -<dd class="description">Black generation LUT</dd> -<dt>channels[CUPS_MAX_CHAN] </dt> -<dd class="description">Lookup tables</dd> -<dt>color_lut[256] </dt> -<dd class="description">Color removal LUT</dd> -<dt>ink_limit </dt> -<dd class="description">Ink limit</dd> -<dt>num_channels </dt> -<dd class="description">Number of components</dd> -</dl> -<h3 class="struct"><a name="cups_dither_s">cups_dither_s</a></h3> -<p class="description">Dithering State</p> -<p class="code">struct cups_dither_s {<br> - int errors[96];<br> - int row;<br> - int width;<br> -};</p> -<h4 class="members">Members</h4> -<dl> -<dt>errors[96] </dt> -<dd class="description">Error values</dd> -<dt>row </dt> -<dd class="description">Current row</dd> -<dt>width </dt> -<dd class="description">Width of buffer</dd> -</dl> -<h3 class="struct"><a name="cups_lut_s">cups_lut_s</a></h3> -<p class="description">Lookup Table for Dithering</p> -<p class="code">struct cups_lut_s {<br> - int error;<br> - short intensity;<br> - short pixel;<br> -};</p> -<h4 class="members">Members</h4> -<dl> -<dt>error </dt> -<dd class="description">Error from desired value</dd> -<dt>intensity </dt> -<dd class="description">Adjusted intensity</dd> -<dt>pixel </dt> -<dd class="description">Output pixel value</dd> -</dl> -<h3 class="struct"><a name="cups_rgb_s">cups_rgb_s</a></h3> -<p class="description">Color separation lookup table</p> -<p class="code">struct cups_rgb_s {<br> - unsigned char black[CUPS_MAX_RGB];<br> - int cache_init;<br> - unsigned char ****colors;<br> - int cube_index[256];<br> - int cube_mult[256];<br> - int cube_size;<br> - int num_channels;<br> - unsigned char white[CUPS_MAX_RGB];<br> -};</p> -<h4 class="members">Members</h4> -<dl> -<dt>black[CUPS_MAX_RGB] </dt> -<dd class="description">Cached black (sRGB = 0,0,0)</dd> -<dt>cache_init </dt> -<dd class="description">Are cached values initialized?</dd> -<dt>colors </dt> -<dd class="description">4-D array of sample values</dd> -<dt>cube_index[256] </dt> -<dd class="description">Index into cube for a given sRGB value</dd> -<dt>cube_mult[256] </dt> -<dd class="description">Multiplier value for a given sRGB value</dd> -<dt>cube_size </dt> -<dd class="description">Size of color cube (2-N) on a side</dd> -<dt>num_channels </dt> -<dd class="description">Number of colors per sample</dd> -<dt>white[CUPS_MAX_RGB] </dt> -<dd class="description">Cached white (sRGB = 255,255,255)</dd> -</dl> -<h3 class="struct"><a name="cups_sample_s">cups_sample_s</a></h3> -<p class="description">Color sample point</p> -<p class="code">struct cups_sample_s {<br> - unsigned char colors[CUPS_MAX_RGB];<br> - unsigned char rgb[3];<br> -};</p> -<h4 class="members">Members</h4> -<dl> -<dt>colors[CUPS_MAX_RGB] </dt> -<dd class="description">Color values</dd> -<dt>rgb[3] </dt> -<dd class="description">sRGB values</dd> -</dl> -<h2 class="title"><a name="VARIABLES">Variables</a></h2> -<h3 class="variable"><a name="cups_scmy_lut[256]">cups_scmy_lut[256]</a></h3> -<p class="description">sRGB gamma lookup table (inverted)</p> -<p class="code">extern const unsigned char cups_scmy_lut[256];</p> -<h3 class="variable"><a name="cups_srgb_lut[256]">cups_srgb_lut[256]</a></h3> -<p class="description">sRGB gamma lookup table</p> -<p class="code">extern const unsigned char cups_srgb_lut[256];</p> -</div> -</body> -</html> diff --git a/doc/help/api-filedir.html b/doc/help/api-filedir.html index 309d09daa..a3d517e96 100644 --- a/doc/help/api-filedir.html +++ b/doc/help/api-filedir.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-filedir.header 7279 2008-01-31 01:50:44Z mike $" - File and Directory API header for CUPS. Copyright 2008-2011 by Apple Inc. @@ -436,8 +434,6 @@ file.">cupsFileRewind</a></li> </ul></li> </ul> <!-- - "$Id: api-filedir.shtml 7279 2008-01-31 01:50:44Z mike $" - File and directory API introduction for CUPS. Copyright 2007-2011 by Apple Inc. diff --git a/doc/help/api-filter.html b/doc/help/api-filter.html index 1ab935b51..ec59df70d 100644 --- a/doc/help/api-filter.html +++ b/doc/help/api-filter.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-filter.header 7616 2008-05-28 00:34:13Z mike $" - Filter and backend programming header for CUPS. Copyright 2008-2014 by Apple Inc. @@ -439,8 +437,6 @@ div.contents ul.subcontents li { </ul></li> </ul> <!-- - "$Id: api-filter.shtml 7677 2008-06-19 23:22:19Z mike $" - Filter and backend programming introduction for CUPS. Copyright 2007-2014 by Apple Inc. diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html index 795ebbf47..faefc02bc 100644 --- a/doc/help/api-httpipp.html +++ b/doc/help/api-httpipp.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-httpipp.header 7258 2008-01-28 00:15:05Z mike $" - HTTP and IPP API header for CUPS. Copyright 2007-2011 by Apple Inc. @@ -711,8 +709,6 @@ are server-oriented...">http_state_e</a></li> </ul></li> </ul> <!-- - "$Id: api-httpipp.shtml 7684 2008-06-23 16:47:38Z mike $" - HTTP and IPP API introduction for CUPS. Copyright 2007-2012 by Apple Inc. @@ -6367,7 +6363,8 @@ are server-oriented...</p> <dd class="description">Add or modify a printer</dd> <dt>IPP_OP_CUPS_AUTHENTICATE_JOB <span class="info"> CUPS 1.2/OS X 10.5 </span></dt> <dd class="description">Authenticate a job </dd> -<dt>IPP_OP_CUPS_DELETE_CLASS </dt> +<dt>IPP_OP_CUPS_CREATE_LOCAL_PRINTER <span class="info"> CUPS 2.2 </span></dt> +<dd class="description">Create a local (temporary) printer <dt>IPP_OP_CUPS_DELETE_CLASS </dt> <dd class="description">Delete a class</dd> <dt>IPP_OP_CUPS_DELETE_PRINTER </dt> <dd class="description">Delete a printer</dd> @@ -6375,14 +6372,14 @@ are server-oriented...</p> <dd class="description">Get a list of classes </dd> <dt>IPP_OP_CUPS_GET_DEFAULT </dt> <dd class="description">Get the default printer</dd> -<dt>IPP_OP_CUPS_GET_DEVICES </dt> -<dd class="description">Get a list of supported devices</dd> +<dt>IPP_OP_CUPS_GET_DEVICES <span class="info"> DEPRECATED </span></dt> +<dd class="description">Get a list of supported devices </dd> <dt>IPP_OP_CUPS_GET_DOCUMENT <span class="info"> CUPS 1.4/OS X 10.6 </span></dt> <dd class="description">Get a document file </dd> -<dt>IPP_OP_CUPS_GET_PPD <span class="info"> CUPS 1.3/OS X 10.5 </span></dt> +<dt>IPP_OP_CUPS_GET_PPD <span class="info"> DEPRECATED </span></dt> <dd class="description">Get a PPD file </dd> -<dt>IPP_OP_CUPS_GET_PPDS </dt> -<dd class="description">Get a list of supported drivers</dd> +<dt>IPP_OP_CUPS_GET_PPDS <span class="info"> DEPRECATED </span></dt> +<dd class="description">Get a list of supported drivers </dd> <dt>IPP_OP_CUPS_GET_PRINTERS </dt> <dd class="description">Get a list of printers and/or classes</dd> <dt>IPP_OP_CUPS_INVALID </dt> diff --git a/doc/help/api-mime.html b/doc/help/api-mime.html index d95734299..ecfbcfde2 100644 --- a/doc/help/api-mime.html +++ b/doc/help/api-mime.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $" - MIME API header for CUPS. Copyright 2009 by Apple Inc. @@ -424,8 +422,6 @@ including file size.">mimeFilter2</a></li> </ul></li> </ul> <!-- - "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" - MIME API introduction for CUPS. Copyright 2009 by Apple Inc. diff --git a/doc/help/api-overview.html b/doc/help/api-overview.html index 01a041493..685dc5778 100644 --- a/doc/help/api-overview.html +++ b/doc/help/api-overview.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" - Introduction to CUPS programming header for CUPS. Copyright 2008-2011 by Apple Inc. @@ -415,8 +413,6 @@ div.contents ul.subcontents li { <li><a href="#WHERETOGO">Where to Go Next</a></li> </ul> <!-- - "$Id: api-cups.header 7279 2008-01-31 01:50:44Z mike $" - Introduction to CUPS programming content for CUPS. Copyright 2008-2011 by Apple Inc. diff --git a/doc/help/api-ppd.html b/doc/help/api-ppd.html index 1ace09424..2b35702f8 100644 --- a/doc/help/api-ppd.html +++ b/doc/help/api-ppd.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-ppd.header 7616 2008-05-28 00:34:13Z mike $" - PPD API header for CUPS. Copyright 2008-2012 by Apple Inc. @@ -495,8 +493,6 @@ conflicts.">ppdMarkOption</a></li> </ul></li> </ul> <!-- - "$Id: api-ppd.shtml 7616 2008-05-28 00:34:13Z mike $" - PPD API introduction for CUPS. Copyright 2007-2012 by Apple Inc. diff --git a/doc/help/api-ppdc.html b/doc/help/api-ppdc.html index df3213575..bfdf099a7 100644 --- a/doc/help/api-ppdc.html +++ b/doc/help/api-ppdc.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $" - PPD Compiler API header for CUPS. Copyright 2009 by Apple Inc. @@ -426,8 +424,6 @@ div.contents ul.subcontents li { </ul></li> </ul> <!-- - "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" - PPD Compiler API introduction for CUPS. Copyright 2009 by Apple Inc. diff --git a/doc/help/api-raster.html b/doc/help/api-raster.html index a604bd09a..19038d41c 100644 --- a/doc/help/api-raster.html +++ b/doc/help/api-raster.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id$" - Raster API documentation for CUPS. Copyright 2008-2010 by Apple Inc. @@ -447,8 +445,6 @@ page header structure.">cupsRasterWriteHeader2</a></li> </ul></li> </ul> <!-- - "$Id$" - Raster API introduction for CUPS. Copyright 2007-2013 by Apple Inc. diff --git a/doc/help/man-cupsenable.html b/doc/help/man-cupsenable.html index fe00393e0..fd113692e 100644 --- a/doc/help/man-cupsenable.html +++ b/doc/help/man-cupsenable.html @@ -88,6 +88,5 @@ CUPS Online Help (<a href="http://localhost:631/help">http://localhost:631/help< <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2> Copyright © 2007-2015 by Apple Inc. - </body> </html> diff --git a/doc/help/postscript-driver.html b/doc/help/postscript-driver.html index 1469f45e5..36a5e19fb 100644 --- a/doc/help/postscript-driver.html +++ b/doc/help/postscript-driver.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id$" - PostScript printer driver documentation for CUPS. Copyright 2007-2012 by Apple Inc. diff --git a/doc/help/ppd-compiler.html b/doc/help/ppd-compiler.html index 729e26851..9e601f842 100644 --- a/doc/help/ppd-compiler.html +++ b/doc/help/ppd-compiler.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id$" - PPD compiler documentation for CUPS. Copyright 2007-2012 by Apple Inc. diff --git a/doc/help/raster-driver.html b/doc/help/raster-driver.html index 8055705f4..a44a16b09 100644 --- a/doc/help/raster-driver.html +++ b/doc/help/raster-driver.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id$" - Raster printer driver documentation for CUPS. Copyright 2007-2012 by Apple Inc. diff --git a/doc/help/spec-banner.html b/doc/help/spec-banner.html index 65b096135..e9cb0e89d 100644 --- a/doc/help/spec-banner.html +++ b/doc/help/spec-banner.html @@ -8,8 +8,6 @@ </head> <body> <!-- - "$Id$" - Banner file format specification for CUPS. Copyright 2008-2011 by Apple Inc. diff --git a/doc/help/spec-command.html b/doc/help/spec-command.html index 06093574b..ac33ce4b6 100644 --- a/doc/help/spec-command.html +++ b/doc/help/spec-command.html @@ -8,8 +8,6 @@ </head> <body> <!-- - "$Id$" - CUPS command file format specification for CUPS. Copyright 2007-2011 by Apple Inc. diff --git a/doc/help/spec-postscript.html b/doc/help/spec-postscript.html index 110c5a3ca..cedff0bc0 100644 --- a/doc/help/spec-postscript.html +++ b/doc/help/spec-postscript.html @@ -8,8 +8,6 @@ </head> <body> <!-- - "$Id$" - CUPS PostScript file specification for CUPS. Copyright 2007-2012 by Apple Inc. diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html index 58c50f7cc..b8e3fe83c 100644 --- a/doc/help/spec-ppd.html +++ b/doc/help/spec-ppd.html @@ -353,8 +353,6 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id$" - PPD extension documentation for CUPS. Copyright 2007-2011 by Apple Inc. diff --git a/doc/robots.txt b/doc/robots.txt index 45dcdc221..276c9c276 100644 --- a/doc/robots.txt +++ b/doc/robots.txt @@ -1,31 +1,6 @@ # -# "$Id: robots.txt 3494 2003-03-19 15:37:44Z mike $" -# -# This file tells search engines not to index your CUPS server. -# -# Copyright 1993-2003 by Easy Software Products. -# -# These coded instructions, statements, and computer programs are the -# property of Easy Software Products and are protected by Federal -# copyright law. Distribution and use rights are outlined in the file -# "LICENSE.txt" which should have been included with this file. If this -# file is missing or damaged please contact Easy Software Products -# at: -# -# Attn: CUPS Licensing Information -# Easy Software Products -# 44141 Airport View Drive, Suite 204 -# Hollywood, Maryland 20636-3111 USA -# -# Voice: (301) 373-9600 -# EMail: cups-info@cups.org -# WWW: http://www.cups.org +# This file tells search engines not to index your CUPS server. # User-agent: * Disallow: / - -# -# End of "$Id: robots.txt 3494 2003-03-19 15:37:44Z mike $". -# - diff --git a/doc/swish-e.config b/doc/swish-e.config deleted file mode 100644 index 662f9839a..000000000 --- a/doc/swish-e.config +++ /dev/null @@ -1,16 +0,0 @@ -# Where to get things -IndexDir doc - -# Where to put things -IndexFile doc/swish-e.index - -# Ignore image and index files -FileRules filename contains .gif -FileRules filename contains .gz -FileRules filename contains .jpg -FileRules filename contains .png -FileRules filename contains .svg -FileRules filename contains swish-e -FileRules filename contains .tokens -FileRules filename is Makefile - diff --git a/examples/Makefile b/examples/Makefile index da08298b3..47ba04c07 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,16 +1,14 @@ # -# "$Id$" +# PPD compiler example makefile for CUPS. # -# PPD compiler example makefile for CUPS. +# Copyright 2007-2011 by Apple Inc. +# Copyright 2002-2005 by Easy Software Products. # -# Copyright 2007-2011 by Apple Inc. -# Copyright 2002-2005 by Easy Software Products. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # # @@ -121,8 +119,3 @@ uninstall: $(RM) $(DATADIR)/examples/$$file; \ done -$(RMDIR) $(DATADIR)/examples - - -# -# End of "$Id$". -# diff --git a/examples/ppdx.c b/examples/ppdx.c index 61588cad1..ec93d63ac 100644 --- a/examples/ppdx.c +++ b/examples/ppdx.c @@ -1,24 +1,17 @@ /* - * "$Id$" + * Example code for encoding and decoding large amounts of data in a PPD file. + * This would typically be used in a driver to save configuration/state + * information that could be used by an application. * - * Example code for encoding and decoding large amounts of data in a PPD file. - * This would typically be used in a driver to save configuration/state - * information that could be used by an application. + * Copyright 2012 by Apple Inc. * - * Copyright 2012 by Apple Inc. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * ppdxReadData() - Read encoded data from a ppd_file_t *. - * ppdxWriteData() - Writes encoded data to stderr using PPD: messages. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -307,8 +300,3 @@ ppdxWriteData(const char *name, /* I - Base name of keyword */ fputs(line, stderr); } - - -/* - * End of "$Id$". - */ diff --git a/examples/ppdx.h b/examples/ppdx.h index 1be6928da..c50308739 100644 --- a/examples/ppdx.h +++ b/examples/ppdx.h @@ -1,18 +1,15 @@ /* - * "$Id$" + * Header for PPD data encoding example code. * - * Header for PPD data encoding example code. + * Copyright 2012 by Apple Inc. * - * Copyright 2012 by Apple Inc. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _PPDX_H_ @@ -76,7 +73,3 @@ extern void ppdxWriteData(const char *name, const void *data, # endif /* __cplusplus */ #endif /* !_PPDX_H */ - -/* - * End of "$Id$". - */ diff --git a/examples/testppdx.c b/examples/testppdx.c index f1c168688..cbaaee29d 100644 --- a/examples/testppdx.c +++ b/examples/testppdx.c @@ -1,25 +1,19 @@ /* - * "$Id$" + * Test program for PPD data encoding example code. * - * Test program for PPD data encoding example code. + * Compile with: * - * Compile with: + * gcc -o testppdx -D_PPD_DEPRECATED="" -g testppdx.c ppdx.c -lcups -lz * - * gcc -o testppdx -D_PPD_DEPRECATED="" -g testppdx.c ppdx.c -lcups -lz + * Copyright 2012 by Apple Inc. * - * Copyright 2012 by Apple Inc. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * main() - Read data from a test PPD file and write out new chunks. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -110,8 +104,3 @@ main(void) return (1); } - - -/* - * End of "$Id$". - */ diff --git a/filter/Makefile b/filter/Makefile index ab22a5ddd..09fe5559a 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -1,18 +1,16 @@ # -# "$Id$" +# Filter makefile for CUPS. # -# Filter makefile for CUPS. +# Copyright 2007-2012 by Apple Inc. +# Copyright 1997-2006 by Easy Software Products. # -# Copyright 2007-2012 by Apple Inc. -# Copyright 1997-2006 by Easy Software Products. +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". -# -# This file is subject to the Apple OS-Developed Software exception. +# This file is subject to the Apple OS-Developed Software exception. # include ../Makedefs @@ -401,8 +399,3 @@ rasterbench: rasterbench.o libcupsimage.a # include Dependencies - - -# -# End of "$Id$". -# diff --git a/filter/api-raster.header b/filter/api-raster.header index 42c11d1ed..31b87b156 100644 --- a/filter/api-raster.header +++ b/filter/api-raster.header @@ -1,6 +1,4 @@ <!-- - "$Id$" - Raster API documentation for CUPS. Copyright 2008-2010 by Apple Inc. diff --git a/filter/api-raster.shtml b/filter/api-raster.shtml index cb137d525..7d6b8517b 100644 --- a/filter/api-raster.shtml +++ b/filter/api-raster.shtml @@ -1,6 +1,4 @@ <!-- - "$Id$" - Raster API introduction for CUPS. Copyright 2007-2013 by Apple Inc. diff --git a/filter/commandtops.c b/filter/commandtops.c index 3f7691565..65dcd3571 100644 --- a/filter/commandtops.c +++ b/filter/commandtops.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PostScript command filter for CUPS. * * Copyright 2008-2014 by Apple Inc. @@ -518,8 +516,3 @@ report_levels(ppd_file_t *ppd, /* I - PPD file */ end_ps(ppd); } - - -/* - * End of "$Id$". - */ diff --git a/filter/common.c b/filter/common.c index 3d45a2037..bed4a53af 100644 --- a/filter/common.c +++ b/filter/common.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Common filter routines for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -517,8 +515,3 @@ WriteTextComment(const char *name, /* I - Comment name ("Title", etc.) */ puts(")"); } - - -/* - * End of "$Id$". - */ diff --git a/filter/common.h b/filter/common.h index bbaf99eed..0dcb289f7 100644 --- a/filter/common.h +++ b/filter/common.h @@ -1,18 +1,16 @@ /* - * "$Id$" + * Common filter definitions for CUPS. * - * Common filter definitions for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -71,8 +69,3 @@ extern void WriteTextComment(const char *name, const char *value); #ifdef __cplusplus } #endif /* __cplusplus */ - - -/* - * End of "$Id$". - */ diff --git a/filter/error.c b/filter/error.c index 96be93d11..47cc539e2 100644 --- a/filter/error.c +++ b/filter/error.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Raster error handling for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -272,8 +270,3 @@ get_error_buffer(void) return (&buf); } #endif /* HAVE_PTHREAD_H */ - - -/* - * End of "$Id$". - */ diff --git a/filter/gziptoany.c b/filter/gziptoany.c index 9adc376fa..b3f5dffc2 100644 --- a/filter/gziptoany.c +++ b/filter/gziptoany.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * GZIP/raw pre-filter for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -109,8 +107,3 @@ main(int argc, /* I - Number of command-line arguments */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/filter/interpret.c b/filter/interpret.c index b38d4eae1..932d78df9 100644 --- a/filter/interpret.c +++ b/filter/interpret.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PPD command interpreter for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1725,8 +1723,3 @@ DEBUG_stack(const char *prefix, /* I - Prefix string */ DEBUG_object(prefix, obj); } #endif /* DEBUG */ - - -/* - * End of "$Id$". - */ diff --git a/filter/postscript-driver.header b/filter/postscript-driver.header index 08e4c175b..375c2291f 100644 --- a/filter/postscript-driver.header +++ b/filter/postscript-driver.header @@ -1,6 +1,4 @@ <!-- - "$Id$" - PostScript printer driver documentation for CUPS. Copyright 2007-2012 by Apple Inc. diff --git a/filter/ppd-compiler.header b/filter/ppd-compiler.header index 2caf3aecd..72487544d 100644 --- a/filter/ppd-compiler.header +++ b/filter/ppd-compiler.header @@ -1,6 +1,4 @@ <!-- - "$Id$" - PPD compiler documentation for CUPS. Copyright 2007-2012 by Apple Inc. diff --git a/filter/pstops.c b/filter/pstops.c index 379740e48..e9b443893 100644 --- a/filter/pstops.c +++ b/filter/pstops.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PostScript filter for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -3402,8 +3400,3 @@ write_options( doc_puts(doc, "userdict/setpagedevice{pop}bind put\n"); } } - - -/* - * End of "$Id$". - */ diff --git a/filter/raster-driver.header b/filter/raster-driver.header index b15c50d99..05aec3457 100644 --- a/filter/raster-driver.header +++ b/filter/raster-driver.header @@ -1,6 +1,4 @@ <!-- - "$Id$" - Raster printer driver documentation for CUPS. Copyright 2007-2012 by Apple Inc. diff --git a/filter/raster.c b/filter/raster.c index e41358270..4b83cc2b8 100644 --- a/filter/raster.c +++ b/filter/raster.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Raster file routines for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1799,8 +1797,3 @@ cups_write_fd(void *ctx, /* I - File descriptor pointer */ return (count); } - - -/* - * End of "$Id$". - */ diff --git a/filter/rasterbench.c b/filter/rasterbench.c index 96eb3255f..010fd9dd3 100644 --- a/filter/rasterbench.c +++ b/filter/rasterbench.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Raster benchmark program for CUPS. * * Copyright 2007-2016 by Apple Inc. @@ -342,8 +340,3 @@ write_test(int fd, /* I - File descriptor to write to */ cupsRasterClose(r); } - - -/* - * End of "$Id$". - */ diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c index a59e435e8..74dc61c58 100644 --- a/filter/rastertoepson.c +++ b/filter/rastertoepson.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * EPSON ESC/P and ESC/P2 filter for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1171,8 +1169,3 @@ main(int argc, /* I - Number of command-line arguments */ else return (0); } - - -/* - * End of "$Id$". - */ diff --git a/filter/rastertohp.c b/filter/rastertohp.c index 97866c4dd..2994b803e 100644 --- a/filter/rastertohp.c +++ b/filter/rastertohp.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Hewlett-Packard Page Control Language filter for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -844,8 +842,3 @@ main(int argc, /* I - Number of command-line arguments */ else return (0); } - - -/* - * End of "$Id$". - */ diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c index 7edef8f64..a082831a3 100644 --- a/filter/rastertolabel.c +++ b/filter/rastertolabel.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Label printer filter for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1278,8 +1276,3 @@ main(int argc, /* I - Number of command-line arguments */ else return (0); } - - -/* - * End of "$Id$". - */ diff --git a/filter/spec-ppd.header b/filter/spec-ppd.header index 40433aa55..e7e1ab72a 100644 --- a/filter/spec-ppd.header +++ b/filter/spec-ppd.header @@ -1,6 +1,4 @@ <!-- - "$Id$" - PPD extension documentation for CUPS. Copyright 2007-2011 by Apple Inc. diff --git a/filter/testraster.c b/filter/testraster.c index 1382f0b7f..9c3f76508 100644 --- a/filter/testraster.c +++ b/filter/testraster.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Raster test program routines for CUPS. * * Copyright 2007-2016 by Apple Inc. @@ -1064,8 +1062,3 @@ print_changes( header->cupsPageSizeName, expected->cupsPageSizeName); } - - -/* - * End of "$Id$". - */ diff --git a/install-sh b/install-sh index 41d944e3e..bcd89dacb 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,5 @@ #!/bin/sh # -# "$Id$" -# # Install a program, script, or datafile. # # Copyright 2008-2012 by Apple Inc. diff --git a/locale/Makefile b/locale/Makefile index 5de848b65..bdda03cb0 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -1,6 +1,4 @@ # -# "$Id$" -# # Locale file makefile for CUPS. # # Copyright 2007-2014 by Apple Inc. @@ -201,8 +199,3 @@ strings2po: strings2po.o # include Dependencies - - -# -# End of "$Id$". -# diff --git a/locale/checkpo.c b/locale/checkpo.c index 64563f679..513af92ae 100644 --- a/locale/checkpo.c +++ b/locale/checkpo.c @@ -1,17 +1,15 @@ /* - * "$Id$" + * Verify that translations in the .po file have the same number and type of + * printf-style format strings. * - * Verify that translations in the .po file have the same number and type of - * printf-style format strings. + * Copyright 2007-2012 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * * Usage: * @@ -20,13 +18,6 @@ * Compile with: * * gcc -o checkpo checkpo.c `cups-config --libs` - * - * Contents: - * - * main() - Validate .po files. - * abbreviate() - Abbreviate a message string as needed. - * collect_formats() - Collect all of the format strings in the msgid. - * free_formats() - Free all of the format strings. */ #include <cups/cups-private.h> @@ -406,8 +397,3 @@ free_formats(cups_array_t *fmts) /* I - Array of format strings */ cupsArrayDelete(fmts); } - - -/* - * End of "$Id$". - */ diff --git a/locale/cups.header b/locale/cups.header index 85dcb39b2..6bfad47a9 100644 --- a/locale/cups.header +++ b/locale/cups.header @@ -1,9 +1,7 @@ # -# "$Id$" -# # Message catalog template for CUPS. # -# Copyright 2007-2014 by Apple Inc. +# Copyright 2007-2016 by Apple Inc. # Copyright 2005-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the diff --git a/locale/po2strings.c b/locale/po2strings.c index 88f0ef801..51e64f422 100644 --- a/locale/po2strings.c +++ b/locale/po2strings.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Convert a GNU gettext .po file to an Apple .strings file. * * Copyright 2007-2015 by Apple Inc. @@ -361,8 +359,3 @@ normalize_string(const char *idstr, /* I - msgid string */ return (buffer); } - - -/* - * End of "$Id$". - */ diff --git a/locale/strings2po.c b/locale/strings2po.c index 7e714b4b1..6f912bb19 100644 --- a/locale/strings2po.c +++ b/locale/strings2po.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Convert Apple .strings file (UTF-16 BE text file) to GNU gettext .po files. * * Copyright 2007-2014 by Apple Inc. @@ -170,8 +168,3 @@ write_po(FILE *po, /* I - .po file */ { fprintf(po, "%s \"%s\"\n", what, s); } - - -/* - * End of "$Id$". - */ diff --git a/man/Makefile b/man/Makefile index c2a1923af..8e75e8977 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,6 +1,4 @@ # -# "$Id$" -# # Man page makefile for CUPS. # # Copyright 2007-2015 by Apple Inc. @@ -225,8 +223,3 @@ mantohtml: mantohtml.o ../cups/$(LIBCUPSSTATIC) $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ mantohtml.o \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) - - -# -# End of "$Id$". -# diff --git a/man/backend.man b/man/backend.man index 57d76cad4..a6c87c264 100644 --- a/man/backend.man +++ b/man/backend.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" Backend man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -200,6 +198,3 @@ for more information. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cancel.man b/man/cancel.man index 75fbf5eaf..42f5abefd 100644 --- a/man/cancel.man +++ b/man/cancel.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cancel man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -94,6 +92,3 @@ Administrators wishing to prevent unauthorized cancellation of jobs via the \fI\ CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/classes.conf.man b/man/classes.conf.man index 4987d16bf..33cf856e8 100644 --- a/man/classes.conf.man +++ b/man/classes.conf.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" classes.conf man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -31,6 +29,3 @@ The name, location, and format of this file are an implementation detail that wi CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/client.conf.man.in b/man/client.conf.man.in index 39a811b04..5b1d522cc 100644 --- a/man/client.conf.man.in +++ b/man/client.conf.man.in @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" client.conf man page for CUPS. .\" .\" Copyright 2007-2015 by Apple Inc. @@ -81,6 +79,3 @@ The \fBclient.conf\fR file is deprecated and will no longer be supported in a fu CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cups-config.man b/man/cups-config.man index 7831c480f..980987cac 100644 --- a/man/cups-config.man +++ b/man/cups-config.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cups-config man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -111,6 +109,3 @@ Compile a simple one-file CUPS filter: CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in index 30bd6bb6f..99ba5d4b8 100644 --- a/man/cups-files.conf.man.in +++ b/man/cups-files.conf.man.in @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cups-files.conf man page for CUPS. .\" .\" Copyright 2007-2015 by Apple Inc. @@ -224,6 +222,3 @@ The default is "lp". CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cups-lpd.man.in b/man/cups-lpd.man.in index fcd76e08f..d24fde54d 100644 --- a/man/cups-lpd.man.in +++ b/man/cups-lpd.man.in @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cups-lpd man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -121,6 +119,3 @@ CUPS Online Help (http://localhost:631/help), RFC 2569 .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cups-snmp.conf.man b/man/cups-snmp.conf.man index 335f6d5a9..e9b5ffdc5 100644 --- a/man/cups-snmp.conf.man +++ b/man/cups-snmp.conf.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" snmp.conf man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -64,6 +62,3 @@ The default is 120 seconds (2 minutes). CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cups-snmp.man.in b/man/cups-snmp.man.in index 5ab57251c..7e724ac92 100644 --- a/man/cups-snmp.man.in +++ b/man/cups-snmp.man.in @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" SNMP backend man page for CUPS. .\" .\" Copyright 2012-2014 by Apple Inc. @@ -56,6 +54,3 @@ The CUPS SNMP backend uses the information from the Host, Printer, and Port Moni CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cups.man b/man/cups.man index eefe754cc..855a965b7 100644 --- a/man/cups.man +++ b/man/cups.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cups (intro) man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -142,6 +140,3 @@ CUPS Web Site (http://www.CUPS.org), PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cupsaccept.man b/man/cupsaccept.man index 0be1e8607..9e2208e5f 100644 --- a/man/cupsaccept.man +++ b/man/cupsaccept.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" accept/reject man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -89,6 +87,3 @@ Finally, the CUPS versions may ask the user for an access password depending on CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cupsaddsmb.man.in b/man/cupsaddsmb.man.in index 28a9098ce..271474e34 100644 --- a/man/cupsaddsmb.man.in +++ b/man/cupsaddsmb.man.in @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cupsaddsmb man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -126,6 +124,3 @@ This is useful for debugging SAMBA configuration problems. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cupsctl.man b/man/cupsctl.man index 939546d3d..9d66aeb84 100644 --- a/man/cupsctl.man +++ b/man/cupsctl.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cupsctl man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -101,6 +99,3 @@ You cannot set the Listen or Port directives using \fBcupsctl\fR. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cupsd-helper.man b/man/cupsd-helper.man index 2148ec4b8..7047f79c7 100644 --- a/man/cupsd-helper.man +++ b/man/cupsd-helper.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cupsd-helper man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -89,6 +87,3 @@ Driver information files must conform to the format defined in CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cupsd-logs.man b/man/cupsd-logs.man index 63c6f1862..f67bf5312 100644 --- a/man/cupsd-logs.man +++ b/man/cupsd-logs.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cupsd-logs man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -236,6 +234,3 @@ The \fIsides\fR field contains a copy of the sides attribute provided with the I CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cupsd.man.in b/man/cupsd.man.in index 226fc5079..8db10ac4c 100644 --- a/man/cupsd.man.in +++ b/man/cupsd.man.in @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cupsd man page for CUPS. .\" .\" Copyright 2007-2016 by Apple Inc. @@ -129,6 +127,3 @@ in the foreground with a test configuration file called CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2016 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cupsenable.man b/man/cupsenable.man index 3f4458b36..d717d5725 100644 --- a/man/cupsenable.man +++ b/man/cupsenable.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cupsenable/cupsdisable man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -100,7 +98,3 @@ This differs from the System V versions which require the root user to execute t CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. - -.\" -.\" End of "$Id$". -.\" diff --git a/man/cupsfilter.man b/man/cupsfilter.man index e901ffa40..4294fe260 100644 --- a/man/cupsfilter.man +++ b/man/cupsfilter.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cupsfilter man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -138,6 +136,3 @@ The following command will generate a PDF preview of job 42 for a printer named CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cupstestdsc.man b/man/cupstestdsc.man index aed992fc5..f28629857 100644 --- a/man/cupstestdsc.man +++ b/man/cupstestdsc.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cupstestdsc man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -46,6 +44,3 @@ Adobe PostScript Language Document Structuring Conventions Specification, Version 3.0. .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/cupstestppd.man b/man/cupstestppd.man index f50c3d568..32858de67 100644 --- a/man/cupstestppd.man +++ b/man/cupstestppd.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" cupstestppd man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -146,6 +144,3 @@ CUPS Online Help (http://localhost:631/help), Adobe PostScript Printer Description File Format Specification, Version 4.3. .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/filter.man b/man/filter.man index a12058526..863dc972a 100644 --- a/man/filter.man +++ b/man/filter.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" filter man page for CUPS. .\" .\" Copyright 2007-2015 by Apple Inc. @@ -220,6 +218,3 @@ program to use the appropriate filters to do the conversions you need. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/ippfind.man b/man/ippfind.man index 1afd502b9..219c47db1 100644 --- a/man/ippfind.man +++ b/man/ippfind.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" ippfind man page for CUPS. .\" .\" Copyright 2013-2014 by Apple Inc. @@ -256,6 +254,3 @@ Similarly, to send a PostScript test page to every PostScript printer, run: .BR ipptool (1) .SH COPYRIGHT Copyright \[co] 2013-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/ipptool.man b/man/ipptool.man index 249d871e7..1d9c43c60 100644 --- a/man/ipptool.man +++ b/man/ipptool.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" ipptool man page for CUPS. .\" .\" Copyright 2010-2015 by Apple Inc. @@ -243,6 +241,3 @@ PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp) RFC 2911 (http://tools.ietf.org/html/rfc2911), .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/ipptoolfile.man b/man/ipptoolfile.man index 3210889b1..78282cfbd 100644 --- a/man/ipptoolfile.man +++ b/man/ipptoolfile.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" ipptoolfile man page for CUPS. .\" .\" Copyright 2010-2014 by Apple Inc. @@ -620,6 +618,3 @@ PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp), RFC 2911 (http://tools.ietf.org/html/rfc3911) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/lp.man b/man/lp.man index 449725871..4892b37cb 100644 --- a/man/lp.man +++ b/man/lp.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" lp man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -217,6 +215,3 @@ Print a presentation document 2-up to a printer called "foo": CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/lpc.man b/man/lpc.man index 8965d216b..49abb7efd 100644 --- a/man/lpc.man +++ b/man/lpc.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" lpc man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -59,6 +57,3 @@ command or another CUPS-compatible client with that functionality. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/lpinfo.man b/man/lpinfo.man index 664784a78..d77a8e0c3 100644 --- a/man/lpinfo.man +++ b/man/lpinfo.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" lpinfo man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -133,6 +131,3 @@ List drivers matching "HP LaserJet": CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/lpmove.man b/man/lpmove.man index c6d540262..ce6fb0eb2 100644 --- a/man/lpmove.man +++ b/man/lpmove.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" lpmove man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -77,6 +75,3 @@ Move all jobs from "oldprinter" to "newprinter": CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/lpoptions.man.in b/man/lpoptions.man.in index d93c8b51e..279453ca1 100644 --- a/man/lpoptions.man.in +++ b/man/lpoptions.man.in @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" lpoptions man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -136,6 +134,3 @@ The \fBlpoptions\fR command is unique to CUPS. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/lpq.man b/man/lpq.man index 6d21b95e6..14803f39f 100644 --- a/man/lpq.man +++ b/man/lpq.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" lpq man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -67,6 +65,3 @@ Requests a more verbose (long) reporting format. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/lpr.man b/man/lpr.man index b819b3d65..8faad49ef 100644 --- a/man/lpr.man +++ b/man/lpr.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" lpr man page for CUPS. .\" .\" Copyright 2007-2013 by Apple Inc. @@ -144,6 +142,3 @@ Print a presentation document 2-up to a printer called "foo": CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/lprm.man b/man/lprm.man index 1f46ea053..5451e61a1 100644 --- a/man/lprm.man +++ b/man/lprm.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" lprm man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -85,6 +83,3 @@ Cancel all jobs: CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/lpstat.man b/man/lpstat.man index 15e78736c..c6cf5cf88 100644 --- a/man/lpstat.man +++ b/man/lpstat.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" lpstat man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -147,6 +145,3 @@ The Solaris \fI\-f\fR, \fI\-P\fR, and \fI\-S\fR options are silently ignored. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/mailto.conf.man b/man/mailto.conf.man index 03c9a6523..396ab1dc0 100644 --- a/man/mailto.conf.man +++ b/man/mailto.conf.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" mailto.conf man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -47,6 +45,3 @@ Specifies a prefix string for the subject line of an email notification. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/mantohtml.c b/man/mantohtml.c index e9a581af5..195ae4320 100644 --- a/man/mantohtml.c +++ b/man/mantohtml.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Man page to HTML conversion program. * * Copyright 2007-2010, 2014 by Apple Inc. @@ -1219,8 +1217,3 @@ strmove(char *d, /* I - Destination */ *d = '\0'; } - - -/* - * End of "$Id$". - */ diff --git a/man/mime.convs.man b/man/mime.convs.man index 06d677a3f..7f5c07662 100644 --- a/man/mime.convs.man +++ b/man/mime.convs.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" mime.convs man page for CUPS. .\" .\" Copyright 2007-2015 by Apple Inc. @@ -61,6 +59,3 @@ Define a filter that converts PostScript documents to CUPS Raster format: CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/mime.types.man b/man/mime.types.man index 2af57c947..13275ccd6 100644 --- a/man/mime.types.man +++ b/man/mime.types.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" mime.types man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -111,6 +109,3 @@ Define two MIME media types for raster data, with one being a subset with higher CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/notifier.man b/man/notifier.man index 5c5d85290..7d1cb327f 100644 --- a/man/notifier.man +++ b/man/notifier.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" notifier man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -39,6 +37,3 @@ Notifiers inherit the environment and can use the logging mechanism documented i CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/ppdc.man b/man/ppdc.man index aa50cf584..a8166eb98 100644 --- a/man/ppdc.man +++ b/man/ppdc.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" ppdc man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -101,6 +99,3 @@ The default is to use the line feed character alone. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/ppdcfile.man b/man/ppdcfile.man index 9d5bc4a3b..e09e90629 100644 --- a/man/ppdcfile.man +++ b/man/ppdcfile.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" ppdcfile man page for CUPS. .\" .\" Copyright 2007-2016 by Apple Inc. @@ -160,6 +158,3 @@ Directives may be placed anywhere on a line and are followed by one or more valu CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/ppdhtml.man b/man/ppdhtml.man index 41311430d..12490be16 100644 --- a/man/ppdhtml.man +++ b/man/ppdhtml.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" ppdhtml man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -46,6 +44,3 @@ Multiple \fI-I\fR options can be supplied to add additional directories. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/ppdi.man b/man/ppdi.man index 57f5b16ca..327e99bc9 100644 --- a/man/ppdi.man +++ b/man/ppdi.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" ppdi man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -53,6 +51,3 @@ If no source file is specified, the filename \fIppdi.drv\fR is used. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/ppdmerge.man b/man/ppdmerge.man index 6051a9acb..b4cc90941 100644 --- a/man/ppdmerge.man +++ b/man/ppdmerge.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" ppdmerge man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -49,6 +47,3 @@ Merging of different device PPDs will yield unpredictable results. CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/ppdpo.man b/man/ppdpo.man index c0c38ff65..7b75d9d40 100644 --- a/man/ppdpo.man +++ b/man/ppdpo.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" ppdpo man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -53,6 +51,3 @@ The supported extensions are \fI.po\fR or \fI.po.gz\fR for GNU gettext format me CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/printers.conf.man b/man/printers.conf.man index d38843c95..5af2c331b 100644 --- a/man/printers.conf.man +++ b/man/printers.conf.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" printers.conf man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -31,6 +29,3 @@ The name, location, and format of this file are an implementation detail that wi CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/man/subscriptions.conf.man b/man/subscriptions.conf.man index b659f315d..0613e3c9d 100644 --- a/man/subscriptions.conf.man +++ b/man/subscriptions.conf.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" subscriptions.conf man page for CUPS. .\" .\" Copyright 2007-2014 by Apple Inc. @@ -31,6 +29,3 @@ The name, location, and format of this file are an implementation detail that wi CUPS Online Help (http://localhost:631/help) .SH COPYRIGHT Copyright \[co] 2007-2015 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/monitor/Makefile b/monitor/Makefile index 7ba7c4230..11c9ebaa4 100644 --- a/monitor/Makefile +++ b/monitor/Makefile @@ -1,18 +1,16 @@ # -# "$Id$" +# Port monitor makefile for CUPS. # -# Port monitor makefile for CUPS. +# Copyright 2007-2012 by Apple Inc. +# Copyright 2006 by Easy Software Products. # -# Copyright 2007-2012 by Apple Inc. -# Copyright 2006 by Easy Software Products. +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". -# -# This file is subject to the Apple OS-Developed Software exception. +# This file is subject to the Apple OS-Developed Software exception. # include ../Makedefs @@ -140,8 +138,3 @@ tbcp: tbcp.o ../cups/$(LIBCUPS) # include Dependencies - - -# -# End of "$Id$". -# diff --git a/monitor/bcp.c b/monitor/bcp.c index 885805243..0eef9a52d 100644 --- a/monitor/bcp.c +++ b/monitor/bcp.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * TBCP port monitor for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -278,8 +276,3 @@ pswrite(const char *buf, /* I - Buffer to write */ return ((ssize_t)bytes); } - - -/* - * End of "$Id$". - */ diff --git a/monitor/tbcp.c b/monitor/tbcp.c index e37635a70..be7a78847 100644 --- a/monitor/tbcp.c +++ b/monitor/tbcp.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * TBCP port monitor for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -268,8 +266,3 @@ pswrite(const char *buf, /* I - Buffer to write */ return ((ssize_t)bytes); } - - -/* - * End of "$Id$". - */ diff --git a/notifier/Makefile b/notifier/Makefile index e3d741351..dd3e5c860 100644 --- a/notifier/Makefile +++ b/notifier/Makefile @@ -1,16 +1,14 @@ # -# "$Id$" +# Notifier makefile for CUPS. # -# Notifier makefile for CUPS. +# Copyright 2007-2012 by Apple Inc. +# Copyright 1997-2007 by Easy Software Products, all rights reserved. # -# Copyright 2007-2012 by Apple Inc. -# Copyright 1997-2007 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs @@ -158,8 +156,3 @@ testnotify: testnotify.o ../cups/$(LIBCUPS) $(OBJS): ../Makedefs include Dependencies - - -# -# End of "$Id$". -# diff --git a/notifier/dbus.c b/notifier/dbus.c index 03a41681e..4eddf9758 100644 --- a/notifier/dbus.c +++ b/notifier/dbus.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * D-Bus notifier for CUPS. * * Copyright 2008-2014 by Apple Inc. @@ -651,8 +649,3 @@ main(void) return (1); } #endif /* HAVE_DBUS */ - - -/* - * End of "$Id$". - */ diff --git a/notifier/mailto.c b/notifier/mailto.c index 7b2f8a1a2..ce55f18b0 100644 --- a/notifier/mailto.c +++ b/notifier/mailto.c @@ -1,24 +1,14 @@ /* - * "$Id$" + * "mailto" notifier for CUPS. * - * "mailto" notifier for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * main() - Main entry for the mailto notifier. - * email_message() - Email a notification message. - * load_configuration() - Load the mailto.conf file. - * pipe_sendmail() - Open a pipe to sendmail... - * print_attributes() - Print the attributes in a request... + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -639,8 +629,3 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ ippTagString(attr->value_tag), buffer); } } - - -/* - * End of "$Id$". - */ diff --git a/notifier/rss.c b/notifier/rss.c index 3f6ca111e..be765d68e 100644 --- a/notifier/rss.c +++ b/notifier/rss.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * RSS notifier for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -732,8 +730,3 @@ xml_escape(const char *s) /* I - String to escape */ return (e); } - - -/* - * End of "$Id$". - */ diff --git a/notifier/testnotify.c b/notifier/testnotify.c index a7b8df4a7..cd01617ce 100644 --- a/notifier/testnotify.c +++ b/notifier/testnotify.c @@ -1,21 +1,14 @@ /* - * "$Id$" + * Test notifier for CUPS. * - * Test notifier for CUPS. + * Copyright 2007-2016 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products. * - * Copyright 2007-2016 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * main() - Main entry for the test notifier. - * print_attributes() - Print the attributes in a request... + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -120,8 +113,3 @@ print_attributes(ipp_t *ipp, /* I - IPP request */ ippTagString(attr->value_tag), buffer); } } - - -/* - * End of "$Id$". - */ diff --git a/ppdc/Makefile b/ppdc/Makefile index 68bf6b2a4..f693fc4ec 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile @@ -1,6 +1,4 @@ # -# "$Id$" -# # Makefile for the CUPS PPD Compiler. # # Copyright 2007-2015 by Apple Inc. @@ -385,8 +383,3 @@ libcupsppdc.a: $(LIBOBJS) # include Dependencies - - -# -# End of "$Id$". -# diff --git a/ppdc/api-ppdc.header b/ppdc/api-ppdc.header index 418686560..e237c44b3 100644 --- a/ppdc/api-ppdc.header +++ b/ppdc/api-ppdc.header @@ -1,6 +1,4 @@ <!-- - "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $" - PPD Compiler API header for CUPS. Copyright 2009 by Apple Inc. diff --git a/ppdc/api-ppdc.shtml b/ppdc/api-ppdc.shtml index e305dcb9d..769731b5a 100644 --- a/ppdc/api-ppdc.shtml +++ b/ppdc/api-ppdc.shtml @@ -1,6 +1,4 @@ <!-- - "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" - PPD Compiler API introduction for CUPS. Copyright 2009 by Apple Inc. diff --git a/ppdc/genstrings.cxx b/ppdc/genstrings.cxx index 8d0061ba0..709b083c1 100644 --- a/ppdc/genstrings.cxx +++ b/ppdc/genstrings.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // GNU gettext message generator for the CUPS PPD Compiler. // // This program is used to generate a dummy source file containing all of @@ -201,8 +199,3 @@ write_cstring(const char *s) /* I - String to write */ } puts("\");"); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-array.cxx b/ppdc/ppdc-array.cxx index 688f56c46..d56b92a33 100644 --- a/ppdc/ppdc-array.cxx +++ b/ppdc/ppdc-array.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // Array class for the CUPS PPD Compiler. // // Copyright 2007-2014 by Apple Inc. @@ -152,8 +150,3 @@ ppdcArray::remove(ppdcShared *d) // I - Data element if (i < count) memmove(data + i, data + i + 1, (size_t)(count - i) * sizeof(ppdcShared *)); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-attr.cxx b/ppdc/ppdc-attr.cxx index 1ea0337a9..996e986ab 100644 --- a/ppdc/ppdc-attr.cxx +++ b/ppdc/ppdc-attr.cxx @@ -1,21 +1,14 @@ // -// "$Id$" +// Attribute class for the CUPS PPD Compiler. // -// Attribute class for the CUPS PPD Compiler. +// Copyright 2007-2009 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2009 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcAttr::ppdcAttr() - Create an attribute. -// ppdcAttr::~ppdcAttr() - Destroy an attribute. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -59,8 +52,3 @@ ppdcAttr::~ppdcAttr() text->release(); value->release(); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-catalog.cxx b/ppdc/ppdc-catalog.cxx index 567163731..854b58de0 100644 --- a/ppdc/ppdc-catalog.cxx +++ b/ppdc/ppdc-catalog.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // Shared message catalog class for the CUPS PPD Compiler. // // Copyright 2007-2014 by Apple Inc. @@ -959,8 +957,3 @@ put_utf16(cups_file_t *fp, // I - File to write to return (-1); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-choice.cxx b/ppdc/ppdc-choice.cxx index 2c12de2b9..80448cc9e 100644 --- a/ppdc/ppdc-choice.cxx +++ b/ppdc/ppdc-choice.cxx @@ -1,21 +1,14 @@ // -// "$Id$" +// Option choice class for the CUPS PPD Compiler. // -// Option choice class for the CUPS PPD Compiler. +// Copyright 2007-2009 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2009 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcChoice::ppdcChoice() - Create a new option choice. -// ppdcChoice::~ppdcChoice() - Destroy an option choice. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -54,8 +47,3 @@ ppdcChoice::~ppdcChoice() text->release(); code->release(); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-constraint.cxx b/ppdc/ppdc-constraint.cxx index 6e6f0241e..57fbe8428 100644 --- a/ppdc/ppdc-constraint.cxx +++ b/ppdc/ppdc-constraint.cxx @@ -1,21 +1,14 @@ // -// "$Id$" +// Contraint class for the CUPS PPD Compiler. // -// Contraint class for the CUPS PPD Compiler. +// Copyright 2007-2009 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2009 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcConstraint::ppdcConstraint() - Create a constraint. -// ppdcConstraint::~ppdcConstraint() - Destroy a constraint. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -57,8 +50,3 @@ ppdcConstraint::~ppdcConstraint() option2->release(); choice2->release(); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-driver.cxx b/ppdc/ppdc-driver.cxx index f70da0096..6d1596343 100644 --- a/ppdc/ppdc-driver.cxx +++ b/ppdc/ppdc-driver.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // PPD file compiler definitions for the CUPS PPD Compiler. // // Copyright 2007-2014 by Apple Inc. @@ -1323,8 +1321,3 @@ ppdcDriver::write_ppd_file( return (0); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-file.cxx b/ppdc/ppdc-file.cxx index 1f1d9a84e..4bbe86dd3 100644 --- a/ppdc/ppdc-file.cxx +++ b/ppdc/ppdc-file.cxx @@ -1,23 +1,14 @@ // -// "$Id$" +// File class for the CUPS PPD Compiler. // -// File class for the CUPS PPD Compiler. +// Copyright 2007-2010 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2010 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcFile::ppdcFile() - Create (open) a file. -// ppdcFile::~ppdcFile() - Delete (close) a file. -// ppdcFile::get() - Get a character from a file. -// ppdcFile::peek() - Look at the next character from a file. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -103,8 +94,3 @@ ppdcFile::peek() // Otherwise return the next character without advancing... return (cupsFilePeekChar(fp)); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-filter.cxx b/ppdc/ppdc-filter.cxx index 33994849b..ff3e8bc11 100644 --- a/ppdc/ppdc-filter.cxx +++ b/ppdc/ppdc-filter.cxx @@ -1,21 +1,14 @@ // -// "$Id$" +// Filter class for the CUPS PPD Compiler. // -// Filter class for the CUPS PPD Compiler. +// Copyright 2007-2009 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2009 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcFilter::ppdcFilter() - Create a filter. -// ppdcFilter::~ppdcFilter() - Destroy a filter. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -53,8 +46,3 @@ ppdcFilter::~ppdcFilter() mime_type->release(); program->release(); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-font.cxx b/ppdc/ppdc-font.cxx index b6d9bcb2a..39e2552d5 100644 --- a/ppdc/ppdc-font.cxx +++ b/ppdc/ppdc-font.cxx @@ -1,21 +1,14 @@ // -// "$Id$" +// Shared font class for the CUPS PPD Compiler. // -// Shared font class for the CUPS PPD Compiler. +// Copyright 2007-2009 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2009 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcFont::ppdcFont() - Create a shared font. -// ppdcFont::~ppdcFont() - Destroy a shared font. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -59,8 +52,3 @@ ppdcFont::~ppdcFont() version->release(); charset->release(); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-group.cxx b/ppdc/ppdc-group.cxx index cc0ab280a..af9000a92 100644 --- a/ppdc/ppdc-group.cxx +++ b/ppdc/ppdc-group.cxx @@ -1,22 +1,14 @@ // -// "$Id$" +// Group class for the CUPS PPD Compiler. // -// Group class for the CUPS PPD Compiler. +// Copyright 2007-2011 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2011 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcGroup::ppdcGroup() - Copy a new group. -// ppdcGroup::~ppdcGroup() - Destroy a group. -// ppdcGroup::find_option() - Find an option in a group. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -96,8 +88,3 @@ ppdcGroup::find_option(const char *n) // I - Name of option return (0); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-import.cxx b/ppdc/ppdc-import.cxx index 4794e7715..2b36c6bd7 100644 --- a/ppdc/ppdc-import.cxx +++ b/ppdc/ppdc-import.cxx @@ -1,21 +1,14 @@ // -// "$Id$" +// PPD file import methods for the CUPS PPD Compiler. // -// PPD file import methods for the CUPS PPD Compiler. +// Copyright 2007-2011 by Apple Inc. +// Copyright 2002-2006 by Easy Software Products. // -// Copyright 2007-2011 by Apple Inc. -// Copyright 2002-2006 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcSource::import_ppd() - Import a PPD file. -// ppd_gets() - Get a line from a PPD file. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -336,8 +329,3 @@ ppdcSource::import_ppd(const char *f) // I - Filename return (1); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-mediasize.cxx b/ppdc/ppdc-mediasize.cxx index 844028a39..bc0720265 100644 --- a/ppdc/ppdc-mediasize.cxx +++ b/ppdc/ppdc-mediasize.cxx @@ -1,21 +1,14 @@ // -// "$Id$" +// Shared media size class for the CUPS PPD Compiler. // -// Shared media size class for the CUPS PPD Compiler. +// Copyright 2007-2009 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2009 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcMediaSize::ppdcMediaSize() - Create a new media size. -// ppdcMediaSize::~ppdcMediaSize() - Destroy a media size. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -78,8 +71,3 @@ ppdcMediaSize::~ppdcMediaSize() size_code->release(); region_code->release(); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-message.cxx b/ppdc/ppdc-message.cxx index 11e5e3eaa..1e85d505d 100644 --- a/ppdc/ppdc-message.cxx +++ b/ppdc/ppdc-message.cxx @@ -1,21 +1,14 @@ // -// "$Id$" +// Shared message class for the CUPS PPD Compiler. // -// Shared message class for the CUPS PPD Compiler. +// Copyright 2007-2009 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2009 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcMessage::ppdcMessage() - Create a shared message. -// ppdcMessage::~ppdcMessage() - Destroy a shared message. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -51,8 +44,3 @@ ppdcMessage::~ppdcMessage() id->release(); string->release(); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-option.cxx b/ppdc/ppdc-option.cxx index e80df3c87..8f4d3c0ed 100644 --- a/ppdc/ppdc-option.cxx +++ b/ppdc/ppdc-option.cxx @@ -1,23 +1,14 @@ // -// "$Id$" +// Option class for the CUPS PPD Compiler. // -// Option class for the CUPS PPD Compiler. +// Copyright 2007-2011 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2011 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcOption::ppdcOption() - Copy a new option. -// ppdcOption::~ppdcOption() - Destroy an option. -// ppdcOption::find_choice() - Find an option choice. -// ppdcOption::set_defchoice() - Set the default choice. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -122,8 +113,3 @@ ppdcOption::set_defchoice(ppdcChoice *c) // I - Choice defchoice = c->name; } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-private.h b/ppdc/ppdc-private.h index 2bf5a24e7..92743ae6b 100644 --- a/ppdc/ppdc-private.h +++ b/ppdc/ppdc-private.h @@ -1,15 +1,13 @@ // -// "$Id$" +// Private definitions for the CUPS PPD Compiler. // -// Private definitions for the CUPS PPD Compiler. +// Copyright 2009-2010 by Apple Inc. // -// Copyright 2009-2010 by Apple Inc. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // #ifndef _PPDC_PRIVATE_H_ @@ -34,7 +32,3 @@ #endif // !_PPDC_PRIVATE_H_ - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-profile.cxx b/ppdc/ppdc-profile.cxx index 90625f423..976caefc2 100644 --- a/ppdc/ppdc-profile.cxx +++ b/ppdc/ppdc-profile.cxx @@ -1,21 +1,14 @@ // -// "$Id$" +// Color profile class for the CUPS PPD Compiler. // -// Color profile class for the CUPS PPD Compiler. +// Copyright 2007-2009 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2009 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcProfile::ppdcProfile() - Create a color profile. -// ppdcProfile::~ppdcProfile() - Destroy a color profile. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -58,8 +51,3 @@ ppdcProfile::~ppdcProfile() resolution->release(); media_type->release(); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-shared.cxx b/ppdc/ppdc-shared.cxx index 0c99c0859..934aeaa1b 100644 --- a/ppdc/ppdc-shared.cxx +++ b/ppdc/ppdc-shared.cxx @@ -1,23 +1,14 @@ // -// "$Id$" +// Shared data class for the CUPS PPD Compiler. // -// Shared data class for the CUPS PPD Compiler. +// Copyright 2007-2009 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2009 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcShared::ppdcShared() - Create shared data. -// ppdcShared::~ppdcShared() - Destroy shared data. -// ppdcShared::release() - Decrement the use count and delete as needed. -// ppdcShared::retain() - Increment the use count for this data. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -81,8 +72,3 @@ ppdcShared::retain() DEBUG_printf(("%s: %p retain use=%d", class_name(), this, use)); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx index 988e9dd22..27f5c342d 100644 --- a/ppdc/ppdc-source.cxx +++ b/ppdc/ppdc-source.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // Source class for the CUPS PPD Compiler. // // Copyright 2007-2014 by Apple Inc. @@ -3800,8 +3798,3 @@ ppdcSource::write_file(const char *f) // I - File to write return (0); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-string.cxx b/ppdc/ppdc-string.cxx index 706bd138c..156ea27cd 100644 --- a/ppdc/ppdc-string.cxx +++ b/ppdc/ppdc-string.cxx @@ -1,21 +1,14 @@ // -// "$Id$" +// Shared string class for the CUPS PPD Compiler. // -// Shared string class for the CUPS PPD Compiler. +// Copyright 2007-2012 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2012 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcString::ppdcString() - Create a shared string. -// ppdcString::~ppdcString() - Destroy a shared string. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -57,8 +50,3 @@ ppdcString::~ppdcString() if (value) delete[] value; } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc-variable.cxx b/ppdc/ppdc-variable.cxx index 22a175ad4..0208a6326 100644 --- a/ppdc/ppdc-variable.cxx +++ b/ppdc/ppdc-variable.cxx @@ -1,22 +1,14 @@ // -// "$Id$" +// Variable class for the CUPS PPD Compiler. // -// Variable class for the CUPS PPD Compiler. +// Copyright 2007-2009 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2009 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// ppdcVariable::ppdcVariable() - Create a variable. -// ppdcVariable::~ppdcVariable() - Destroy a variable. -// ppdcVariable::set_value() - Set the value of a variable. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -64,8 +56,3 @@ ppdcVariable::set_value(const char *v) value->release(); value = new ppdcString(v); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc.cxx b/ppdc/ppdc.cxx index 67d3b6690..bd73c0ee5 100644 --- a/ppdc/ppdc.cxx +++ b/ppdc/ppdc.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // PPD file compiler main entry for the CUPS PPD Compiler. // // Copyright 2007-2014 by Apple Inc. @@ -456,8 +454,3 @@ usage(void) exit(1); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdc.h b/ppdc/ppdc.h index c940e00a0..b36ebbe82 100644 --- a/ppdc/ppdc.h +++ b/ppdc/ppdc.h @@ -1,16 +1,14 @@ // -// "$Id$" +// Definitions for the CUPS PPD Compiler. // -// Definitions for the CUPS PPD Compiler. +// Copyright 2007-2009 by Apple Inc. +// Copyright 2002-2007 by Easy Software Products. // -// Copyright 2007-2009 by Apple Inc. -// Copyright 2002-2007 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // #ifndef _PPDC_H_ @@ -527,7 +525,3 @@ class ppdcSource //// Source File #endif // !_PPDC_H_ - -// -// End of "$Id$". -// diff --git a/ppdc/ppdhtml.cxx b/ppdc/ppdhtml.cxx index 881187636..416ff2dbf 100644 --- a/ppdc/ppdhtml.cxx +++ b/ppdc/ppdhtml.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // PPD to HTML utility for the CUPS PPD Compiler. // // Copyright 2007-2015 by Apple Inc. @@ -184,8 +182,3 @@ usage(void) exit(1); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdi.cxx b/ppdc/ppdi.cxx index a411bfef5..834034006 100644 --- a/ppdc/ppdi.cxx +++ b/ppdc/ppdi.cxx @@ -1,21 +1,14 @@ // -// "$Id$" +// PPD file import utility for the CUPS PPD Compiler. // -// PPD file import utility for the CUPS PPD Compiler. +// Copyright 2007-2011 by Apple Inc. +// Copyright 2002-2005 by Easy Software Products. // -// Copyright 2007-2011 by Apple Inc. -// Copyright 2002-2005 by Easy Software Products. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// main() - Main entry for the PPD import utility. -// usage() - Show usage and exit. +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -135,8 +128,3 @@ usage(void) exit(1); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdmerge.cxx b/ppdc/ppdmerge.cxx index 8c4863e11..397f1c3ba 100644 --- a/ppdc/ppdmerge.cxx +++ b/ppdc/ppdmerge.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // PPD file merge utility for the CUPS PPD Compiler. // // Copyright 2007-2014 by Apple Inc. @@ -366,8 +364,3 @@ usage(void) exit(1); } - - -// -// End of "$Id$". -// diff --git a/ppdc/ppdpo.cxx b/ppdc/ppdpo.cxx index 132d4593e..5ebfeaf99 100644 --- a/ppdc/ppdpo.cxx +++ b/ppdc/ppdpo.cxx @@ -1,6 +1,4 @@ // -// "$Id$" -// // PPD file message catalog program for the CUPS PPD Compiler. // // Copyright 2007-2015 by Apple Inc. @@ -255,8 +253,3 @@ usage(void) exit(1); } - - -// -// End of "$Id$". -// diff --git a/ppdc/testcatalog.cxx b/ppdc/testcatalog.cxx index a9e2e8655..bf046dd3d 100644 --- a/ppdc/testcatalog.cxx +++ b/ppdc/testcatalog.cxx @@ -1,19 +1,13 @@ // -// "$Id$" +// Test program for message catalog class. // -// Test program for message catalog class. +// Copyright 2008 by Apple Inc. // -// Copyright 2008 by Apple Inc. -// -// These coded instructions, statements, and computer programs are the -// property of Apple Inc. and are protected by Federal copyright -// law. Distribution and use rights are outlined in the file "LICENSE.txt" -// which should have been included with this file. If this file is -// file is missing or damaged, see the license at "http://www.cups.org/". -// -// Contents: -// -// main() - Open a message catalog +// These coded instructions, statements, and computer programs are the +// property of Apple Inc. and are protected by Federal copyright +// law. Distribution and use rights are outlined in the file "LICENSE.txt" +// which should have been included with this file. If this file is +// file is missing or damaged, see the license at "http://www.cups.org/". // // @@ -24,7 +18,7 @@ // -// 'main()' - Open a message catalog +// 'main()' - Open a message catalog // int // O - Exit status @@ -56,8 +50,3 @@ main(int argc, // I - Number of command-line arguments // Return with no errors. return (0); } - - -// -// End of "$Id$". -// diff --git a/scheduler/Makefile b/scheduler/Makefile index 14c8f1ab9..3f707ae08 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -1,6 +1,4 @@ # -# "$Id$" -# # Scheduler Makefile for CUPS. # # Copyright 2007-2015 by Apple Inc. @@ -549,8 +547,3 @@ sloc: # include Dependencies - - -# -# End of "$Id$". -# diff --git a/scheduler/api-mime.header b/scheduler/api-mime.header index 8d5db2ad6..2cde64646 100644 --- a/scheduler/api-mime.header +++ b/scheduler/api-mime.header @@ -1,6 +1,4 @@ <!-- - "$Id: api-array.header 8087 2008-10-27 21:37:05Z mike $" - MIME API header for CUPS. Copyright 2009 by Apple Inc. diff --git a/scheduler/api-mime.shtml b/scheduler/api-mime.shtml index 7d3125fad..db0d493b4 100644 --- a/scheduler/api-mime.shtml +++ b/scheduler/api-mime.shtml @@ -1,6 +1,4 @@ <!-- - "$Id: api-array.shtml 7616 2008-05-28 00:34:13Z mike $" - MIME API introduction for CUPS. Copyright 2009 by Apple Inc. diff --git a/scheduler/auth.c b/scheduler/auth.c index 171dccb05..4a0ece175 100644 --- a/scheduler/auth.c +++ b/scheduler/auth.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Authorization routines for the CUPS scheduler. * * Copyright 2007-2015 by Apple Inc. @@ -2208,8 +2206,3 @@ to64(char *s, /* O - Output string */ *s++ = itoa64[v & 0x3f]; } #endif /* HAVE_LIBPAM */ - - -/* - * End of "$Id$". - */ diff --git a/scheduler/auth.h b/scheduler/auth.h index fe11d4655..f82253b90 100644 --- a/scheduler/auth.h +++ b/scheduler/auth.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Authorization definitions for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -140,8 +138,3 @@ extern cupsd_location_t *cupsdFindLocation(const char *location); extern void cupsdFreeLocation(cupsd_location_t *loc); extern http_status_t cupsdIsAuthorized(cupsd_client_t *con, const char *owner); extern cupsd_location_t *cupsdNewLocation(const char *location); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/banners.c b/scheduler/banners.c index 77ae797ae..33ed9dc8b 100644 --- a/scheduler/banners.c +++ b/scheduler/banners.c @@ -1,24 +1,14 @@ /* - * "$Id$" + * Banner routines for the CUPS scheduler. * - * Banner routines for the CUPS scheduler. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * cupsdFindBanner() - Find a named banner. - * cupsdLoadBanners() - Load all available banner files... - * add_banner() - Add a banner to the array. - * compare_banners() - Compare two banners. - * free_banners() - Free all banners. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -217,8 +207,3 @@ free_banners(void) cupsArrayDelete(Banners); Banners = NULL; } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/banners.h b/scheduler/banners.h index fb933aaae..9ae0fdaf9 100644 --- a/scheduler/banners.h +++ b/scheduler/banners.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Banner definitions for the CUPS scheduler. * - * Banner definitions for the CUPS scheduler. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -38,8 +36,3 @@ VAR cups_array_t *Banners VALUE(NULL); extern cupsd_banner_t *cupsdFindBanner(const char *name); extern void cupsdLoadBanners(const char *d); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/cert.c b/scheduler/cert.c index 892a5fde1..17f5bd5dc 100644 --- a/scheduler/cert.c +++ b/scheduler/cert.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Authentication certificate routines for the CUPS scheduler. * * Copyright 2007-2015 by Apple Inc. @@ -448,8 +446,3 @@ ctcompare(const char *a, /* I - First string */ return (result); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/cert.h b/scheduler/cert.h index f2dc637bf..a4e452995 100644 --- a/scheduler/cert.h +++ b/scheduler/cert.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Authentication certificate definitions for the CUPS scheduler. * - * Authentication certificate definitions for the CUPS scheduler. + * Copyright 2007-2012 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -46,8 +44,3 @@ extern void cupsdDeleteCert(int pid); extern void cupsdDeleteAllCerts(void); extern cupsd_cert_t *cupsdFindCert(const char *certificate); extern void cupsdInitCerts(void); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/classes.c b/scheduler/classes.c index 12d6ae2eb..e3dc17b39 100644 --- a/scheduler/classes.c +++ b/scheduler/classes.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Printer class routines for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -803,8 +801,3 @@ cupsdSaveAllClasses(void) cupsdCloseCreatedConfFile(fp, filename); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/classes.h b/scheduler/classes.h index b24b7de11..33f1e5552 100644 --- a/scheduler/classes.h +++ b/scheduler/classes.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Printer class definitions for the CUPS scheduler. * - * Printer class definitions for the CUPS scheduler. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products, all rights reserved. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ @@ -28,8 +26,3 @@ extern cupsd_printer_t *cupsdFindAvailablePrinter(const char *name); extern cupsd_printer_t *cupsdFindClass(const char *name); extern void cupsdLoadAllClasses(void); extern void cupsdSaveAllClasses(void); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/client.c b/scheduler/client.c index d5611147c..02e5fafb8 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Client routines for the CUPS scheduler. * * Copyright 2007-2015 by Apple Inc. @@ -4079,8 +4077,3 @@ write_pipe(cupsd_client_t *con) /* I - Client connection */ cupsdLogClient(con, CUPSD_LOG_DEBUG, "CGI data ready to be sent."); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/client.h b/scheduler/client.h index afe8d3ac3..a7811fa78 100644 --- a/scheduler/client.h +++ b/scheduler/client.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Client definitions for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -145,8 +143,3 @@ extern void cupsdWriteClient(cupsd_client_t *con); extern int cupsdEndTLS(cupsd_client_t *con); extern int cupsdStartTLS(cupsd_client_t *con); #endif /* HAVE_SSL */ - - -/* - * End of "$Id$". - */ diff --git a/scheduler/colorman.c b/scheduler/colorman.c index 8926212c4..0f1fea0bb 100644 --- a/scheduler/colorman.c +++ b/scheduler/colorman.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Color management routines for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -1516,8 +1514,3 @@ colord_unregister_printer( colord_delete_device(device_id); } #endif /* __APPLE__ */ - - -/* - * End of "$Id$". - */ diff --git a/scheduler/colorman.h b/scheduler/colorman.h index e912a92a3..6d1ef1a6a 100644 --- a/scheduler/colorman.h +++ b/scheduler/colorman.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Color management definitions for the CUPS scheduler. * - * Color management definitions for the CUPS scheduler. + * Copyright 2007-2012 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -21,8 +19,3 @@ extern void cupsdRegisterColor(cupsd_printer_t *p); extern void cupsdStartColor(void); extern void cupsdStopColor(void); extern void cupsdUnregisterColor(cupsd_printer_t *p); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/conf.c b/scheduler/conf.c index c91335143..5f97fa3b8 100644 --- a/scheduler/conf.c +++ b/scheduler/conf.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Configuration routines for the CUPS scheduler. * * Copyright 2007-2015 by Apple Inc. @@ -4244,8 +4242,3 @@ set_policy_defaults(cupsd_policy_t *pol)/* I - Policy */ cupsdAddString(&(pol->sub_attrs), "notify-user-data"); } } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/conf.h b/scheduler/conf.h index 55ab2bdc9..076d63db0 100644 --- a/scheduler/conf.h +++ b/scheduler/conf.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Configuration file definitions for the CUPS scheduler. * * Copyright 2007-2015 by Apple Inc. @@ -297,8 +295,3 @@ extern int cupsdLogPage(cupsd_job_t *job, const char *page); extern int cupsdLogRequest(cupsd_client_t *con, http_status_t code); extern int cupsdReadConfiguration(void); extern int cupsdWriteErrorLog(int level, const char *message); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/cups-deviced.c b/scheduler/cups-deviced.c index 73e93da0b..94e69b4bf 100644 --- a/scheduler/cups-deviced.c +++ b/scheduler/cups-deviced.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Device scanning mini-daemon for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -790,8 +788,3 @@ start_backend(const char *name, /* I - Backend to run */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/cups-driverd.cxx b/scheduler/cups-driverd.cxx index 46ed9cffd..6e14a3ec6 100644 --- a/scheduler/cups-driverd.cxx +++ b/scheduler/cups-driverd.cxx @@ -1,6 +1,4 @@ /* - * "$Id$" - * * PPD/driver support for CUPS. * * This program handles listing and installing static PPD files, PPD files @@ -2928,8 +2926,3 @@ regex_string(const char *s) /* I - String to compare */ return (NULL); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/cups-exec.c b/scheduler/cups-exec.c index c77445056..ee87edbaf 100644 --- a/scheduler/cups-exec.c +++ b/scheduler/cups-exec.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Sandbox helper for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -199,8 +197,3 @@ usage(void) fputs("Usage: cups-exec [-g gid] [-n nice-value] [-u uid] /path/to/profile /path/to/program argv0 argv1 ... argvN\n", stderr); exit(1); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/cups.sh.in b/scheduler/cups.sh.in index 4099196e6..aed39c76c 100644 --- a/scheduler/cups.sh.in +++ b/scheduler/cups.sh.in @@ -1,7 +1,5 @@ #!/bin/sh # -# "$Id$" -# # Startup/shutdown script for CUPS. # # Copyright 2007-2013 by Apple Inc. @@ -197,8 +195,3 @@ esac # exit 0 - - -# -# End of "$Id$". -# diff --git a/scheduler/cups.xml.in b/scheduler/cups.xml.in index 211c086b7..f797960da 100644 --- a/scheduler/cups.xml.in +++ b/scheduler/cups.xml.in @@ -1,8 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- - $Id$ - Service manifest for CUPS. This service manifest introduces smf(5) services for CUPS. The services diff --git a/scheduler/cupsd.h b/scheduler/cupsd.h index 2d8247f69..a36ae88d1 100644 --- a/scheduler/cupsd.h +++ b/scheduler/cupsd.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Main header file for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -226,8 +224,3 @@ extern void cupsdStopSelect(void); /* server.c */ extern void cupsdStartServer(void); extern void cupsdStopServer(void); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/cupsfilter.c b/scheduler/cupsfilter.c index 66ba874a9..6dc7e3433 100644 --- a/scheduler/cupsfilter.c +++ b/scheduler/cupsfilter.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Filtering program for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -1498,8 +1496,3 @@ usage(const char *opt) /* I - Incorrect option, if any */ exit(1); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c index 71a002cd1..2e8303ec6 100644 --- a/scheduler/dirsvc.c +++ b/scheduler/dirsvc.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Directory services routines for the CUPS scheduler. * * Copyright 2007-2015 by Apple Inc. @@ -1820,8 +1818,3 @@ update_smb(int onoff) /* I - 1 = turn on, 0 = turn off */ else cupsdLogMessage(CUPSD_LOG_INFO, "Unknown SMBConfigFile scheme!"); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/dirsvc.h b/scheduler/dirsvc.h index 22f3f9c28..dfc858497 100644 --- a/scheduler/dirsvc.h +++ b/scheduler/dirsvc.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Directory services definitions for the CUPS scheduler. * - * Directory services definitions for the CUPS scheduler. + * Copyright 2007-2012 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -77,8 +75,3 @@ extern void cupsdStopBrowsing(void); #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) extern void cupsdUpdateDNSSDName(void); #endif /* HAVE_DNSSD || HAVE_AVAHI */ - - -/* - * End of "$Id$". - */ diff --git a/scheduler/env.c b/scheduler/env.c index d5c154fcd..0645b1380 100644 --- a/scheduler/env.c +++ b/scheduler/env.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Environment management routines for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -262,8 +260,3 @@ find_env(const char *name) /* I - Variable name */ return (-1); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/file.c b/scheduler/file.c index 210243641..f9a19c38f 100644 --- a/scheduler/file.c +++ b/scheduler/file.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * File functions for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -444,8 +442,3 @@ overwrite_data(int fd, /* I - File descriptor */ return (fsync(fd)); } #endif /* HAVE_REMOVEFILE */ - - -/* - * End of "$Id$". - */ diff --git a/scheduler/filter.c b/scheduler/filter.c index d1446f654..9a703abc9 100644 --- a/scheduler/filter.c +++ b/scheduler/filter.c @@ -1,29 +1,14 @@ /* - * "$Id$" + * File type conversion routines for CUPS. * - * File type conversion routines for CUPS. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * mimeAddFilter() - Add a filter to the current MIME database. - * mimeFilter() - Find the fastest way to convert from one type to - * another. - * mimeFilter2() - Find the fastest way to convert from one type to - * another, including the file size. - * mimeFilterLookup() - Lookup a filter. - * mime_compare_filters() - Compare two filters. - * mime_compare_srcs() - Compare two filter source types. - * mime_find_filters() - Find the filters to convert from one type to - * another. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -497,8 +482,3 @@ mime_find_filters( return (NULL); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/job.h b/scheduler/job.h index 32e2fd747..658151c17 100644 --- a/scheduler/job.h +++ b/scheduler/job.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Print job definitions for the CUPS scheduler. * * Copyright 2007-2015 by Apple Inc. @@ -177,8 +175,3 @@ extern void cupsdStopAllJobs(cupsd_jobaction_t action, extern int cupsdTimeoutJob(cupsd_job_t *job); extern void cupsdUnloadCompletedJobs(void); extern void cupsdUpdateJobs(void); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/listen.c b/scheduler/listen.c index b55d918b0..06e2ed6aa 100644 --- a/scheduler/listen.c +++ b/scheduler/listen.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Server listening routines for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -299,8 +297,3 @@ cupsdStopListening(void) #endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */ } } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/log.c b/scheduler/log.c index b48b7a740..44a1b6788 100644 --- a/scheduler/log.c +++ b/scheduler/log.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Log file routines for the CUPS scheduler. * * Copyright 2007-2015 by Apple Inc. @@ -1506,8 +1504,3 @@ format_log_line(const char *message, /* I - Printf-style format string */ return (1); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/mime-private.h b/scheduler/mime-private.h index c448e5ac8..4631c9450 100644 --- a/scheduler/mime-private.h +++ b/scheduler/mime-private.h @@ -1,15 +1,13 @@ /* - * "$Id$" + * Private MIME type/conversion database definitions for CUPS. * - * Private MIME type/conversion database definitions for CUPS. + * Copyright 2011 by Apple Inc. * - * Copyright 2011 by Apple Inc. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPS_MIME_PRIVATE_H_ @@ -39,7 +37,3 @@ extern void _mimeError(mime_t *mime, const char *format, ...) } # endif /* __cplusplus */ #endif /* !_CUPS_MIME_PRIVATE_H_ */ - -/* - * End of "$Id$". - */ diff --git a/scheduler/mime.c b/scheduler/mime.c index 56181501a..5d2c19824 100644 --- a/scheduler/mime.c +++ b/scheduler/mime.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * MIME database file routines for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -932,8 +930,3 @@ mime_load_types(mime_t *mime, /* I - MIME database */ cupsFileClose(fp); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/mime.h b/scheduler/mime.h index 3d61d2e1e..f536a68e7 100644 --- a/scheduler/mime.h +++ b/scheduler/mime.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * MIME type/conversion database definitions for CUPS. * - * MIME type/conversion database definitions for CUPS. + * Copyright 2007-2013 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * Copyright 2007-2013 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ #ifndef _CUPS_MIME_H_ @@ -159,7 +157,3 @@ extern void mimeSetErrorCallback(mime_t *mime, mime_error_cb_t cb, } # endif /* __cplusplus */ #endif /* !_CUPS_MIME_H_ */ - -/* - * End of "$Id$". - */ diff --git a/scheduler/network.c b/scheduler/network.c index 350f4e3e9..679f92f9b 100644 --- a/scheduler/network.c +++ b/scheduler/network.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Network interface functions for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -295,8 +293,3 @@ compare_netif(cupsd_netif_t *a, /* I - First network interface */ { return (strcmp(a->name, b->name)); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/network.h b/scheduler/network.h index c7a6aa0c3..8373d8bf8 100644 --- a/scheduler/network.h +++ b/scheduler/network.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Network interface definitions for the CUPS scheduler. * - * Network interface definitions for the CUPS scheduler. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products, all rights reserved. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * "LICENSE" which should have been included with this file. If this - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * "LICENSE" which should have been included with this file. If this + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -45,8 +43,3 @@ VAR cups_array_t *NetIFList VALUE(NULL); extern cupsd_netif_t *cupsdNetIFFind(const char *name); extern void cupsdNetIFUpdate(void); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/policy.c b/scheduler/policy.c index b36095ff6..9a68b1a97 100644 --- a/scheduler/policy.c +++ b/scheduler/policy.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Policy routines for the CUPS scheduler. * * Copyright 2007-2011, 2014 by Apple Inc. @@ -500,8 +498,3 @@ hash_op(cupsd_location_t *op) /* I - Operation */ { return (((op->op >> 6) & 0x40) | (op->op & 0x3f)); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/policy.h b/scheduler/policy.h index 361271f2b..3e4ad818c 100644 --- a/scheduler/policy.h +++ b/scheduler/policy.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Policy definitions for the CUPS scheduler. * - * Policy definitions for the CUPS scheduler. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products, all rights reserved. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ @@ -56,8 +54,3 @@ extern cups_array_t *cupsdGetPrivateAttrs(cupsd_policy_t *p, cupsd_client_t *con, cupsd_printer_t *printer, const char *owner); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/printers.c b/scheduler/printers.c index 2841adc29..62f846c52 100644 --- a/scheduler/printers.c +++ b/scheduler/printers.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Printer routines for the CUPS scheduler. * * Copyright 2007-2016 by Apple Inc. @@ -5080,8 +5078,3 @@ write_xml_string(cups_file_t *fp, /* I - File to write to */ if (s > start) cupsFilePuts(fp, start); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/printers.h b/scheduler/printers.h index 6c12cf8c4..3a27544a8 100644 --- a/scheduler/printers.h +++ b/scheduler/printers.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Printer definitions for the CUPS scheduler. * * Copyright 2007-2016 by Apple Inc. @@ -193,8 +191,3 @@ extern const char *cupsdValidateDest(const char *uri, cups_ptype_t *dtype, cupsd_printer_t **printer); extern void cupsdWritePrintcap(void); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/process.c b/scheduler/process.c index 2587bde18..51d7a7a11 100644 --- a/scheduler/process.c +++ b/scheduler/process.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Process management routines for the CUPS scheduler. * * Copyright 2007-2015 by Apple Inc. @@ -887,8 +885,3 @@ cupsd_requote(char *dst, /* I - Destination buffer */ return (dst); } #endif /* HAVE_SANDBOX_H */ - - -/* - * End of "$Id$". - */ diff --git a/scheduler/quotas.c b/scheduler/quotas.c index 9f0b6c0a3..21c41f6df 100644 --- a/scheduler/quotas.c +++ b/scheduler/quotas.c @@ -1,24 +1,14 @@ /* - * "$Id$" + * Quota routines for the CUPS scheduler. * - * Quota routines for the CUPS scheduler. + * Copyright 2007-2011 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * cupsdFindQuota() - Find a quota record. - * cupsdFreeQuotas() - Free quotas for a printer. - * cupsdUpdateQuota() - Update quota data for the specified printer and user. - * add_quota() - Add a quota record for this printer and user. - * compare_quotas() - Compare two quota records... + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -237,8 +227,3 @@ compare_quotas(const cupsd_quota_t *q1, /* I - First quota record */ { return (_cups_strcasecmp(q1->username, q2->username)); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/select.c b/scheduler/select.c index d302db0af..0652e450f 100644 --- a/scheduler/select.c +++ b/scheduler/select.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Select abstraction functions for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -927,8 +925,3 @@ find_fd(int fd) /* I - File descriptor */ return (fdptr); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/server.c b/scheduler/server.c index e53a5c11f..eb77dc96a 100644 --- a/scheduler/server.c +++ b/scheduler/server.c @@ -1,21 +1,14 @@ /* - * "$Id$" + * Server start/stop routines for the CUPS scheduler. * - * Server start/stop routines for the CUPS scheduler. + * Copyright 2007-2012 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products, all rights reserved. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * cupsdStartServer() - Start the server. - * cupsdStopServer() - Stop the server. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -180,8 +173,3 @@ cupsdStopServer(void) started = 0; } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/statbuf.c b/scheduler/statbuf.c index 1c2bd74e6..4ea37be9e 100644 --- a/scheduler/statbuf.c +++ b/scheduler/statbuf.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Status buffer routines for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -321,8 +319,3 @@ cupsdStatBufUpdate( return (line); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/statbuf.h b/scheduler/statbuf.h index 212acdf18..5bf6beaa4 100644 --- a/scheduler/statbuf.h +++ b/scheduler/statbuf.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Status buffer definitions for the CUPS scheduler. * - * Status buffer definitions for the CUPS scheduler. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2005 by Easy Software Products, all rights reserved. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ @@ -42,8 +40,3 @@ extern void cupsdStatBufDelete(cupsd_statbuf_t *sb); extern cupsd_statbuf_t *cupsdStatBufNew(int fd, const char *prefix, ...); extern char *cupsdStatBufUpdate(cupsd_statbuf_t *sb, int *loglevel, char *line, int linelen); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/subscriptions.c b/scheduler/subscriptions.c index ff14f45b0..52e12af16 100644 --- a/scheduler/subscriptions.c +++ b/scheduler/subscriptions.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Subscription routines for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -1614,8 +1612,3 @@ cupsd_update_notifier(void) break; } } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/subscriptions.h b/scheduler/subscriptions.h index eac866956..159db2a09 100644 --- a/scheduler/subscriptions.h +++ b/scheduler/subscriptions.h @@ -1,16 +1,14 @@ /* - * "$Id$" + * Subscription definitions for the CUPS scheduler. * - * Subscription definitions for the CUPS scheduler. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -159,8 +157,3 @@ extern void cupsdExpireSubscriptions(cupsd_printer_t *dest, extern void cupsdLoadAllSubscriptions(void); extern void cupsdSaveAllSubscriptions(void); extern void cupsdStopAllNotifiers(void); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/sysman.c b/scheduler/sysman.c index b78bbf196..9f0319a62 100644 --- a/scheduler/sysman.c +++ b/scheduler/sysman.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * System management functions for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -1069,8 +1067,3 @@ sysUpdateNames(void) cupsdRegisterPrinter(p); } #endif /* __APPLE__ */ - - -/* - * End of "$Id$". - */ diff --git a/scheduler/sysman.h b/scheduler/sysman.h index e3497ed0e..651bc055d 100644 --- a/scheduler/sysman.h +++ b/scheduler/sysman.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * System management definitions for the CUPS scheduler. * * Copyright 2007-2014 by Apple Inc. @@ -59,8 +57,3 @@ extern void cupsdMarkDirty(int what); extern void cupsdSetBusyState(void); extern void cupsdStartSystemMonitor(void); extern void cupsdStopSystemMonitor(void); - - -/* - * End of "$Id$". - */ diff --git a/scheduler/testlpd.c b/scheduler/testlpd.c index ecfdb197b..79b0ab020 100644 --- a/scheduler/testlpd.c +++ b/scheduler/testlpd.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * cups-lpd test program for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -532,8 +530,3 @@ usage(void) exit(0); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/testmime.c b/scheduler/testmime.c index 176e23767..c1f2b6029 100644 --- a/scheduler/testmime.c +++ b/scheduler/testmime.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * MIME test program for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -516,8 +514,3 @@ type_dir(mime_t *mime, /* I - MIME database */ cupsDirClose(dir); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/testspeed.c b/scheduler/testspeed.c index dfd984b15..2034016c8 100644 --- a/scheduler/testspeed.c +++ b/scheduler/testspeed.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Scheduler speed test for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -372,9 +370,3 @@ usage(void) "[-E] hostname[:port]"); exit(0); } - - - -/* - * End of "$Id$". - */ diff --git a/scheduler/testsub.c b/scheduler/testsub.c index 56bc3a42c..2475f347c 100644 --- a/scheduler/testsub.c +++ b/scheduler/testsub.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Scheduler notification tester for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -501,9 +499,3 @@ usage(void) puts("Usage: testsub [-E] [-e event ... -e eventN] [-h hostname] URI"); exit(0); } - - - -/* - * End of "$Id$". - */ diff --git a/scheduler/util.c b/scheduler/util.c index ae6182fd7..5e67d8028 100644 --- a/scheduler/util.c +++ b/scheduler/util.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Mini-daemon utility functions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -452,8 +450,3 @@ cupsdSendIPPTrailer(void) putchar(IPP_TAG_END); fflush(stdout); } - - -/* - * End of "$Id$". - */ diff --git a/scheduler/util.h b/scheduler/util.h index c6bdf2226..241c1e848 100644 --- a/scheduler/util.h +++ b/scheduler/util.h @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Mini-daemon utility definitions for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -65,7 +63,3 @@ extern void cupsdSendIPPTrailer(void); # endif /* __cplusplus */ #endif /* !_CUPSD_UTIL_H_ */ - -/* - * End of "$Id$". - */ diff --git a/systemv/Makefile b/systemv/Makefile index a073d91a7..a27f38b0b 100644 --- a/systemv/Makefile +++ b/systemv/Makefile @@ -1,6 +1,4 @@ # -# "$Id$" -# # System V commands makefile for CUPS. # # Copyright 2007-2014 by Apple Inc. @@ -276,8 +274,3 @@ lpstat: lpstat.o ../cups/$(LIBCUPS) # include Dependencies - - -# -# End of "$Id$". -# diff --git a/systemv/cancel.c b/systemv/cancel.c index cb5d4f9e5..67346393d 100644 --- a/systemv/cancel.c +++ b/systemv/cancel.c @@ -1,20 +1,14 @@ /* - * "$Id$" + * "cancel" command for CUPS. * - * "cancel" command for CUPS. + * Copyright 2007-2013 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2013 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * main() - Parse options and cancel jobs. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -380,8 +374,3 @@ main(int argc, /* I - Number of command-line arguments */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/systemv/cupsaccept.c b/systemv/cupsaccept.c index 784138ee2..38dff283d 100644 --- a/systemv/cupsaccept.c +++ b/systemv/cupsaccept.c @@ -1,21 +1,15 @@ /* - * "$Id$" + * "cupsaccept", "cupsdisable", "cupsenable", and "cupsreject" commands for + * CUPS. * - * "cupsaccept", "cupsdisable", "cupsenable", and "cupsreject" commands for - * CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * main() - Parse options and accept/reject jobs or disable/enable printers. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -232,8 +226,3 @@ main(int argc, /* I - Number of command-line arguments */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/systemv/cupsaddsmb.c b/systemv/cupsaddsmb.c index dfce0022f..7c28a370e 100644 --- a/systemv/cupsaddsmb.c +++ b/systemv/cupsaddsmb.c @@ -1,22 +1,14 @@ /* - * "$Id$" + * "cupsaddsmb" command for CUPS. * - * "cupsaddsmb" command for CUPS. + * Copyright 2007-2012 by Apple Inc. + * Copyright 2001-2006 by Easy Software Products. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 2001-2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * main() - Export printers on the command-line. - * export_dest() - Export a destination to SAMBA. - * usage() - Show program usage and exit... + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -292,8 +284,3 @@ usage(void) exit(1); } - - -/* - * End of "$Id$". - */ diff --git a/systemv/cupsctl.c b/systemv/cupsctl.c index 0cd2a59d7..c4e2763c5 100644 --- a/systemv/cupsctl.c +++ b/systemv/cupsctl.c @@ -1,23 +1,16 @@ /* - * "$Id$" + * Scheduler control program for CUPS. * - * Scheduler control program for CUPS. + * Copyright 2007-2012 by Apple Inc. + * Copyright 2006-2007 by Easy Software Products. * - * Copyright 2007-2012 by Apple Inc. - * Copyright 2006-2007 by Easy Software Products. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * main() - Get/set server settings. - * usage() - Show program usage. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -220,8 +213,3 @@ usage(const char *opt) /* I - Option character/string */ exit(1); } - - -/* - * End of "$Id$". - */ diff --git a/systemv/cupstestdsc.c b/systemv/cupstestdsc.c index de024c7ed..df69d9425 100644 --- a/systemv/cupstestdsc.c +++ b/systemv/cupstestdsc.c @@ -1,26 +1,18 @@ /* - * "$Id$" + * DSC test program for CUPS. * - * DSC test program for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 2006 by Easy Software Products, all rights reserved. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 2006 by Easy Software Products, all rights reserved. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * PostScript is a trademark of Adobe Systems, Inc. * - * PostScript is a trademark of Adobe Systems, Inc. - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * main() - Main entry for test program. - * check() - Check a file for conformance. - * usage() - Show program usage. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -435,8 +427,3 @@ usage(void) exit(1); } - - -/* - * End of "$Id$". - */ diff --git a/systemv/lp.c b/systemv/lp.c index 9e895d4d6..e0f5541c3 100644 --- a/systemv/lp.c +++ b/systemv/lp.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * "lp" command for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -755,8 +753,3 @@ set_job_attrs(const char *command, /* I - Command name */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/systemv/lpadmin.c b/systemv/lpadmin.c index cff71b695..7775b4024 100644 --- a/systemv/lpadmin.c +++ b/systemv/lpadmin.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * "lpadmin" command for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -1596,8 +1594,3 @@ validate_name(const char *name) /* I - Name to check */ return ((ptr - name) < 128); } - - -/* - * End of "$Id$". - */ diff --git a/systemv/lpinfo.c b/systemv/lpinfo.c index acfe50108..b8f77264c 100644 --- a/systemv/lpinfo.c +++ b/systemv/lpinfo.c @@ -1,23 +1,14 @@ /* - * "$Id$" + * "lpinfo" command for CUPS. * - * "lpinfo" command for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * main() - Parse options and show information. - * device_cb - Device callback. - * show_devices() - Show available devices. - * show_models() - Show available PPDs. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -491,8 +482,3 @@ show_models( return (0); } - - -/* - * End of "$Id$". - */ diff --git a/systemv/lpmove.c b/systemv/lpmove.c index 54424894f..9cba172c4 100644 --- a/systemv/lpmove.c +++ b/systemv/lpmove.c @@ -1,21 +1,14 @@ /* - * "$Id$" + * "lpmove" command for CUPS. * - * "lpmove" command for CUPS. + * Copyright 2007-2010 by Apple Inc. + * Copyright 1997-2006 by Easy Software Products. * - * Copyright 2007-2010 by Apple Inc. - * Copyright 1997-2006 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * Contents: - * - * main() - Parse options and move jobs. - * move_job() - Move a job. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". */ /* @@ -206,8 +199,3 @@ move_job(http_t *http, /* I - HTTP connection to server */ else return (0); } - - -/* - * End of "$Id$". - */ diff --git a/systemv/lpoptions.c b/systemv/lpoptions.c index df7c2d63d..e2d95a941 100644 --- a/systemv/lpoptions.c +++ b/systemv/lpoptions.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Printer option program for CUPS. * * Copyright 2007-2015 by Apple Inc. @@ -545,8 +543,3 @@ usage(void) exit(1); } - - -/* - * End of "$Id$". - */ diff --git a/systemv/lpstat.c b/systemv/lpstat.c index 7bfadeb12..b555f6a42 100644 --- a/systemv/lpstat.c +++ b/systemv/lpstat.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * "lpstat" command for CUPS. * * Copyright 2007-2014 by Apple Inc. @@ -2023,8 +2021,3 @@ show_scheduler(void) else _cupsLangPuts(stdout, _("scheduler is not running")); } - - -/* - * End of "$Id$". - */ diff --git a/templates/Makefile b/templates/Makefile index 503fe6e1b..90a7f3bb0 100644 --- a/templates/Makefile +++ b/templates/Makefile @@ -1,6 +1,4 @@ # -# "$Id$" -# # Template makefile for CUPS. # # Copyright 2007-2014 by Apple Inc. @@ -197,8 +195,3 @@ uninstall-languages: done uninstall-langbundle: - - -# -# End of "$Id$". -# diff --git a/test/5.1-lpadmin.sh b/test/5.1-lpadmin.sh index 5568f4ca0..07f1d5aa0 100644 --- a/test/5.1-lpadmin.sh +++ b/test/5.1-lpadmin.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# "$Id$" -# # Test the lpadmin command. # # Copyright 2007-2013 by Apple Inc. @@ -66,7 +64,3 @@ else echo " PASSED" fi echo "" - -# -# End of "$Id$". -# diff --git a/test/5.2-lpc.sh b/test/5.2-lpc.sh index f1957a8b2..857e885a4 100644 --- a/test/5.2-lpc.sh +++ b/test/5.2-lpc.sh @@ -1,17 +1,15 @@ #!/bin/sh # -# "$Id$" +# Test the lpc command. # -# Test the lpc command. +# Copyright 2007 by Apple Inc. +# Copyright 1997-2005 by Easy Software Products, all rights reserved. # -# Copyright 2007 by Apple Inc. -# Copyright 1997-2005 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # echo "LPC Test" @@ -25,7 +23,3 @@ else echo " PASSED" fi echo "" - -# -# End of "$Id$". -# diff --git a/test/5.3-lpq.sh b/test/5.3-lpq.sh index 03087d2cc..4c0e84968 100644 --- a/test/5.3-lpq.sh +++ b/test/5.3-lpq.sh @@ -1,17 +1,15 @@ #!/bin/sh # -# "$Id$" +# Test the lpq command. # -# Test the lpq command. +# Copyright 2007 by Apple Inc. +# Copyright 1997-2005 by Easy Software Products, all rights reserved. # -# Copyright 2007 by Apple Inc. -# Copyright 1997-2005 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # echo "LPQ Test" @@ -25,7 +23,3 @@ else echo " PASSED" fi echo "" - -# -# End of "$Id$". -# diff --git a/test/5.4-lpstat.sh b/test/5.4-lpstat.sh index ace5b8a94..5092dbe98 100644 --- a/test/5.4-lpstat.sh +++ b/test/5.4-lpstat.sh @@ -1,17 +1,15 @@ #!/bin/sh # -# "$Id$" +# Test the lpstat command. # -# Test the lpstat command. +# Copyright 2007-2011 by Apple Inc. +# Copyright 1997-2005 by Easy Software Products, all rights reserved. # -# Copyright 2007-2011 by Apple Inc. -# Copyright 1997-2005 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # echo "LPSTAT Test" @@ -37,7 +35,3 @@ else echo " PASSED ($server)" fi echo "" - -# -# End of "$Id$". -# diff --git a/test/5.5-lp.sh b/test/5.5-lp.sh index 94e2b3cb6..71fc41800 100644 --- a/test/5.5-lp.sh +++ b/test/5.5-lp.sh @@ -1,17 +1,15 @@ #!/bin/sh # -# "$Id$" +# Test the lp command. # -# Test the lp command. +# Copyright 2007-2014 by Apple Inc. +# Copyright 1997-2005 by Easy Software Products, all rights reserved. # -# Copyright 2007-2014 by Apple Inc. -# Copyright 1997-2005 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # echo "LP Default Test" @@ -92,8 +90,3 @@ else echo " PASSED" fi echo "" - - -# -# End of "$Id$". -# diff --git a/test/5.6-lpr.sh b/test/5.6-lpr.sh index 7298792f6..d3280d2bb 100644 --- a/test/5.6-lpr.sh +++ b/test/5.6-lpr.sh @@ -1,17 +1,15 @@ #!/bin/sh # -# "$Id$" +# Test the lpr command. # -# Test the lpr command. +# Copyright 2007-2014 by Apple Inc. +# Copyright 1997-2005 by Easy Software Products, all rights reserved. # -# Copyright 2007-2014 by Apple Inc. -# Copyright 1997-2005 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # echo "LPR Default Test" @@ -80,7 +78,3 @@ fi echo "" ./waitjobs.sh - -# -# End of "$Id$". -# diff --git a/test/5.7-lprm.sh b/test/5.7-lprm.sh index 482052d86..e456ec083 100644 --- a/test/5.7-lprm.sh +++ b/test/5.7-lprm.sh @@ -1,17 +1,15 @@ #!/bin/sh # -# "$Id$" +# Test the lprm command. # -# Test the lprm command. +# Copyright 2007-2011 by Apple Inc. +# Copyright 1997-2005 by Easy Software Products, all rights reserved. # -# Copyright 2007-2011 by Apple Inc. -# Copyright 1997-2005 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # echo "LPRM Current Test" @@ -41,7 +39,3 @@ else echo " PASSED" fi echo "" - -# -# End of "$Id$". -# diff --git a/test/5.8-cancel.sh b/test/5.8-cancel.sh index 11f599cd3..28bc0fea1 100644 --- a/test/5.8-cancel.sh +++ b/test/5.8-cancel.sh @@ -1,17 +1,15 @@ #!/bin/sh # -# "$Id$" +# Test the cancel command. # -# Test the cancel command. +# Copyright 2007-2013 by Apple Inc. +# Copyright 1997-2006 by Easy Software Products, all rights reserved. # -# Copyright 2007-2013 by Apple Inc. -# Copyright 1997-2006 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # echo "Cancel Destination Test" @@ -51,7 +49,3 @@ else echo " PASSED" fi echo "" - -# -# End of "$Id$". -# diff --git a/test/5.9-lpinfo.sh b/test/5.9-lpinfo.sh index adb041b0a..9cf6cebfa 100644 --- a/test/5.9-lpinfo.sh +++ b/test/5.9-lpinfo.sh @@ -1,17 +1,15 @@ #!/bin/sh # -# "$Id$" +# Test the lpinfo command. # -# Test the lpinfo command. +# Copyright 2007-2011 by Apple Inc. +# Copyright 1997-2005 by Easy Software Products, all rights reserved. # -# Copyright 2007-2011 by Apple Inc. -# Copyright 1997-2005 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # echo "LPINFO Devices Test" @@ -49,7 +47,3 @@ else echo " PASSED" fi echo "" - -# -# End of "$Id$". -# diff --git a/test/Makefile b/test/Makefile index aef5c1b32..4922d6ae9 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,16 +1,14 @@ # -# "$Id$" +# IPP test makefile for CUPS. # -# IPP test makefile for CUPS. +# Copyright 2007-2014 by Apple Inc. +# Copyright 1997-2006 by Easy Software Products, all rights reserved. # -# Copyright 2007-2014 by Apple Inc. -# Copyright 1997-2006 by Easy Software Products, all rights reserved. -# -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs @@ -278,8 +276,3 @@ xmltotest: xmltotest.o ../cups/$(LIBUPSSTATIC) # include Dependencies - - -# -# End of "$Id$". -# diff --git a/test/ippdiscover.c b/test/ippdiscover.c index 257900290..6067d9db5 100644 --- a/test/ippdiscover.c +++ b/test/ippdiscover.c @@ -1,21 +1,16 @@ /* - * "$Id$" + * ippdiscover command for CUPS. * - * ippdiscover command for CUPS. + * Copyright 2007-2013 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products. * - * Copyright 2007-2013 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * + * This file is subject to the Apple OS-Developed Software exception. */ @@ -822,8 +817,3 @@ usage(void) exit(0); } - - -/* - * End of "$Id$". - */ diff --git a/test/ippfind.c b/test/ippfind.c index 10b127a49..b4a0ce291 100644 --- a/test/ippfind.c +++ b/test/ippfind.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Utility to find IPP printers via Bonjour/DNS-SD and optionally run * commands such as IPP and Bonjour conformance tests. This tool is * inspired by the UNIX "find" command, thus its name. @@ -2840,8 +2838,3 @@ show_version(void) exit(IPPFIND_EXIT_TRUE); } - - -/* - * End of "$Id$". - */ diff --git a/test/ippinfra.c b/test/ippinfra.c index 77038e345..ebd26c171 100644 --- a/test/ippinfra.c +++ b/test/ippinfra.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Sample IPP INFRA server for CUPS. * * Copyright 2010-2014 by Apple Inc. @@ -7118,8 +7116,3 @@ valid_job_attributes( return (valid); } - - -/* - * End of "$Id$". - */ diff --git a/test/ippinfra.man b/test/ippinfra.man index 46ac84e40..fed576de5 100644 --- a/test/ippinfra.man +++ b/test/ippinfra.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" ippinfra man page for CUPS. .\" .\" Copyright 2014 by Apple Inc. @@ -98,6 +96,3 @@ Specify a proxy username of "foo" and password of "bar": PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp) .SH COPYRIGHT Copyright \[co] 2007-2014 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/test/ippproxy.c b/test/ippproxy.c index 176e4039b..dd0d58b62 100644 --- a/test/ippproxy.c +++ b/test/ippproxy.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * CUPS Cloud Proxy for HP PCL and IPP Everywhere printers. * * Copyright 2014 by Apple Inc. @@ -22,8 +20,3 @@ main(int argc, /* I - Number of command-line arguments */ return (0); } - - -/* - * End of "$Id$". - */ diff --git a/test/ippproxy.man b/test/ippproxy.man index 1d46c9afe..aa1116ea8 100644 --- a/test/ippproxy.man +++ b/test/ippproxy.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" ippproxy man page for CUPS. .\" .\" Copyright 2014 by Apple Inc. @@ -54,6 +52,3 @@ with an infrastructure URI of "ipps://host.example.com/ipp/print" and a local UR PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp) .SH COPYRIGHT Copyright \[co] 2007-2014 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/test/ippserver.c b/test/ippserver.c index bb60f43bc..8f58c9a71 100644 --- a/test/ippserver.c +++ b/test/ippserver.c @@ -1,6 +1,4 @@ /* - * "$Id$" - * * Sample IPP Everywhere server for CUPS. * * Copyright 2010-2015 by Apple Inc. @@ -7388,8 +7386,3 @@ valid_job_attributes( return (valid); } - - -/* - * End of "$Id$". - */ diff --git a/test/ippserver.man b/test/ippserver.man index a5c1c1c59..ad156b6b2 100644 --- a/test/ippserver.man +++ b/test/ippserver.man @@ -1,6 +1,4 @@ .\" -.\" "$Id$" -.\" .\" ippserver man page for CUPS. .\" .\" Copyright 2014 by Apple Inc. @@ -167,6 +165,3 @@ command whenever a job is sent to the server: PWG Internet Printing Protocol Workgroup (http://www.pwg.org/ipp) .SH COPYRIGHT Copyright \[co] 2007-2014 by Apple Inc. -.\" -.\" End of "$Id$". -.\" diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index d8bdffba5..475894d4f 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# "$Id$" -# # Perform the complete set of IPP compliance tests specified in the # CUPS Software Test Plan. # @@ -1114,7 +1112,3 @@ if test $fail != 0; then exit 1 fi - -# -# End of "$Id$" -# diff --git a/test/waitjobs.sh b/test/waitjobs.sh index 7a79fb69b..dee7b1b9b 100755 --- a/test/waitjobs.sh +++ b/test/waitjobs.sh @@ -1,7 +1,5 @@ #!/bin/sh # -# "$Id$" -# # Script to wait for jobs to complete. # # Copyright 2008-2009 by Apple Inc. @@ -54,7 +52,3 @@ while test $timeout -gt 0; do done echo "" - -# -# End of "$Id$". -# diff --git a/test/xmltotest.c b/test/xmltotest.c index 8f601cc26..dfc644919 100644 --- a/test/xmltotest.c +++ b/test/xmltotest.c @@ -1,37 +1,25 @@ /* - * "$Id$" + * IANA XML registration to test file generator for CUPS. * - * IANA XML registration to test file generator for CUPS. + * Copyright 2011-2012 by Apple Inc. * - * Copyright 2011-2012 by Apple Inc. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. * * Usage: * * ./xmltotest [--ref standard] {--job|--printer} [XML file/URL] >file.test * - * If not specified, loads the XML registrations from: - * - * http://www.iana.org/assignments/ipp-registrations/ipp-registrations.xml + * If not specified, loads the XML registrations from: * - * "Standard" is of the form "rfcNNNN" or "pwgNNNN.N". + * http://www.iana.org/assignments/ipp-registrations/ipp-registrations.xml * - * Contents: - * - * main() - Process command-line arguments. - * compare_reg() - Compare two registrations. - * load_xml() - Load the XML registration file or URL. - * match_xref() - Compare the xref against the named standard. - * new_reg() - Create a new registration record. - * usage() - Show usage message. - * write_expect() - Write an EXPECT test for an attribute. + * "Standard" is of the form "rfcNNNN" or "pwgNNNN.N". */ @@ -522,8 +510,3 @@ main(void) return (1); } #endif /* HAVE_MXML */ - - -/* - * End of "$Id$". - */ diff --git a/tools/makesrcdist-obsolete b/tools/makesrcdist-obsolete index 1400cb24a..0e94f3040 100755 --- a/tools/makesrcdist-obsolete +++ b/tools/makesrcdist-obsolete @@ -1,7 +1,5 @@ #!/bin/sh # -# "$Id$" -# # makesrcdist - make a source distribution of CUPS. # @@ -146,7 +144,3 @@ echo Removing temporary files... rm -rf cups-$version echo "Done - files in $TMPDIR." - -# -# End of "$Id$". -# diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj index 7366535f5..00611cbd2 100644 --- a/xcode/CUPS.xcodeproj/project.pbxproj +++ b/xcode/CUPS.xcodeproj/project.pbxproj @@ -1663,7 +1663,6 @@ 728FB7EF1536167A005426E1 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = /usr/lib/libiconv.dylib; sourceTree = "<absolute>"; }; 728FB7F01536167A005426E1 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = /usr/lib/libresolv.dylib; sourceTree = "<absolute>"; }; 729D4B561A2CB48700692B21 /* CHANGES-2.0.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = "CHANGES-2.0.txt"; path = "../CHANGES-2.0.txt"; sourceTree = "<group>"; }; - 729D4B571A2CB48700692B21 /* CHANGES-IPPTOOL.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = "CHANGES-IPPTOOL.txt"; path = "../CHANGES-IPPTOOL.txt"; sourceTree = "<group>"; }; 72A4332F155844CF002E172D /* libcups_static.a */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libcups_static.a; sourceTree = BUILT_PRODUCTS_DIR; }; 72A8B3D61C188BDE00A1A547 /* ppd-util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "ppd-util.c"; path = "../cups/ppd-util.c"; sourceTree = "<group>"; }; 72C16CB8137B195D007E4BF4 /* file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = file.c; path = ../scheduler/file.c; sourceTree = SOURCE_ROOT; }; @@ -1739,7 +1738,6 @@ 72E65BDE18DCA35700097E89 /* CHANGES.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = CHANGES.txt; path = ../CHANGES.txt; sourceTree = "<group>"; }; 72E65BDF18DCA35700097E89 /* CREDITS.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = CREDITS.txt; path = ../CREDITS.txt; sourceTree = "<group>"; }; 72E65BE018DCA35700097E89 /* INSTALL.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = INSTALL.txt; path = ../INSTALL.txt; sourceTree = "<group>"; }; - 72E65BE118DCA35700097E89 /* IPPTOOL.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = IPPTOOL.txt; path = ../IPPTOOL.txt; sourceTree = "<group>"; }; 72E65BE218DCA35700097E89 /* LICENSE.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = LICENSE.txt; path = ../LICENSE.txt; sourceTree = "<group>"; }; 72E65BE318DCA35700097E89 /* README.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = README.txt; path = ../README.txt; sourceTree = "<group>"; }; 72F75A521336F950004BB496 /* cupstestppd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = cupstestppd; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -2640,12 +2638,10 @@ 72E65BCC18DC7A9800097E89 /* api-raster.shtml */, 72E65BDD18DCA35700097E89 /* CHANGES-1.7.txt */, 729D4B561A2CB48700692B21 /* CHANGES-2.0.txt */, - 729D4B571A2CB48700692B21 /* CHANGES-IPPTOOL.txt */, 72E65BDE18DCA35700097E89 /* CHANGES.txt */, 72E65BDF18DCA35700097E89 /* CREDITS.txt */, 72E65BB918DC7A3600097E89 /* doc */, 72E65BE018DCA35700097E89 /* INSTALL.txt */, - 72E65BE118DCA35700097E89 /* IPPTOOL.txt */, 72E65BE218DCA35700097E89 /* LICENSE.txt */, 72E65BBA18DC7A3600097E89 /* man */, 72E65BCD18DC7A9800097E89 /* postscript-driver.header */, |