diff options
| author | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-06-23 01:40:35 +0000 |
|---|---|---|
| committer | jlovell <jlovell@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2006-06-23 01:40:35 +0000 |
| commit | f7faf1f5c3235dfa4f883522da7dc6446f028247 (patch) | |
| tree | 59d573df045d93a7681a9a165729bacb554df5e6 /cups | |
| parent | c07d5b2daf136da7af01c48ff78135d06d2762fc (diff) | |
Load cups into easysw/current.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@185 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups')
74 files changed, 298 insertions, 393 deletions
diff --git a/cups/Dependencies b/cups/Dependencies index 012ef0b3b..4cb7cb37f 100644 --- a/cups/Dependencies +++ b/cups/Dependencies @@ -1,21 +1,18 @@ # DO NOT DELETE adminutil.o: adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h -adminutil.o: language.h globals.h string.h ../config.h http-private.h -adminutil.o: ipp-private.h i18n.h transcode.h debug.h +adminutil.o: language.h globals.h string.h ../config.h i18n.h transcode.h +adminutil.o: debug.h array.o: array.h string.h ../config.h debug.h attr.o: ppd.h array.h file.h debug.h string.h ../config.h -auth.o: globals.h string.h ../config.h http-private.h http.h md5.h -auth.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -auth.o: transcode.h debug.h +auth.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +auth.o: array.h file.h language.h i18n.h transcode.h debug.h backchannel.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h backend.o: backend.h string.h ../config.h -custom.o: globals.h string.h ../config.h http-private.h http.h md5.h -custom.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -custom.o: transcode.h debug.h -dest.o: globals.h string.h ../config.h http-private.h http.h md5.h -dest.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -dest.o: transcode.h +custom.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +custom.o: array.h file.h language.h i18n.h transcode.h debug.h +dest.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +dest.o: array.h file.h language.h i18n.h transcode.h dir.o: dir.h string.h ../config.h debug.h emit.o: ppd.h array.h file.h string.h ../config.h encode.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h @@ -24,68 +21,56 @@ file.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h file.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h file.o: debug.h getifaddrs.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h -getputfile.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h -getputfile.o: cups.h ppd.h array.h file.h language.h string.h debug.h +getputfile.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h +getputfile.o: string.h ../config.h debug.h globals.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.o: globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h globals.o: transcode.h debug.h http.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h http.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h http.o: debug.h -http-addr.o: globals.h string.h ../config.h http-private.h http.h md5.h -http-addr.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -http-addr.o: i18n.h transcode.h debug.h +http-addr.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +http-addr.o: array.h file.h language.h i18n.h transcode.h debug.h http-addrlist.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h http-addrlist.o: globals.h string.h cups.h ppd.h array.h file.h language.h http-addrlist.o: i18n.h transcode.h debug.h -http-support.o: debug.h globals.h string.h ../config.h http-private.h http.h -http-support.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h -http-support.o: language.h i18n.h transcode.h +http-support.o: debug.h globals.h string.h ../config.h cups.h ipp.h http.h +http-support.o: md5.h ppd.h array.h file.h language.h i18n.h transcode.h ipp.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h ipp.o: string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h ipp.o: debug.h -ipp-support.o: globals.h string.h ../config.h http-private.h http.h md5.h -ipp-support.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -ipp-support.o: i18n.h transcode.h debug.h -langprintf.o: globals.h string.h ../config.h http-private.h http.h md5.h -langprintf.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -langprintf.o: i18n.h transcode.h -language.o: globals.h string.h ../config.h http-private.h http.h md5.h -language.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -language.o: transcode.h debug.h -localize.o: globals.h string.h ../config.h http-private.h http.h md5.h -localize.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -localize.o: transcode.h debug.h +ipp-support.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +ipp-support.o: array.h file.h language.h i18n.h transcode.h debug.h +langprintf.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +langprintf.o: array.h file.h language.h i18n.h transcode.h +language.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +language.o: array.h file.h language.h i18n.h transcode.h debug.h +localize.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +localize.o: array.h file.h language.h i18n.h transcode.h debug.h mark.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h mark.o: ../config.h debug.h md5.o: md5.h string.h ../config.h md5passwd.o: http.h md5.h string.h ../config.h -notify.o: globals.h string.h ../config.h http-private.h http.h md5.h -notify.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -notify.o: transcode.h +notify.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +notify.o: array.h file.h language.h i18n.h transcode.h options.o: cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h options.o: ../config.h debug.h page.o: ppd.h array.h file.h string.h ../config.h -ppd.o: globals.h string.h ../config.h http-private.h http.h md5.h -ppd.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -ppd.o: transcode.h debug.h -request.o: globals.h string.h ../config.h http-private.h http.h md5.h -request.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -request.o: transcode.h debug.h +ppd.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h array.h +ppd.o: file.h language.h i18n.h transcode.h debug.h +request.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +request.o: array.h file.h language.h i18n.h transcode.h debug.h snprintf.o: string.h ../config.h string.o: array.h debug.h string.h ../config.h -tempfile.o: globals.h string.h ../config.h http-private.h http.h md5.h -tempfile.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -tempfile.o: transcode.h debug.h -transcode.o: globals.h string.h ../config.h http-private.h http.h md5.h -transcode.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -transcode.o: i18n.h transcode.h debug.h +tempfile.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +tempfile.o: array.h file.h language.h i18n.h transcode.h debug.h +transcode.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +transcode.o: array.h file.h language.h i18n.h transcode.h debug.h usersys.o: http-private.h ../config.h http.h md5.h ipp-private.h ipp.h usersys.o: globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h usersys.o: transcode.h -util.o: globals.h string.h ../config.h http-private.h http.h md5.h -util.o: ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -util.o: transcode.h debug.h +util.o: globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +util.o: array.h file.h language.h i18n.h transcode.h debug.h testadmin.o: adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h testadmin.o: language.h string.h ../config.h testarray.o: ../cups/string.h ../config.h string.h array.h dir.h debug.h @@ -98,21 +83,18 @@ testppd.o: ../cups/string.h ../config.h string.h ppd.h array.h file.h # DO NOT DELETE adminutil.32.o: adminutil.c adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h -adminutil.32.o: adminutil.c language.h globals.h string.h ../config.h http-private.h -adminutil.32.o: adminutil.c ipp-private.h i18n.h transcode.h debug.h +adminutil.32.o: adminutil.c language.h globals.h string.h ../config.h i18n.h transcode.h +adminutil.32.o: adminutil.c debug.h array.32.o: array.c array.h string.h ../config.h debug.h attr.32.o: attr.c ppd.h array.h file.h debug.h string.h ../config.h -auth.32.o: auth.c globals.h string.h ../config.h http-private.h http.h md5.h -auth.32.o: auth.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -auth.32.o: auth.c transcode.h debug.h +auth.32.o: auth.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +auth.32.o: auth.c array.h file.h language.h i18n.h transcode.h debug.h backchannel.32.o: backchannel.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h backend.32.o: backend.c backend.h string.h ../config.h -custom.32.o: custom.c globals.h string.h ../config.h http-private.h http.h md5.h -custom.32.o: custom.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -custom.32.o: custom.c transcode.h debug.h -dest.32.o: dest.c globals.h string.h ../config.h http-private.h http.h md5.h -dest.32.o: dest.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -dest.32.o: dest.c transcode.h +custom.32.o: custom.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +custom.32.o: custom.c array.h file.h language.h i18n.h transcode.h debug.h +dest.32.o: dest.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +dest.32.o: dest.c array.h file.h language.h i18n.h transcode.h dir.32.o: dir.c dir.h string.h ../config.h debug.h emit.32.o: emit.c ppd.h array.h file.h string.h ../config.h encode.32.o: encode.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h @@ -121,68 +103,56 @@ file.32.o: file.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h g file.32.o: file.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h file.32.o: file.c debug.h getifaddrs.32.o: getifaddrs.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h -getputfile.32.o: getputfile.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h -getputfile.32.o: getputfile.c cups.h ppd.h array.h file.h language.h string.h debug.h +getputfile.32.o: getputfile.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h +getputfile.32.o: getputfile.c string.h ../config.h debug.h globals.32.o: globals.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.32.o: globals.c globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h globals.32.o: globals.c transcode.h debug.h http.32.o: http.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h http.32.o: http.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h http.32.o: http.c debug.h -http-addr.32.o: http-addr.c globals.h string.h ../config.h http-private.h http.h md5.h -http-addr.32.o: http-addr.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -http-addr.32.o: http-addr.c i18n.h transcode.h debug.h +http-addr.32.o: http-addr.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +http-addr.32.o: http-addr.c array.h file.h language.h i18n.h transcode.h debug.h http-addrlist.32.o: http-addrlist.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h http-addrlist.32.o: http-addrlist.c globals.h string.h cups.h ppd.h array.h file.h language.h http-addrlist.32.o: http-addrlist.c i18n.h transcode.h debug.h -http-support.32.o: http-support.c debug.h globals.h string.h ../config.h http-private.h http.h -http-support.32.o: http-support.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h -http-support.32.o: http-support.c language.h i18n.h transcode.h +http-support.32.o: http-support.c debug.h globals.h string.h ../config.h cups.h ipp.h http.h +http-support.32.o: http-support.c md5.h ppd.h array.h file.h language.h i18n.h transcode.h ipp.32.o: ipp.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h ipp.32.o: ipp.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h ipp.32.o: ipp.c debug.h -ipp-support.32.o: ipp-support.c globals.h string.h ../config.h http-private.h http.h md5.h -ipp-support.32.o: ipp-support.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -ipp-support.32.o: ipp-support.c i18n.h transcode.h debug.h -langprintf.32.o: langprintf.c globals.h string.h ../config.h http-private.h http.h md5.h -langprintf.32.o: langprintf.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -langprintf.32.o: langprintf.c i18n.h transcode.h -language.32.o: language.c globals.h string.h ../config.h http-private.h http.h md5.h -language.32.o: language.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -language.32.o: language.c transcode.h debug.h -localize.32.o: localize.c globals.h string.h ../config.h http-private.h http.h md5.h -localize.32.o: localize.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -localize.32.o: localize.c transcode.h debug.h +ipp-support.32.o: ipp-support.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +ipp-support.32.o: ipp-support.c array.h file.h language.h i18n.h transcode.h debug.h +langprintf.32.o: langprintf.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +langprintf.32.o: langprintf.c array.h file.h language.h i18n.h transcode.h +language.32.o: language.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +language.32.o: language.c array.h file.h language.h i18n.h transcode.h debug.h +localize.32.o: localize.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +localize.32.o: localize.c array.h file.h language.h i18n.h transcode.h debug.h mark.32.o: mark.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h mark.32.o: mark.c ../config.h debug.h md5.32.o: md5.c md5.h string.h ../config.h md5passwd.32.o: md5passwd.c http.h md5.h string.h ../config.h -notify.32.o: notify.c globals.h string.h ../config.h http-private.h http.h md5.h -notify.32.o: notify.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -notify.32.o: notify.c transcode.h +notify.32.o: notify.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +notify.32.o: notify.c array.h file.h language.h i18n.h transcode.h options.32.o: options.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h options.32.o: options.c ../config.h debug.h page.32.o: page.c ppd.h array.h file.h string.h ../config.h -ppd.32.o: ppd.c globals.h string.h ../config.h http-private.h http.h md5.h -ppd.32.o: ppd.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -ppd.32.o: ppd.c transcode.h debug.h -request.32.o: request.c globals.h string.h ../config.h http-private.h http.h md5.h -request.32.o: request.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -request.32.o: request.c transcode.h debug.h +ppd.32.o: ppd.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h array.h +ppd.32.o: ppd.c file.h language.h i18n.h transcode.h debug.h +request.32.o: request.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +request.32.o: request.c array.h file.h language.h i18n.h transcode.h debug.h snprintf.32.o: snprintf.c string.h ../config.h string.32.o: string.c array.h debug.h string.h ../config.h -tempfile.32.o: tempfile.c globals.h string.h ../config.h http-private.h http.h md5.h -tempfile.32.o: tempfile.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -tempfile.32.o: tempfile.c transcode.h debug.h -transcode.32.o: transcode.c globals.h string.h ../config.h http-private.h http.h md5.h -transcode.32.o: transcode.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -transcode.32.o: transcode.c i18n.h transcode.h debug.h +tempfile.32.o: tempfile.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +tempfile.32.o: tempfile.c array.h file.h language.h i18n.h transcode.h debug.h +transcode.32.o: transcode.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +transcode.32.o: transcode.c array.h file.h language.h i18n.h transcode.h debug.h usersys.32.o: usersys.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h usersys.32.o: usersys.c globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h usersys.32.o: usersys.c transcode.h -util.32.o: util.c globals.h string.h ../config.h http-private.h http.h md5.h -util.32.o: util.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -util.32.o: util.c transcode.h debug.h +util.32.o: util.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +util.32.o: util.c array.h file.h language.h i18n.h transcode.h debug.h testadmin.32.o: testadmin.c adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h testadmin.32.o: testadmin.c language.h string.h ../config.h testarray.32.o: testarray.c ../cups/string.h ../config.h string.h array.h dir.h debug.h @@ -195,21 +165,18 @@ testppd.32.o: testppd.c ../cups/string.h ../config.h string.h ppd.h array.h fil # DO NOT DELETE adminutil.64.o: adminutil.c adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h -adminutil.64.o: adminutil.c language.h globals.h string.h ../config.h http-private.h -adminutil.64.o: adminutil.c ipp-private.h i18n.h transcode.h debug.h +adminutil.64.o: adminutil.c language.h globals.h string.h ../config.h i18n.h transcode.h +adminutil.64.o: adminutil.c debug.h array.64.o: array.c array.h string.h ../config.h debug.h attr.64.o: attr.c ppd.h array.h file.h debug.h string.h ../config.h -auth.64.o: auth.c globals.h string.h ../config.h http-private.h http.h md5.h -auth.64.o: auth.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -auth.64.o: auth.c transcode.h debug.h +auth.64.o: auth.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +auth.64.o: auth.c array.h file.h language.h i18n.h transcode.h debug.h backchannel.64.o: backchannel.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h backend.64.o: backend.c backend.h string.h ../config.h -custom.64.o: custom.c globals.h string.h ../config.h http-private.h http.h md5.h -custom.64.o: custom.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -custom.64.o: custom.c transcode.h debug.h -dest.64.o: dest.c globals.h string.h ../config.h http-private.h http.h md5.h -dest.64.o: dest.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -dest.64.o: dest.c transcode.h +custom.64.o: custom.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +custom.64.o: custom.c array.h file.h language.h i18n.h transcode.h debug.h +dest.64.o: dest.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +dest.64.o: dest.c array.h file.h language.h i18n.h transcode.h dir.64.o: dir.c dir.h string.h ../config.h debug.h emit.64.o: emit.c ppd.h array.h file.h string.h ../config.h encode.64.o: encode.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h @@ -218,68 +185,56 @@ file.64.o: file.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h g file.64.o: file.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h file.64.o: file.c debug.h getifaddrs.64.o: getifaddrs.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h -getputfile.64.o: getputfile.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h -getputfile.64.o: getputfile.c cups.h ppd.h array.h file.h language.h string.h debug.h +getputfile.64.o: getputfile.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h +getputfile.64.o: getputfile.c string.h ../config.h debug.h globals.64.o: globals.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.64.o: globals.c globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h globals.64.o: globals.c transcode.h debug.h http.64.o: http.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h http.64.o: http.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h http.64.o: http.c debug.h -http-addr.64.o: http-addr.c globals.h string.h ../config.h http-private.h http.h md5.h -http-addr.64.o: http-addr.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -http-addr.64.o: http-addr.c i18n.h transcode.h debug.h +http-addr.64.o: http-addr.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +http-addr.64.o: http-addr.c array.h file.h language.h i18n.h transcode.h debug.h http-addrlist.64.o: http-addrlist.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h http-addrlist.64.o: http-addrlist.c globals.h string.h cups.h ppd.h array.h file.h language.h http-addrlist.64.o: http-addrlist.c i18n.h transcode.h debug.h -http-support.64.o: http-support.c debug.h globals.h string.h ../config.h http-private.h http.h -http-support.64.o: http-support.c md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h -http-support.64.o: http-support.c language.h i18n.h transcode.h +http-support.64.o: http-support.c debug.h globals.h string.h ../config.h cups.h ipp.h http.h +http-support.64.o: http-support.c md5.h ppd.h array.h file.h language.h i18n.h transcode.h ipp.64.o: ipp.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h globals.h ipp.64.o: ipp.c string.h cups.h ppd.h array.h file.h language.h i18n.h transcode.h ipp.64.o: ipp.c debug.h -ipp-support.64.o: ipp-support.c globals.h string.h ../config.h http-private.h http.h md5.h -ipp-support.64.o: ipp-support.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -ipp-support.64.o: ipp-support.c i18n.h transcode.h debug.h -langprintf.64.o: langprintf.c globals.h string.h ../config.h http-private.h http.h md5.h -langprintf.64.o: langprintf.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -langprintf.64.o: langprintf.c i18n.h transcode.h -language.64.o: language.c globals.h string.h ../config.h http-private.h http.h md5.h -language.64.o: language.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -language.64.o: language.c transcode.h debug.h -localize.64.o: localize.c globals.h string.h ../config.h http-private.h http.h md5.h -localize.64.o: localize.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -localize.64.o: localize.c transcode.h debug.h +ipp-support.64.o: ipp-support.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +ipp-support.64.o: ipp-support.c array.h file.h language.h i18n.h transcode.h debug.h +langprintf.64.o: langprintf.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +langprintf.64.o: langprintf.c array.h file.h language.h i18n.h transcode.h +language.64.o: language.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +language.64.o: language.c array.h file.h language.h i18n.h transcode.h debug.h +localize.64.o: localize.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +localize.64.o: localize.c array.h file.h language.h i18n.h transcode.h debug.h mark.64.o: mark.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h mark.64.o: mark.c ../config.h debug.h md5.64.o: md5.c md5.h string.h ../config.h md5passwd.64.o: md5passwd.c http.h md5.h string.h ../config.h -notify.64.o: notify.c globals.h string.h ../config.h http-private.h http.h md5.h -notify.64.o: notify.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -notify.64.o: notify.c transcode.h +notify.64.o: notify.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +notify.64.o: notify.c array.h file.h language.h i18n.h transcode.h options.64.o: options.c cups.h ipp.h http.h md5.h ppd.h array.h file.h language.h string.h options.64.o: options.c ../config.h debug.h page.64.o: page.c ppd.h array.h file.h string.h ../config.h -ppd.64.o: ppd.c globals.h string.h ../config.h http-private.h http.h md5.h -ppd.64.o: ppd.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -ppd.64.o: ppd.c transcode.h debug.h -request.64.o: request.c globals.h string.h ../config.h http-private.h http.h md5.h -request.64.o: request.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -request.64.o: request.c transcode.h debug.h +ppd.64.o: ppd.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h array.h +ppd.64.o: ppd.c file.h language.h i18n.h transcode.h debug.h +request.64.o: request.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +request.64.o: request.c array.h file.h language.h i18n.h transcode.h debug.h snprintf.64.o: snprintf.c string.h ../config.h string.64.o: string.c array.h debug.h string.h ../config.h -tempfile.64.o: tempfile.c globals.h string.h ../config.h http-private.h http.h md5.h -tempfile.64.o: tempfile.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -tempfile.64.o: tempfile.c transcode.h debug.h -transcode.64.o: transcode.c globals.h string.h ../config.h http-private.h http.h md5.h -transcode.64.o: transcode.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h -transcode.64.o: transcode.c i18n.h transcode.h debug.h +tempfile.64.o: tempfile.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +tempfile.64.o: tempfile.c array.h file.h language.h i18n.h transcode.h debug.h +transcode.64.o: transcode.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +transcode.64.o: transcode.c array.h file.h language.h i18n.h transcode.h debug.h usersys.64.o: usersys.c http-private.h ../config.h http.h md5.h ipp-private.h ipp.h usersys.64.o: usersys.c globals.h string.h cups.h ppd.h array.h file.h language.h i18n.h usersys.64.o: usersys.c transcode.h -util.64.o: util.c globals.h string.h ../config.h http-private.h http.h md5.h -util.64.o: util.c ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h i18n.h -util.64.o: util.c transcode.h debug.h +util.64.o: util.c globals.h string.h ../config.h cups.h ipp.h http.h md5.h ppd.h +util.64.o: util.c array.h file.h language.h i18n.h transcode.h debug.h testadmin.64.o: testadmin.c adminutil.h cups.h ipp.h http.h md5.h ppd.h array.h file.h testadmin.64.o: testadmin.c language.h string.h ../config.h testarray.64.o: testarray.c ../cups/string.h ../config.h string.h array.h dir.h debug.h diff --git a/cups/Makefile b/cups/Makefile index 2f7955e97..1af69254f 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $" +# "$Id: Makefile 5628 2006-06-05 15:25:23Z mike $" # # API library Makefile for the Common UNIX Printing System (CUPS). # @@ -449,5 +449,5 @@ include Dependencies # -# End of "$Id: Makefile 181 2006-06-22 20:01:18Z jlovell $". +# End of "$Id: Makefile 5628 2006-06-05 15:25:23Z mike $". # diff --git a/cups/adminutil.c b/cups/adminutil.c index 185b90d1d..6848538e2 100644 --- a/cups/adminutil.c +++ b/cups/adminutil.c @@ -1,5 +1,5 @@ /* - * "$Id: adminutil.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: adminutil.c 5638 2006-06-06 20:08:13Z mike $" * * Administration utility API definitions for the Common UNIX Printing * System (CUPS). @@ -1928,5 +1928,5 @@ write_option(cups_file_t *dstfp, /* I - PPD file */ /* - * End of "$Id: adminutil.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: adminutil.c 5638 2006-06-06 20:08:13Z mike $". */ diff --git a/cups/adminutil.h b/cups/adminutil.h index 5752e33f6..8b66d1b8d 100644 --- a/cups/adminutil.h +++ b/cups/adminutil.h @@ -1,5 +1,5 @@ /* - * "$Id: adminutil.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: adminutil.h 5235 2006-03-06 13:02:23Z mike $" * * Administration utility API definitions for the Common UNIX Printing * System (CUPS). @@ -85,5 +85,5 @@ extern int _cupsAdminSetServerSettings(http_t *http, #endif /* !_CUPS_ADMINUTIL_H_ */ /* - * End of "$Id: adminutil.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: adminutil.h 5235 2006-03-06 13:02:23Z mike $". */ diff --git a/cups/api-array.shtml b/cups/api-array.shtml index 7894029e9..433ce5d28 100644 --- a/cups/api-array.shtml +++ b/cups/api-array.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-array.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-array.shtml 5138 2006-02-21 10:49:06Z mike $" Array API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-cups.shtml b/cups/api-cups.shtml index c35dd141c..e53b36ef7 100644 --- a/cups/api-cups.shtml +++ b/cups/api-cups.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-cups.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-cups.shtml 5138 2006-02-21 10:49:06Z mike $" CUPS API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-filedir.shtml b/cups/api-filedir.shtml index 32ea7b8cb..3e6e94433 100644 --- a/cups/api-filedir.shtml +++ b/cups/api-filedir.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-filedir.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-filedir.shtml 5138 2006-02-21 10:49:06Z mike $" File and directory API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-filter.shtml b/cups/api-filter.shtml index 16361025f..66f5e0a09 100644 --- a/cups/api-filter.shtml +++ b/cups/api-filter.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-filter.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-filter.shtml 5138 2006-02-21 10:49:06Z mike $" Filter and backend API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-httpipp.shtml b/cups/api-httpipp.shtml index 7acd6b649..9b860bfd3 100644 --- a/cups/api-httpipp.shtml +++ b/cups/api-httpipp.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-httpipp.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-httpipp.shtml 5138 2006-02-21 10:49:06Z mike $" HTTP and IPP API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/api-ppd.shtml b/cups/api-ppd.shtml index 0d5782ca3..4dcd74909 100644 --- a/cups/api-ppd.shtml +++ b/cups/api-ppd.shtml @@ -1,5 +1,5 @@ <!-- - "$Id: api-ppd.shtml 177 2006-06-21 00:20:03Z jlovell $" + "$Id: api-ppd.shtml 5138 2006-02-21 10:49:06Z mike $" PPD API introduction for the Common UNIX Printing System (CUPS). diff --git a/cups/array.c b/cups/array.c index 9bc1083ab..b05168031 100644 --- a/cups/array.c +++ b/cups/array.c @@ -1,5 +1,5 @@ /* - * "$Id: array.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: array.c 5493 2006-05-05 16:33:57Z mike $" * * Sorted array routines for the Common UNIX Printing System (CUPS). * @@ -962,5 +962,5 @@ cups_array_find(cups_array_t *a, /* I - Array */ /* - * End of "$Id: array.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: array.c 5493 2006-05-05 16:33:57Z mike $". */ diff --git a/cups/array.h b/cups/array.h index bda13c59e..137dd87a2 100644 --- a/cups/array.h +++ b/cups/array.h @@ -1,5 +1,5 @@ /* - * "$Id: array.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: array.h 5258 2006-03-09 15:40:56Z mike $" * * Sorted array definitions for the Common UNIX Printing System (CUPS). * @@ -81,5 +81,5 @@ extern void *cupsArrayUserData(cups_array_t *a); #endif /* !_CUPS_ARRAY_H_ */ /* - * End of "$Id: array.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: array.h 5258 2006-03-09 15:40:56Z mike $". */ diff --git a/cups/attr.c b/cups/attr.c index 76deb6ad3..96b89ea05 100644 --- a/cups/attr.c +++ b/cups/attr.c @@ -1,5 +1,5 @@ /* - * "$Id: attr.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: attr.c 5119 2006-02-16 15:52:06Z mike $" * * PPD model-specific attribute routines for the Common UNIX Printing System * (CUPS). @@ -129,5 +129,5 @@ ppdFindNextAttr(ppd_file_t *ppd, /* I - PPD file data */ /* - * End of "$Id: attr.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: attr.c 5119 2006-02-16 15:52:06Z mike $". */ diff --git a/cups/auth.c b/cups/auth.c index dbdac494a..8f515f8e0 100644 --- a/cups/auth.c +++ b/cups/auth.c @@ -1,5 +1,5 @@ /* - * "$Id: auth.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: auth.c 5559 2006-05-21 13:59:42Z mike $" * * Authentication functions for the Common UNIX Printing System (CUPS). * @@ -249,5 +249,5 @@ cups_local_auth(http_t *http) /* I - HTTP connection to server */ /* - * End of "$Id: auth.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: auth.c 5559 2006-05-21 13:59:42Z mike $". */ diff --git a/cups/backchannel.c b/cups/backchannel.c index 98d660698..09833fe46 100644 --- a/cups/backchannel.c +++ b/cups/backchannel.c @@ -1,5 +1,5 @@ /* - * "$Id: backchannel.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: backchannel.c 5551 2006-05-19 20:20:32Z mike $" * * Backchannel functions for the Common UNIX Printing System (CUPS). * @@ -197,5 +197,5 @@ cups_setup(fd_set *set, /* I - Set for select() */ /* - * End of "$Id: backchannel.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: backchannel.c 5551 2006-05-19 20:20:32Z mike $". */ diff --git a/cups/backend.c b/cups/backend.c index 2d3ef9c17..68d234d12 100644 --- a/cups/backend.c +++ b/cups/backend.c @@ -1,5 +1,5 @@ /* - * "$Id: backend.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: backend.c 5024 2006-01-29 14:58:15Z mike $" * * Backend functions for the Common UNIX Printing System (CUPS). * @@ -63,5 +63,5 @@ cupsBackendDeviceURI(char **argv) /* I - Command-line arguments */ /* - * End of "$Id: backend.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: backend.c 5024 2006-01-29 14:58:15Z mike $". */ diff --git a/cups/backend.h b/cups/backend.h index f35d98c76..ca107c93f 100644 --- a/cups/backend.h +++ b/cups/backend.h @@ -1,5 +1,5 @@ /* - * "$Id: backend.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: backend.h 5023 2006-01-29 14:39:44Z mike $" * * Backend definitions for the Common UNIX Printing System (CUPS). * @@ -53,5 +53,5 @@ extern const char *cupsBackendDeviceURI(char **argv); #endif /* !_CUPS_BACKEND_H_ */ /* - * End of "$Id: backend.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: backend.h 5023 2006-01-29 14:39:44Z mike $". */ diff --git a/cups/cups.h b/cups/cups.h index 60de912ce..64b389a08 100644 --- a/cups/cups.h +++ b/cups/cups.h @@ -1,5 +1,5 @@ /* - * "$Id: cups.h 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: cups.h 5233 2006-03-06 03:39:28Z mike $" * * API definitions for the Common UNIX Printing System (CUPS). * @@ -61,9 +61,9 @@ extern "C" { * Constants... */ -# define CUPS_VERSION 1.0300 +# define CUPS_VERSION 1.0200 # define CUPS_VERSION_MAJOR 1 -# define CUPS_VERSION_MINOR 3 +# define CUPS_VERSION_MINOR 2 # define CUPS_VERSION_PATCH 0 # define CUPS_DATE_ANY -1 @@ -244,5 +244,5 @@ extern cups_file_t *cupsTempFile2(char *filename, int len); #endif /* !_CUPS_CUPS_H_ */ /* - * End of "$Id: cups.h 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: cups.h 5233 2006-03-06 03:39:28Z mike $". */ diff --git a/cups/custom.c b/cups/custom.c index bd7d16633..23008e93c 100644 --- a/cups/custom.c +++ b/cups/custom.c @@ -1,5 +1,5 @@ /* - * "$Id: custom.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: custom.c 5391 2006-04-14 12:26:50Z mike $" * * PPD custom option routines for the Common UNIX Printing System (CUPS). * @@ -123,5 +123,5 @@ ppdNextCustomParam(ppd_coption_t *opt) /* I - Custom option */ /* - * End of "$Id: custom.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: custom.c 5391 2006-04-14 12:26:50Z mike $". */ diff --git a/cups/debug.h b/cups/debug.h index f74358041..65b1fa224 100644 --- a/cups/debug.h +++ b/cups/debug.h @@ -1,5 +1,5 @@ /* - * "$Id: debug.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: debug.h 4493 2005-02-18 02:09:53Z mike $" * * Debugging macros for the Common UNIX Printing System (CUPS). * @@ -55,5 +55,5 @@ #endif /* !_CUPS_DEBUG_H_ */ /* - * End of "$Id: debug.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: debug.h 4493 2005-02-18 02:09:53Z mike $". */ diff --git a/cups/dest.c b/cups/dest.c index fde4b1b77..a91e39847 100644 --- a/cups/dest.c +++ b/cups/dest.c @@ -1,5 +1,5 @@ /* - * "$Id: dest.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: dest.c 5346 2006-03-28 16:05:19Z mike $" * * User-defined destination (and option) support for the Common UNIX * Printing System (CUPS). @@ -1008,5 +1008,5 @@ cups_get_sdests(http_t *http, /* I - HTTP connection */ /* - * End of "$Id: dest.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: dest.c 5346 2006-03-28 16:05:19Z mike $". */ diff --git a/cups/dir.c b/cups/dir.c index f74498b74..e06edea91 100644 --- a/cups/dir.c +++ b/cups/dir.c @@ -1,5 +1,5 @@ /* - * "$Id: dir.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id$" * * Public directory routines for the Common UNIX Printing System (CUPS). * @@ -433,5 +433,5 @@ cupsDirRewind(cups_dir_t *dp) /* I - Directory */ #endif /* WIN32 */ /* - * End of "$Id: dir.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id$". */ diff --git a/cups/dir.h b/cups/dir.h index caa05713e..0fd52e8f1 100644 --- a/cups/dir.h +++ b/cups/dir.h @@ -1,5 +1,5 @@ /* - * "$Id: dir.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id$" * * Public directory definitions for the Common UNIX Printing System (CUPS). * @@ -73,5 +73,5 @@ extern void cupsDirRewind(cups_dir_t *dp); #endif /* !_CUPS_DIR_H_ */ /* - * End of "$Id: dir.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id$". */ diff --git a/cups/emit.c b/cups/emit.c index 31de6960b..6f4dc78de 100644 --- a/cups/emit.c +++ b/cups/emit.c @@ -1,5 +1,5 @@ /* - * "$Id: emit.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: emit.c 5257 2006-03-09 15:27:27Z mike $" * * PPD code emission routines for the Common UNIX Printing System (CUPS). * @@ -917,5 +917,5 @@ ppd_sort(ppd_choice_t **c1, /* I - First choice */ /* - * End of "$Id: emit.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: emit.c 5257 2006-03-09 15:27:27Z mike $". */ diff --git a/cups/encode.c b/cups/encode.c index 9c8bffc0c..a00e2c52a 100644 --- a/cups/encode.c +++ b/cups/encode.c @@ -1,5 +1,5 @@ /* - * "$Id: encode.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: encode.c 5545 2006-05-18 21:00:56Z mike $" * * Option encoding routines for the Common UNIX Printing System (CUPS). * @@ -67,7 +67,6 @@ static const _ipp_option_t ipp_options[] = { "copies", IPP_TAG_INTEGER, IPP_TAG_JOB }, { "copies-default", IPP_TAG_INTEGER, IPP_TAG_PRINTER }, { "document-format", IPP_TAG_MIMETYPE, IPP_TAG_OPERATION }, - { "document-format-default", IPP_TAG_MIMETYPE, IPP_TAG_PRINTER }, { "finishings", IPP_TAG_ENUM, IPP_TAG_JOB }, { "finishings-default", IPP_TAG_ENUM, IPP_TAG_PRINTER }, { "fitplot", IPP_TAG_BOOLEAN, IPP_TAG_JOB }, @@ -89,7 +88,6 @@ static const _ipp_option_t ipp_options[] = { "natural-scaling-default", IPP_TAG_INTEGER, IPP_TAG_PRINTER }, { "notify-charset", IPP_TAG_CHARSET, IPP_TAG_SUBSCRIPTION }, { "notify-events", IPP_TAG_KEYWORD, IPP_TAG_SUBSCRIPTION }, - { "notify-events-default", IPP_TAG_KEYWORD, IPP_TAG_PRINTER }, { "notify-lease-time", IPP_TAG_INTEGER, IPP_TAG_SUBSCRIPTION }, { "notify-natural-language", IPP_TAG_LANGUAGE, IPP_TAG_SUBSCRIPTION }, { "notify-pull-method", IPP_TAG_KEYWORD, IPP_TAG_SUBSCRIPTION }, @@ -561,5 +559,5 @@ compare_ipp_options(_ipp_option_t *a, /* I - First option */ /* - * End of "$Id: encode.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: encode.c 5545 2006-05-18 21:00:56Z mike $". */ diff --git a/cups/file.c b/cups/file.c index 31fd2c233..a5c1372f5 100644 --- a/cups/file.c +++ b/cups/file.c @@ -1,5 +1,5 @@ /* - * "$Id: file.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: file.c 5324 2006-03-23 16:47:46Z mike $" * * File functions for the Common UNIX Printing System (CUPS). * @@ -2080,5 +2080,5 @@ cups_write(cups_file_t *fp, /* I - CUPS file */ /* - * End of "$Id: file.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: file.c 5324 2006-03-23 16:47:46Z mike $". */ diff --git a/cups/file.h b/cups/file.h index cbd2fd40d..24649147b 100644 --- a/cups/file.h +++ b/cups/file.h @@ -1,5 +1,5 @@ /* - * "$Id: file.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: file.h 5319 2006-03-21 15:28:29Z mike $" * * Public file definitions for the Common UNIX Printing System (CUPS). * @@ -109,5 +109,5 @@ extern ssize_t cupsFileWrite(cups_file_t *fp, const char *buf, size_t bytes); #endif /* !_CUPS_FILE_H_ */ /* - * End of "$Id: file.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: file.h 5319 2006-03-21 15:28:29Z mike $". */ diff --git a/cups/getifaddrs.c b/cups/getifaddrs.c index f500c6967..abfd0fac6 100644 --- a/cups/getifaddrs.c +++ b/cups/getifaddrs.c @@ -1,5 +1,5 @@ /* - * "$Id: getifaddrs.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: getifaddrs.c 5504 2006-05-10 18:57:46Z mike $" * * Network interface functions for the Common UNIX Printing System * (CUPS) scheduler. @@ -272,5 +272,5 @@ _cups_freeifaddrs(struct ifaddrs *addrs)/* I - Interface list to free */ /* - * End of "$Id: getifaddrs.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: getifaddrs.c 5504 2006-05-10 18:57:46Z mike $". */ diff --git a/cups/getputfile.c b/cups/getputfile.c index e69b74063..9dc7f7a9c 100644 --- a/cups/getputfile.c +++ b/cups/getputfile.c @@ -1,5 +1,5 @@ /* - * "$Id: getputfile.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: getputfile.c 5235 2006-03-06 13:02:23Z mike $" * * Get/put file functions for the Common UNIX Printing System (CUPS). * @@ -35,8 +35,8 @@ * Include necessary headers... */ -#include "http-private.h" #include "cups.h" +#include "ipp.h" #include "language.h" #include "string.h" #include "debug.h" @@ -488,5 +488,5 @@ cupsPutFile(http_t *http, /* I - HTTP connection to server */ /* - * End of "$Id: getputfile.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: getputfile.c 5235 2006-03-06 13:02:23Z mike $". */ diff --git a/cups/globals.c b/cups/globals.c index c622166b7..b7dbbf348 100644 --- a/cups/globals.c +++ b/cups/globals.c @@ -1,5 +1,5 @@ /* - * "$Id: globals.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: globals.c 5373 2006-04-06 20:03:32Z mike $" * * Global variable access routines for the Common UNIX Printing System (CUPS). * @@ -226,5 +226,5 @@ _cupsGlobals(void) /* - * End of "$Id: globals.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: globals.c 5373 2006-04-06 20:03:32Z mike $". */ diff --git a/cups/globals.h b/cups/globals.h index 8e8156816..819d2bd6f 100644 --- a/cups/globals.h +++ b/cups/globals.h @@ -1,5 +1,5 @@ /* - * "$Id: globals.h 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: globals.h 5366 2006-04-02 16:11:04Z mike $" * * Global variable definitions for the Common UNIX Printing System (CUPS). * @@ -32,7 +32,6 @@ */ # include "string.h" -# include "http-private.h" # include "cups.h" # include "i18n.h" @@ -152,5 +151,5 @@ extern void _cupsSetError(ipp_status_t status, const char *message); #endif /* !_CUPS_GLOBALS_H_ */ /* - * End of "$Id: globals.h 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: globals.h 5366 2006-04-02 16:11:04Z mike $". */ diff --git a/cups/http-addr.c b/cups/http-addr.c index 08e57c625..f0d5fb37e 100644 --- a/cups/http-addr.c +++ b/cups/http-addr.c @@ -1,5 +1,5 @@ /* - * "$Id: http-addr.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: http-addr.c 5443 2006-04-20 14:50:26Z mike $" * * HTTP address routines for the Common UNIX Printing System (CUPS). * @@ -562,5 +562,5 @@ httpGetHostname(http_t *http, /* I - HTTP connection or NULL */ /* - * End of "$Id: http-addr.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: http-addr.c 5443 2006-04-20 14:50:26Z mike $". */ diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c index b0fbb84c0..6700e567d 100644 --- a/cups/http-addrlist.c +++ b/cups/http-addrlist.c @@ -1,5 +1,5 @@ /* - * "$Id: http-addrlist.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: http-addrlist.c 5679 2006-06-20 14:45:15Z mike $" * * HTTP address list routines for the Common UNIX Printing System (CUPS). * @@ -605,5 +605,5 @@ httpAddrGetList(const char *hostname, /* I - Hostname, IP address, or NULL for p /* - * End of "$Id: http-addrlist.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: http-addrlist.c 5679 2006-06-20 14:45:15Z mike $". */ diff --git a/cups/http-private.h b/cups/http-private.h index e54d0dcec..bef934ed9 100644 --- a/cups/http-private.h +++ b/cups/http-private.h @@ -1,5 +1,5 @@ /* - * "$Id: http-private.h 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: http-private.h 5504 2006-05-10 18:57:46Z mike $" * * Private HTTP definitions for the Common UNIX Printing System (CUPS). * @@ -120,55 +120,6 @@ extern OSStatus _httpWriteCDSA(SSLConnectionRef connection, const void *data, size_t *dataLength); # endif /* HAVE_LIBSSL */ - -struct _http_s /**** HTTP connection structure. ****/ -{ - int fd; /* File descriptor for this socket */ - int blocking; /* To block or not to block */ - int error; /* Last error on read */ - time_t activity; /* Time since last read/write */ - http_state_t state; /* State of client */ - http_status_t status; /* Status of last request */ - http_version_t version; /* Protocol version */ - http_keepalive_t keep_alive; /* Keep-alive supported? */ - struct sockaddr_in _hostaddr; /* Address of connected host @deprecated@ */ - char hostname[HTTP_MAX_HOST], - /* Name of connected host */ - fields[HTTP_FIELD_MAX][HTTP_MAX_VALUE]; - /* Field values */ - char *data; /* Pointer to data buffer */ - http_encoding_t data_encoding; /* Chunked or not */ - int _data_remaining;/* Number of bytes left @deprecated@ */ - int used; /* Number of bytes used in buffer */ - char buffer[HTTP_MAX_BUFFER]; - /* Buffer for incoming data */ - int auth_type; /* Authentication in use */ - _cups_md5_state_t md5_state; /* MD5 state */ - char nonce[HTTP_MAX_VALUE]; - /* Nonce value */ - int nonce_count; /* Nonce count */ - void *tls; /* TLS state information */ - http_encryption_t encryption; /* Encryption requirements */ - /**** New in CUPS 1.1.19 ****/ - fd_set *input_set; /* select() set for httpWait() @since CUPS 1.1.19@ */ - http_status_t expect; /* Expect: header @since CUPS 1.1.19@ */ - char *cookie; /* Cookie value(s) @since CUPS 1.1.19@ */ - /**** New in CUPS 1.1.20 ****/ - char authstring[HTTP_MAX_VALUE], - /* Current Authentication value @since CUPS 1.1.20@ */ - userpass[HTTP_MAX_VALUE]; - /* Username:password string @since CUPS 1.1.20@ */ - int digest_tries; /* Number of tries for digest auth @since CUPS 1.1.20@ */ - /**** New in CUPS 1.2 ****/ - off_t data_remaining; /* Number of bytes left @since CUPS 1.2@ */ - http_addr_t *hostaddr; /* Current host address and port @since CUPS 1.2@ */ - http_addrlist_t *addrlist; /* List of valid addresses @since CUPS 1.2@ */ - char wbuffer[HTTP_MAX_BUFFER]; - /* Buffer for outgoing data */ - int wused; /* Write buffer bytes used @since CUPS 1.2@ */ -}; - - /* * Some OS's don't have hstrerror(), most notably Solaris... */ @@ -236,5 +187,5 @@ extern void _cups_freeifaddrs(struct ifaddrs *addrs); #endif /* !_CUPS_HTTP_PRIVATE_H_ */ /* - * End of "$Id: http-private.h 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: http-private.h 5504 2006-05-10 18:57:46Z mike $". */ diff --git a/cups/http-support.c b/cups/http-support.c index 674e0db2c..72bd4bde2 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -1,5 +1,5 @@ /* - * "$Id: http-support.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: http-support.c 5360 2006-03-30 17:02:17Z mike $" * * HTTP support routines for the Common UNIX Printing System (CUPS) scheduler. * @@ -1316,5 +1316,5 @@ http_copy_encode(char *dst, /* O - Destination buffer */ /* - * End of "$Id: http-support.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: http-support.c 5360 2006-03-30 17:02:17Z mike $". */ diff --git a/cups/http.c b/cups/http.c index 01706d264..e864c18c4 100644 --- a/cups/http.c +++ b/cups/http.c @@ -1,5 +1,5 @@ /* - * "$Id: http.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: http.c 5630 2006-06-05 18:42:53Z mike $" * * HTTP routines for the Common UNIX Printing System (CUPS). * @@ -2801,5 +2801,5 @@ http_write_ssl(http_t *http, /* I - HTTP connection */ /* - * End of "$Id: http.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: http.c 5630 2006-06-05 18:42:53Z mike $". */ diff --git a/cups/http.h b/cups/http.h index 426da806b..937b94fa0 100644 --- a/cups/http.h +++ b/cups/http.h @@ -1,5 +1,5 @@ /* - * "$Id: http.h 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: http.h 5632 2006-06-06 14:46:10Z mike $" * * Hyper-Text Transport Protocol definitions for the Common UNIX Printing * System (CUPS). @@ -320,7 +320,60 @@ typedef struct http_addrlist_s /**** Socket address list, which is http_addr_t addr; /* Address */ } http_addrlist_t; -typedef struct _http_s http_t; /**** HTTP connection type ****/ +typedef struct _http_s /**** HTTP connection structure. ****/ +{ + /* + * DO NOT ACCESS MEMBERS OF THIS STRUCTURE DIRECTLY; INSTEAD, USE THE + * PROVIDED APIS FOR ACCESSING THE VALUES INSTEAD. + * + * This structure definition will be removed from the public headers in + * CUPS 1.3. + */ + + int fd; /* File descriptor for this socket */ + int blocking; /* To block or not to block */ + int error; /* Last error on read */ + time_t activity; /* Time since last read/write */ + http_state_t state; /* State of client */ + http_status_t status; /* Status of last request */ + http_version_t version; /* Protocol version */ + http_keepalive_t keep_alive; /* Keep-alive supported? */ + struct sockaddr_in _hostaddr; /* Address of connected host @deprecated@ */ + char hostname[HTTP_MAX_HOST], + /* Name of connected host */ + fields[HTTP_FIELD_MAX][HTTP_MAX_VALUE]; + /* Field values */ + char *data; /* Pointer to data buffer */ + http_encoding_t data_encoding; /* Chunked or not */ + int _data_remaining;/* Number of bytes left @deprecated@ */ + int used; /* Number of bytes used in buffer */ + char buffer[HTTP_MAX_BUFFER]; + /* Buffer for incoming data */ + int auth_type; /* Authentication in use */ + _cups_md5_state_t md5_state; /* MD5 state */ + char nonce[HTTP_MAX_VALUE]; + /* Nonce value */ + int nonce_count; /* Nonce count */ + void *tls; /* TLS state information */ + http_encryption_t encryption; /* Encryption requirements */ + /**** New in CUPS 1.1.19 ****/ + fd_set *input_set; /* select() set for httpWait() @since CUPS 1.1.19@ */ + http_status_t expect; /* Expect: header @since CUPS 1.1.19@ */ + char *cookie; /* Cookie value(s) @since CUPS 1.1.19@ */ + /**** New in CUPS 1.1.20 ****/ + char authstring[HTTP_MAX_VALUE], + /* Current Authentication value @since CUPS 1.1.20@ */ + userpass[HTTP_MAX_VALUE]; + /* Username:password string @since CUPS 1.1.20@ */ + int digest_tries; /* Number of tries for digest auth @since CUPS 1.1.20@ */ + /**** New in CUPS 1.2 ****/ + off_t data_remaining; /* Number of bytes left @since CUPS 1.2@ */ + http_addr_t *hostaddr; /* Current host address and port @since CUPS 1.2@ */ + http_addrlist_t *addrlist; /* List of valid addresses @since CUPS 1.2@ */ + char wbuffer[HTTP_MAX_BUFFER]; + /* Buffer for outgoing data */ + int wused; /* Write buffer bytes used @since CUPS 1.2@ */ +} http_t; /* @@ -451,5 +504,5 @@ extern ssize_t httpWrite2(http_t *http, const char *buffer, #endif /* !_CUPS_HTTP_H_ */ /* - * End of "$Id: http.h 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: http.h 5632 2006-06-06 14:46:10Z mike $". */ diff --git a/cups/i18n.h b/cups/i18n.h index d3001065b..58de0eae5 100644 --- a/cups/i18n.h +++ b/cups/i18n.h @@ -1,5 +1,5 @@ /* - * "$Id: i18n.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: i18n.h 5366 2006-04-02 16:11:04Z mike $" * * (Private) localization support for the Common UNIX Printing System (CUPS). * @@ -113,5 +113,5 @@ extern const char *_cupsMessageLookup(cups_array_t *a, const char *m); #endif /* !_CUPS_I18N_H_ */ /* - * End of "$Id: i18n.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: i18n.h 5366 2006-04-02 16:11:04Z mike $". */ diff --git a/cups/ipp-private.h b/cups/ipp-private.h index 25eabecbe..af303f1da 100644 --- a/cups/ipp-private.h +++ b/cups/ipp-private.h @@ -1,5 +1,5 @@ /* - * "$Id: ipp-private.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ipp-private.h 5230 2006-03-05 17:01:51Z mike $" * * Private IPP definitions for the Common UNIX Printing System (CUPS). * @@ -61,5 +61,5 @@ extern void _ippFreeAttr(ipp_attribute_t *); #endif /* !_CUPS_IPP_H_ */ /* - * End of "$Id: ipp-private.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ipp-private.h 5230 2006-03-05 17:01:51Z mike $". */ diff --git a/cups/ipp-support.c b/cups/ipp-support.c index 585818fa2..fef06af1c 100644 --- a/cups/ipp-support.c +++ b/cups/ipp-support.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp-support.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ipp-support.c 5246 2006-03-08 13:22:09Z mike $" * * Internet Printing Protocol support functions for the Common UNIX * Printing System (CUPS). @@ -333,5 +333,5 @@ ippSetPort(int p) /* I - Port number to use */ /* - * End of "$Id: ipp-support.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ipp-support.c 5246 2006-03-08 13:22:09Z mike $". */ diff --git a/cups/ipp.c b/cups/ipp.c index 3786b60d9..148fc702d 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -1,5 +1,5 @@ /* - * "$Id: ipp.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: ipp.c 5624 2006-06-02 15:15:23Z mike $" * * Internet Printing Protocol support functions for the Common UNIX * Printing System (CUPS). @@ -2824,5 +2824,5 @@ _ipp_free_attr(ipp_attribute_t *attr) /* I - Attribute to free */ /* - * End of "$Id: ipp.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: ipp.c 5624 2006-06-02 15:15:23Z mike $". */ diff --git a/cups/ipp.h b/cups/ipp.h index 11426a3de..6435a0eca 100644 --- a/cups/ipp.h +++ b/cups/ipp.h @@ -1,5 +1,5 @@ /* - * "$Id: ipp.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ipp.h 5138 2006-02-21 10:49:06Z mike $" * * Internet Printing Protocol definitions for the Common UNIX Printing * System (CUPS). @@ -497,5 +497,5 @@ extern ipp_state_t ippWriteIO(void *dst, ipp_iocb_t cb, int blocking, #endif /* !_CUPS_IPP_H_ */ /* - * End of "$Id: ipp.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ipp.h 5138 2006-02-21 10:49:06Z mike $". */ diff --git a/cups/langprintf.c b/cups/langprintf.c index f4fa589ca..4430c6792 100644 --- a/cups/langprintf.c +++ b/cups/langprintf.c @@ -1,5 +1,5 @@ /* - * "$Id: langprintf.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: langprintf.c 4924 2006-01-13 01:55:20Z mike $" * * Localized printf/puts functions for the Common UNIX Printing * System (CUPS). @@ -139,5 +139,5 @@ _cupsLangPuts(FILE *fp, /* I - File to write to */ /* - * End of "$Id: langprintf.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: langprintf.c 4924 2006-01-13 01:55:20Z mike $". */ diff --git a/cups/language.c b/cups/language.c index 0a2668225..6990d9127 100644 --- a/cups/language.c +++ b/cups/language.c @@ -1,5 +1,5 @@ /* - * "$Id: language.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: language.c 5373 2006-04-06 20:03:32Z mike $" * * I18N/language support for the Common UNIX Printing System (CUPS). * @@ -1295,5 +1295,5 @@ cups_unquote(char *d, /* O - Unquoted string */ /* - * End of "$Id: language.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: language.c 5373 2006-04-06 20:03:32Z mike $". */ diff --git a/cups/language.h b/cups/language.h index f21a59387..94f7bf81a 100644 --- a/cups/language.h +++ b/cups/language.h @@ -1,5 +1,5 @@ /* - * "$Id: language.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: language.h 5085 2006-02-06 13:27:53Z mike $" * * Multi-language support for the Common UNIX Printing System (CUPS). * @@ -119,5 +119,5 @@ extern cups_lang_t *cupsLangGet(const char *language); #endif /* !_CUPS_LANGUAGE_H_ */ /* - * End of "$Id: language.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: language.h 5085 2006-02-06 13:27:53Z mike $". */ diff --git a/cups/localize.c b/cups/localize.c index b738e4d36..b07609bbb 100644 --- a/cups/localize.c +++ b/cups/localize.c @@ -1,5 +1,5 @@ /* - * "$Id: localize.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: localize.c 5391 2006-04-14 12:26:50Z mike $" * * PPD custom option routines for the Common UNIX Printing System (CUPS). * @@ -185,5 +185,5 @@ ppd_text(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: localize.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: localize.c 5391 2006-04-14 12:26:50Z mike $". */ diff --git a/cups/mark.c b/cups/mark.c index 274e13745..3b2226774 100644 --- a/cups/mark.c +++ b/cups/mark.c @@ -1,5 +1,5 @@ /* - * "$Id: mark.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: mark.c 5529 2006-05-15 20:06:46Z mike $" * * Option marking routines for the Common UNIX Printing System (CUPS). * @@ -679,5 +679,5 @@ ppd_defaults(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: mark.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: mark.c 5529 2006-05-15 20:06:46Z mike $". */ diff --git a/cups/md5-apple.h b/cups/md5-apple.h index a49912e99..4284ad4ab 100644 --- a/cups/md5-apple.h +++ b/cups/md5-apple.h @@ -1,5 +1,5 @@ /* - * "$Id: md5-apple.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: md5-apple.h 5232 2006-03-05 17:59:19Z mike $" * * MD5 MacOS X compatibility header for the Common UNIX Printing * System (CUPS). @@ -35,5 +35,5 @@ void md5_finish(_cups_md5_state_t *pms, unsigned char digest[16]) { _cupsMD5Finish(pms, digest); } /* - * End of "$Id: md5-apple.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: md5-apple.h 5232 2006-03-05 17:59:19Z mike $". */ diff --git a/cups/md5.c b/cups/md5.c index 5c2b8488e..9a3fab987 100644 --- a/cups/md5.c +++ b/cups/md5.c @@ -26,7 +26,7 @@ ghost@aladdin.com */ -/*$Id: md5.c 177 2006-06-21 00:20:03Z jlovell $ */ +/*$Id: md5.c 5232 2006-03-05 17:59:19Z mike $ */ /* Independent implementation of MD5 (RFC 1321). diff --git a/cups/md5.h b/cups/md5.h index 407afdb20..3b0281c0f 100644 --- a/cups/md5.h +++ b/cups/md5.h @@ -26,7 +26,7 @@ ghost@aladdin.com */ -/*$Id: md5.h 177 2006-06-21 00:20:03Z jlovell $ */ +/*$Id: md5.h 5232 2006-03-05 17:59:19Z mike $ */ /* Independent implementation of MD5 (RFC 1321). diff --git a/cups/md5passwd.c b/cups/md5passwd.c index 29b288b96..df8a75881 100644 --- a/cups/md5passwd.c +++ b/cups/md5passwd.c @@ -1,5 +1,5 @@ /* - * "$Id: md5passwd.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: md5passwd.c 5232 2006-03-05 17:59:19Z mike $" * * MD5 password support for the Common UNIX Printing System (CUPS). * @@ -147,5 +147,5 @@ httpMD5String(const unsigned char *sum, /* I - MD5 sum data */ /* - * End of "$Id: md5passwd.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: md5passwd.c 5232 2006-03-05 17:59:19Z mike $". */ diff --git a/cups/notify.c b/cups/notify.c index cc40183f5..2a89aca3c 100644 --- a/cups/notify.c +++ b/cups/notify.c @@ -1,5 +1,5 @@ /* - * "$Id: notify.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: notify.c 4961 2006-01-20 22:19:13Z mike $" * * Notification routines for the Common UNIX Printing System (CUPS). * @@ -207,5 +207,5 @@ cupsNotifyText(cups_lang_t *lang, /* I - Language data */ /* - * End of "$Id: notify.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: notify.c 4961 2006-01-20 22:19:13Z mike $". */ diff --git a/cups/options.c b/cups/options.c index f90285656..e232caaad 100644 --- a/cups/options.c +++ b/cups/options.c @@ -1,5 +1,5 @@ /* - * "$Id: options.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: options.c 5151 2006-02-22 22:43:17Z mike $" * * Option routines for the Common UNIX Printing System (CUPS). * @@ -634,5 +634,5 @@ cupsRemoveOption( /* - * End of "$Id: options.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: options.c 5151 2006-02-22 22:43:17Z mike $". */ diff --git a/cups/page.c b/cups/page.c index 66036fc3f..f8b79832f 100644 --- a/cups/page.c +++ b/cups/page.c @@ -1,5 +1,5 @@ /* - * "$Id: page.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: page.c 5549 2006-05-19 19:39:28Z mike $" * * Page size functions for the Common UNIX Printing System (CUPS). * @@ -193,5 +193,5 @@ ppdPageLength(ppd_file_t *ppd, /* I - PPD file */ /* - * End of "$Id: page.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: page.c 5549 2006-05-19 19:39:28Z mike $". */ diff --git a/cups/ppd.c b/cups/ppd.c index ff68d4c77..540b14a8d 100644 --- a/cups/ppd.c +++ b/cups/ppd.c @@ -1,5 +1,5 @@ /* - * "$Id: ppd.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ppd.c 5333 2006-03-24 00:52:21Z mike $" * * PPD file routines for the Common UNIX Printing System (CUPS). * @@ -2938,5 +2938,5 @@ ppd_read(cups_file_t *fp, /* I - File to read from */ /* - * End of "$Id: ppd.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ppd.c 5333 2006-03-24 00:52:21Z mike $". */ diff --git a/cups/ppd.h b/cups/ppd.h index 8f1e3cb93..d7688c3d5 100644 --- a/cups/ppd.h +++ b/cups/ppd.h @@ -1,5 +1,5 @@ /* - * "$Id: ppd.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: ppd.h 5238 2006-03-07 04:41:42Z mike $" * * PostScript Printer Description definitions for the Common UNIX Printing * System (CUPS). @@ -405,5 +405,5 @@ extern ppd_file_t *ppdOpen2(cups_file_t *fp); #endif /* !_CUPS_PPD_H_ */ /* - * End of "$Id: ppd.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: ppd.h 5238 2006-03-07 04:41:42Z mike $". */ diff --git a/cups/request.c b/cups/request.c index ccdfc0e42..329cce881 100644 --- a/cups/request.c +++ b/cups/request.c @@ -1,5 +1,5 @@ /* - * "$Id: request.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: request.c 5555 2006-05-20 13:35:58Z mike $" * * IPP utilities for the Common UNIX Printing System (CUPS). * @@ -479,5 +479,5 @@ _cupsSetError(ipp_status_t status, /* I - IPP status code */ /* - * End of "$Id: request.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: request.c 5555 2006-05-20 13:35:58Z mike $". */ diff --git a/cups/snprintf.c b/cups/snprintf.c index 5a3cb764b..683551b05 100644 --- a/cups/snprintf.c +++ b/cups/snprintf.c @@ -1,5 +1,5 @@ /* - * "$Id: snprintf.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: snprintf.c 5529 2006-05-15 20:06:46Z mike $" * * snprintf functions for the Common UNIX Printing System (CUPS). * @@ -368,6 +368,6 @@ _cups_snprintf(char *buffer, /* O - Output buffer */ /* - * End of "$Id: snprintf.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: snprintf.c 5529 2006-05-15 20:06:46Z mike $". */ diff --git a/cups/string.c b/cups/string.c index a7fa441a1..733304a82 100644 --- a/cups/string.c +++ b/cups/string.c @@ -1,5 +1,5 @@ /* - * "$Id: string.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: string.c 5368 2006-04-02 19:23:50Z mike $" * * String functions for the Common UNIX Printing System (CUPS). * @@ -702,5 +702,5 @@ compare_sp_items(_cups_sp_item_t *a, /* I - First item */ /* - * End of "$Id: string.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: string.c 5368 2006-04-02 19:23:50Z mike $". */ diff --git a/cups/string.h b/cups/string.h index 76955c665..79ebd774b 100644 --- a/cups/string.h +++ b/cups/string.h @@ -1,5 +1,5 @@ /* - * "$Id: string.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: string.h 5466 2006-04-26 19:52:27Z mike $" * * String definitions for the Common UNIX Printing System (CUPS). * @@ -158,5 +158,5 @@ extern double _cupsStrScand(const char *buf, char **bufptr, #endif /* !_CUPS_STRING_H_ */ /* - * End of "$Id: string.h 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: string.h 5466 2006-04-26 19:52:27Z mike $". */ diff --git a/cups/tempfile.c b/cups/tempfile.c index 27c96b71b..0e64565b0 100644 --- a/cups/tempfile.c +++ b/cups/tempfile.c @@ -1,5 +1,5 @@ /* - * "$Id: tempfile.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: tempfile.c 4918 2006-01-12 05:14:40Z mike $" * * Temp file utilities for the Common UNIX Printing System (CUPS). * @@ -236,5 +236,5 @@ cupsTempFile2(char *filename, /* I - Pointer to buffer */ /* - * End of "$Id: tempfile.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: tempfile.c 4918 2006-01-12 05:14:40Z mike $". */ diff --git a/cups/test.ppd b/cups/test.ppd index bf3fa47eb..bdcdc9971 100644 --- a/cups/test.ppd +++ b/cups/test.ppd @@ -1,6 +1,6 @@ *PPD-Adobe: "4.3" *% -*% "$Id: test.ppd 177 2006-06-21 00:20:03Z jlovell $" +*% "$Id: test.ppd 5372 2006-04-05 18:25:34Z mike $" *% *% Test PPD file for the Common UNIX Printing System (CUPS). *% @@ -185,5 +185,5 @@ *Font ZapfChancery-MediumItalic: Standard "(001.007S)" Standard ROM *Font ZapfDingbats: Special "(001.004S)" Standard ROM *% -*% End of "$Id: test.ppd 177 2006-06-21 00:20:03Z jlovell $". +*% End of "$Id: test.ppd 5372 2006-04-05 18:25:34Z mike $". *% diff --git a/cups/testadmin.c b/cups/testadmin.c index 4a927a892..0f2e1d0c2 100644 --- a/cups/testadmin.c +++ b/cups/testadmin.c @@ -1,5 +1,5 @@ /* - * "$Id: testadmin.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testadmin.c 5240 2006-03-07 21:55:29Z mike $" * * Admin function test program for the Common UNIX Printing System (CUPS). * @@ -125,5 +125,5 @@ show_settings( /* - * End of "$Id: testadmin.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testadmin.c 5240 2006-03-07 21:55:29Z mike $". */ diff --git a/cups/testarray.c b/cups/testarray.c index 57d5d9d6a..912035d51 100644 --- a/cups/testarray.c +++ b/cups/testarray.c @@ -1,5 +1,5 @@ /* - * "$Id: testarray.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testarray.c 5258 2006-03-09 15:40:56Z mike $" * * Array test program for the Common UNIX Printing System (CUPS). * @@ -525,5 +525,5 @@ load_words(const char *filename, /* I - File to load */ /* - * End of "$Id: testarray.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testarray.c 5258 2006-03-09 15:40:56Z mike $". */ diff --git a/cups/testfile.c b/cups/testfile.c index 56f4d5a63..7bd0c2b14 100644 --- a/cups/testfile.c +++ b/cups/testfile.c @@ -1,5 +1,5 @@ /* - * "$Id: testfile.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testfile.c 5194 2006-02-27 20:57:07Z mike $" * * File test program for the Common UNIX Printing System (CUPS). * @@ -444,5 +444,5 @@ read_write_tests(int compression) /* I - Use compression? */ /* - * End of "$Id: testfile.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testfile.c 5194 2006-02-27 20:57:07Z mike $". */ diff --git a/cups/testhttp.c b/cups/testhttp.c index 10bb92145..1ef498e33 100644 --- a/cups/testhttp.c +++ b/cups/testhttp.c @@ -1,5 +1,5 @@ /* - * "$Id: testhttp.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: testhttp.c 5679 2006-06-20 14:45:15Z mike $" * * HTTP test program for the Common UNIX Printing System (CUPS). * @@ -531,5 +531,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testhttp.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: testhttp.c 5679 2006-06-20 14:45:15Z mike $". */ diff --git a/cups/testi18n.c b/cups/testi18n.c index 8628ab2c0..0fc439793 100644 --- a/cups/testi18n.c +++ b/cups/testi18n.c @@ -1,5 +1,5 @@ /* - * "$Id: testi18n.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testi18n.c 5444 2006-04-20 18:16:54Z mike $" * * Internationalization test for Common UNIX Printing System (CUPS). * @@ -556,5 +556,5 @@ print_utf8(const char *msg, /* I - Message String */ /* - * End of "$Id: testi18n.c 177 2006-06-21 00:20:03Z jlovell $" + * End of "$Id: testi18n.c 5444 2006-04-20 18:16:54Z mike $" */ diff --git a/cups/testipp.c b/cups/testipp.c index f8db35d1f..07bcdffc0 100644 --- a/cups/testipp.c +++ b/cups/testipp.c @@ -1,5 +1,5 @@ /* - * "$Id: testipp.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testipp.c 5023 2006-01-29 14:39:44Z mike $" * * IPP test program for the Common UNIX Printing System (CUPS). * @@ -645,5 +645,5 @@ write_cb(void *data, /* I - Data */ /* - * End of "$Id: testipp.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testipp.c 5023 2006-01-29 14:39:44Z mike $". */ diff --git a/cups/testlang.c b/cups/testlang.c index 9b12838d2..f41408b03 100644 --- a/cups/testlang.c +++ b/cups/testlang.c @@ -1,5 +1,5 @@ /* - * "$Id: testlang.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: testlang.c 4903 2006-01-10 20:02:46Z mike $" * * Localization test program for the Common UNIX Printing System (CUPS). * @@ -85,5 +85,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testlang.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: testlang.c 4903 2006-01-10 20:02:46Z mike $". */ diff --git a/cups/testppd.c b/cups/testppd.c index 4fec1ce2d..7e59a4276 100644 --- a/cups/testppd.c +++ b/cups/testppd.c @@ -1,5 +1,5 @@ /* - * "$Id: testppd.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: testppd.c 5484 2006-05-02 20:38:12Z mike $" * * PPD test program for the Common UNIX Printing System (CUPS). * @@ -59,39 +59,6 @@ static const char *default_code = "%%BeginFeature: *InputSlot Tray\n" "InputSlot=Tray\n" "%%EndFeature\n" - "} stopped cleartomark\n" - "[{\n" - "%%BeginFeature: *IntOption None\n" - "%%EndFeature\n" - "} stopped cleartomark\n" - "[{\n" - "%%BeginFeature: *StringOption None\n" - "%%EndFeature\n" - "} stopped cleartomark\n"; - -static const char *custom_code = - "[{\n" - "%%BeginFeature: *CustomPageSize True\n" - "500\n" - "400\n" - "0\n" - "0\n" - "0\n" - "PageSize=Custom\n" - "%%EndFeature\n" - "} stopped cleartomark\n" - "[{\n" - "%%BeginFeature: *InputSlot Tray\n" - "InputSlot=Tray\n" - "%%EndFeature\n" - "} stopped cleartomark\n" - "[{\n" - "%%BeginFeature: *IntOption None\n" - "%%EndFeature\n" - "} stopped cleartomark\n" - "[{\n" - "%%BeginFeature: *StringOption None\n" - "%%EndFeature\n" "} stopped cleartomark\n"; @@ -140,7 +107,7 @@ main(int argc, /* I - Number of command-line arguments */ printf("FAIL (%d conflicts)\n", conflicts); } - fputs("ppdEmitString (defaults): ", stdout); + fputs("ppdEmitString: ", stdout); if ((s = ppdEmitString(ppd, PPD_ORDER_ANY, 0.0)) != NULL && !strcmp(s, default_code)) puts("PASS"); @@ -156,24 +123,6 @@ main(int argc, /* I - Number of command-line arguments */ if (s) free(s); - fputs("ppdEmitString (custom size): ", stdout); - ppdMarkOption(ppd, "PageSize", "Custom.400x500"); - - if ((s = ppdEmitString(ppd, PPD_ORDER_ANY, 0.0)) != NULL && - !strcmp(s, custom_code)) - puts("PASS"); - else - { - printf("FAIL (%d bytes instead of %d)\n", s ? (int)strlen(s) : 0, - (int)strlen(custom_code)); - - if (s) - puts(s); - } - - if (s) - free(s); - ppdClose(ppd); } else @@ -223,5 +172,5 @@ main(int argc, /* I - Number of command-line arguments */ /* - * End of "$Id: testppd.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: testppd.c 5484 2006-05-02 20:38:12Z mike $". */ diff --git a/cups/transcode.c b/cups/transcode.c index 8bc4c1c02..c7384d9cb 100644 --- a/cups/transcode.c +++ b/cups/transcode.c @@ -1,5 +1,5 @@ /* - * "$Id: transcode.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: transcode.c 5373 2006-04-06 20:03:32Z mike $" * * Transcoding support for the Common UNIX Printing System (CUPS). * @@ -1585,5 +1585,5 @@ get_vbcs_charmap( /* - * End of "$Id: transcode.c 177 2006-06-21 00:20:03Z jlovell $" + * End of "$Id: transcode.c 5373 2006-04-06 20:03:32Z mike $" */ diff --git a/cups/transcode.h b/cups/transcode.h index dd8c1d13f..c867b37e2 100644 --- a/cups/transcode.h +++ b/cups/transcode.h @@ -1,5 +1,5 @@ /* - * "$Id: transcode.h 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: transcode.h 5294 2006-03-15 21:09:32Z mike $" * * Transcoding definitions for the Common UNIX Printing System (CUPS). * @@ -84,5 +84,5 @@ extern int cupsUTF32ToUTF8(cups_utf8_t *dest, /* - * End of "$Id: transcode.h 177 2006-06-21 00:20:03Z jlovell $" + * End of "$Id: transcode.h 5294 2006-03-15 21:09:32Z mike $" */ diff --git a/cups/usersys.c b/cups/usersys.c index 14141cc9c..b75dc3790 100644 --- a/cups/usersys.c +++ b/cups/usersys.c @@ -1,5 +1,5 @@ /* - * "$Id: usersys.c 177 2006-06-21 00:20:03Z jlovell $" + * "$Id: usersys.c 5182 2006-02-26 04:10:27Z mike $" * * User, system, and password routines for the Common UNIX Printing * System (CUPS). @@ -484,5 +484,5 @@ cups_open_client_conf(void) /* - * End of "$Id: usersys.c 177 2006-06-21 00:20:03Z jlovell $". + * End of "$Id: usersys.c 5182 2006-02-26 04:10:27Z mike $". */ diff --git a/cups/util.c b/cups/util.c index 42aa4622d..988a3e43d 100644 --- a/cups/util.c +++ b/cups/util.c @@ -1,5 +1,5 @@ /* - * "$Id: util.c 181 2006-06-22 20:01:18Z jlovell $" + * "$Id: util.c 5663 2006-06-15 20:36:42Z mike $" * * Printing utilities for the Common UNIX Printing System (CUPS). * @@ -1652,5 +1652,5 @@ cups_get_printer_uri( /* - * End of "$Id: util.c 181 2006-06-22 20:01:18Z jlovell $". + * End of "$Id: util.c 5663 2006-06-15 20:36:42Z mike $". */ |