summaryrefslogtreecommitdiff
path: root/ppdc
diff options
context:
space:
mode:
Diffstat (limited to 'ppdc')
-rw-r--r--ppdc/Dependencies229
-rw-r--r--ppdc/ppdc-file.cxx11
-rw-r--r--ppdc/ppdc-source.cxx9
-rw-r--r--ppdc/ppdc.h5
4 files changed, 136 insertions, 118 deletions
diff --git a/ppdc/Dependencies b/ppdc/Dependencies
index 8d49d584..72feab0d 100644
--- a/ppdc/Dependencies
+++ b/ppdc/Dependencies
@@ -4,155 +4,166 @@ ppdc-array.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-array.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-array.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h
ppdc-array.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
-ppdc-array.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
-ppdc-array.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
-ppdc-array.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-ppdc-array.o: ../cups/language-private.h ../cups/transcode.h
+ppdc-array.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h
+ppdc-array.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+ppdc-array.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+ppdc-array.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
ppdc-array.o: ../cups/thread-private.h
ppdc-attr.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-attr.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-attr.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h
ppdc-attr.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
-ppdc-attr.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
-ppdc-attr.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
-ppdc-attr.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-ppdc-attr.o: ../cups/language-private.h ../cups/transcode.h
+ppdc-attr.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h
+ppdc-attr.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+ppdc-attr.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+ppdc-attr.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
ppdc-attr.o: ../cups/thread-private.h
ppdc-catalog.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-catalog.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-catalog.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-catalog.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-catalog.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-catalog.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-catalog.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-catalog.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-catalog.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-catalog.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-catalog.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-catalog.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-catalog.o: ../cups/language-private.h ../cups/transcode.h
ppdc-catalog.o: ../cups/thread-private.h
ppdc-choice.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-choice.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-choice.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-choice.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-choice.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-choice.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-choice.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-choice.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-choice.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-choice.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-choice.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-choice.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-choice.o: ../cups/language-private.h ../cups/transcode.h
ppdc-choice.o: ../cups/thread-private.h
ppdc-constraint.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-constraint.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-constraint.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-constraint.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-constraint.o: ../cups/debug-private.h ../cups/ppd-private.h
-ppdc-constraint.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
-ppdc-constraint.o: ../cups/http-private.h ../cups/http.h
-ppdc-constraint.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-ppdc-constraint.o: ../cups/language-private.h ../cups/transcode.h
-ppdc-constraint.o: ../cups/thread-private.h
+ppdc-constraint.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-constraint.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-constraint.o: ../cups/pwg-private.h ../cups/http-private.h
+ppdc-constraint.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+ppdc-constraint.o: ../cups/ipp.h ../cups/language-private.h
+ppdc-constraint.o: ../cups/transcode.h ../cups/thread-private.h
ppdc-driver.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-driver.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-driver.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-driver.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-driver.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-driver.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-driver.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-driver.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-driver.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-driver.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-driver.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-driver.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-driver.o: ../cups/language-private.h ../cups/transcode.h
ppdc-driver.o: ../cups/thread-private.h
ppdc-file.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-file.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-file.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h
ppdc-file.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
-ppdc-file.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
-ppdc-file.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
-ppdc-file.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-ppdc-file.o: ../cups/language-private.h ../cups/transcode.h
+ppdc-file.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h
+ppdc-file.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+ppdc-file.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+ppdc-file.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
ppdc-file.o: ../cups/thread-private.h
ppdc-filter.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-filter.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-filter.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-filter.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-filter.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-filter.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-filter.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-filter.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-filter.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-filter.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-filter.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-filter.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-filter.o: ../cups/language-private.h ../cups/transcode.h
ppdc-filter.o: ../cups/thread-private.h
ppdc-font.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-font.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-font.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h
ppdc-font.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
-ppdc-font.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
-ppdc-font.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
-ppdc-font.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-ppdc-font.o: ../cups/language-private.h ../cups/transcode.h
+ppdc-font.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h
+ppdc-font.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+ppdc-font.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+ppdc-font.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
ppdc-font.o: ../cups/thread-private.h
ppdc-group.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-group.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-group.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h
ppdc-group.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
-ppdc-group.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
-ppdc-group.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
-ppdc-group.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-ppdc-group.o: ../cups/language-private.h ../cups/transcode.h
+ppdc-group.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h
+ppdc-group.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+ppdc-group.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+ppdc-group.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
ppdc-group.o: ../cups/thread-private.h
ppdc-import.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-import.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-import.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-import.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-import.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-import.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-import.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-import.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-import.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-import.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-import.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-import.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-import.o: ../cups/language-private.h ../cups/transcode.h
ppdc-import.o: ../cups/thread-private.h
ppdc-mediasize.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-mediasize.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-mediasize.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-mediasize.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-mediasize.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-mediasize.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-mediasize.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-mediasize.o: ../cups/ipp.h ../cups/language-private.h
-ppdc-mediasize.o: ../cups/transcode.h ../cups/thread-private.h
+ppdc-mediasize.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-mediasize.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-mediasize.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-mediasize.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-mediasize.o: ../cups/language-private.h ../cups/transcode.h
+ppdc-mediasize.o: ../cups/thread-private.h
ppdc-message.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-message.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-message.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-message.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-message.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-message.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-message.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-message.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-message.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-message.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-message.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-message.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-message.o: ../cups/language-private.h ../cups/transcode.h
ppdc-message.o: ../cups/thread-private.h
ppdc-option.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-option.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-option.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-option.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-option.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-option.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-option.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-option.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-option.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-option.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-option.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-option.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-option.o: ../cups/language-private.h ../cups/transcode.h
ppdc-option.o: ../cups/thread-private.h
ppdc-profile.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-profile.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-profile.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-profile.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-profile.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-profile.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-profile.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-profile.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-profile.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-profile.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-profile.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-profile.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-profile.o: ../cups/language-private.h ../cups/transcode.h
ppdc-profile.o: ../cups/thread-private.h
ppdc-shared.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-shared.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-shared.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-shared.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-shared.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-shared.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-shared.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-shared.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-shared.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-shared.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-shared.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-shared.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-shared.o: ../cups/language-private.h ../cups/transcode.h
ppdc-shared.o: ../cups/thread-private.h
ppdc-source.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-source.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-source.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-source.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-source.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-source.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-source.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-source.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-source.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-source.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-source.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-source.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-source.o: ../cups/language-private.h ../cups/transcode.h
ppdc-source.o: ../cups/thread-private.h ../cups/raster.h ../cups/ppd.h
ppdc-source.o: ../data/epson.h ../data/escp.h ../data/hp.h ../data/label.h
ppdc-source.o: ../data/pcl.h
@@ -160,79 +171,83 @@ ppdc-string.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-string.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-string.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-string.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-string.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-string.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-string.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-string.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-string.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-string.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-string.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-string.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-string.o: ../cups/language-private.h ../cups/transcode.h
ppdc-string.o: ../cups/thread-private.h
ppdc-variable.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc-variable.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdc-variable.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
ppdc-variable.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdc-variable.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdc-variable.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdc-variable.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdc-variable.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdc-variable.o: ../cups/debug-private.h ../cups/versioning.h
+ppdc-variable.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdc-variable.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdc-variable.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdc-variable.o: ../cups/language-private.h ../cups/transcode.h
ppdc-variable.o: ../cups/thread-private.h
genstrings.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
genstrings.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
genstrings.o: ../cups/ipp.h ../cups/http.h ../cups/array.h ../cups/language.h
genstrings.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
-genstrings.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
-genstrings.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
-genstrings.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-genstrings.o: ../cups/language-private.h ../cups/transcode.h
+genstrings.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h
+genstrings.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+genstrings.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+genstrings.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
genstrings.o: ../cups/thread-private.h
ppdc.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdc.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h
ppdc.o: ../cups/http.h ../cups/array.h ../cups/language.h
ppdc.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
-ppdc.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
-ppdc.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
-ppdc.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-ppdc.o: ../cups/language-private.h ../cups/transcode.h
+ppdc.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h
+ppdc.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+ppdc.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+ppdc.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
ppdc.o: ../cups/thread-private.h
ppdhtml.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdhtml.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h
ppdhtml.o: ../cups/http.h ../cups/array.h ../cups/language.h
ppdhtml.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
-ppdhtml.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
-ppdhtml.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
-ppdhtml.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-ppdhtml.o: ../cups/language-private.h ../cups/transcode.h
+ppdhtml.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h
+ppdhtml.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+ppdhtml.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+ppdhtml.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
ppdhtml.o: ../cups/thread-private.h
ppdi.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdi.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h
ppdi.o: ../cups/http.h ../cups/array.h ../cups/language.h
ppdi.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
-ppdi.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
-ppdi.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
-ppdi.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-ppdi.o: ../cups/language-private.h ../cups/transcode.h
+ppdi.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h
+ppdi.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+ppdi.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+ppdi.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
ppdi.o: ../cups/thread-private.h
ppdmerge.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
ppdmerge.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/array.h
ppdmerge.o: ../cups/language.h ../cups/string-private.h ../config.h
-ppdmerge.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-ppdmerge.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-ppdmerge.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-ppdmerge.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+ppdmerge.o: ../cups/debug-private.h ../cups/versioning.h
+ppdmerge.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+ppdmerge.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+ppdmerge.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+ppdmerge.o: ../cups/language-private.h ../cups/transcode.h
ppdmerge.o: ../cups/thread-private.h ../cups/ppd-private.h ../cups/array.h
ppdpo.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
ppdpo.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h ../cups/ipp.h
ppdpo.o: ../cups/http.h ../cups/array.h ../cups/language.h
ppdpo.o: ../cups/string-private.h ../config.h ../cups/debug-private.h
-ppdpo.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
-ppdpo.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
-ppdpo.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
-ppdpo.o: ../cups/language-private.h ../cups/transcode.h
+ppdpo.o: ../cups/versioning.h ../cups/ppd-private.h ../cups/ppd.h
+ppdpo.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+ppdpo.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+ppdpo.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
ppdpo.o: ../cups/thread-private.h
testcatalog.o: ppdc-private.h ppdc.h ../cups/file.h ../cups/versioning.h
testcatalog.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
testcatalog.o: ../cups/ipp.h ../cups/http.h ../cups/array.h
testcatalog.o: ../cups/language.h ../cups/string-private.h ../config.h
-testcatalog.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-testcatalog.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-testcatalog.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-testcatalog.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+testcatalog.o: ../cups/debug-private.h ../cups/versioning.h
+testcatalog.o: ../cups/ppd-private.h ../cups/ppd.h ../cups/cups.h
+testcatalog.o: ../cups/pwg-private.h ../cups/http-private.h ../cups/http.h
+testcatalog.o: ../cups/md5-private.h ../cups/ipp-private.h ../cups/ipp.h
+testcatalog.o: ../cups/language-private.h ../cups/transcode.h
testcatalog.o: ../cups/thread-private.h
diff --git a/ppdc/ppdc-file.cxx b/ppdc/ppdc-file.cxx
index 55ccd0c4..0e373f9e 100644
--- a/ppdc/ppdc-file.cxx
+++ b/ppdc/ppdc-file.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc-file.cxx 9384 2010-11-22 07:06:39Z mike $"
+// "$Id: ppdc-file.cxx 10338 2012-03-07 06:05:39Z mike $"
//
// File class for the CUPS PPD Compiler.
//
@@ -42,8 +42,9 @@ ppdcFile::ppdcFile(const char *f, // I - File to open
else
fp = cupsFileOpen(f, "r");
- filename = f;
- line = 1;
+ close_on_delete = !ffp;
+ filename = f;
+ line = 1;
if (!fp)
_cupsLangPrintf(stderr, _("ppdc: Unable to open %s: %s"), f,
@@ -57,7 +58,7 @@ ppdcFile::ppdcFile(const char *f, // I - File to open
ppdcFile::~ppdcFile()
{
- if (fp)
+ if (close_on_delete && fp)
cupsFileClose(fp);
}
@@ -105,5 +106,5 @@ ppdcFile::peek()
//
-// End of "$Id: ppdc-file.cxx 9384 2010-11-22 07:06:39Z mike $".
+// End of "$Id: ppdc-file.cxx 10338 2012-03-07 06:05:39Z mike $".
//
diff --git a/ppdc/ppdc-source.cxx b/ppdc/ppdc-source.cxx
index 868433cd..17aadabf 100644
--- a/ppdc/ppdc-source.cxx
+++ b/ppdc/ppdc-source.cxx
@@ -1,9 +1,9 @@
//
-// "$Id: ppdc-source.cxx 9985 2011-09-09 18:02:30Z mike $"
+// "$Id: ppdc-source.cxx 10379 2012-03-23 22:16:22Z mike $"
//
// Source class for the CUPS PPD Compiler.
//
-// Copyright 2007-2011 by Apple Inc.
+// Copyright 2007-2012 by Apple Inc.
// Copyright 2002-2007 by Easy Software Products.
//
// These coded instructions, statements, and computer programs are the
@@ -1340,7 +1340,8 @@ ppdcSource::get_integer(const char *v) // I - Value string
// NAME logicop value
for (newv = (char *)v + 1;
*newv && (isalnum(*newv & 255) || *newv == '_');
- newv ++);
+ newv ++)
+ /* do nothing */;
ch = *newv;
*newv = '\0';
@@ -3906,5 +3907,5 @@ ppdcSource::write_file(const char *f) // I - File to write
//
-// End of "$Id: ppdc-source.cxx 9985 2011-09-09 18:02:30Z mike $".
+// End of "$Id: ppdc-source.cxx 10379 2012-03-23 22:16:22Z mike $".
//
diff --git a/ppdc/ppdc.h b/ppdc/ppdc.h
index 11055d3a..121274a7 100644
--- a/ppdc/ppdc.h
+++ b/ppdc/ppdc.h
@@ -1,5 +1,5 @@
//
-// "$Id: ppdc.h 8698 2009-06-05 20:49:06Z mike $"
+// "$Id: ppdc.h 10338 2012-03-07 06:05:39Z mike $"
//
// Definitions for the CUPS PPD Compiler.
//
@@ -447,6 +447,7 @@ class ppdcFile //// File
{
public:
+ bool close_on_delete; // Close file on delete?
cups_file_t *fp; // File pointer
const char *filename; // Filename
int line; // Line in file
@@ -528,5 +529,5 @@ class ppdcSource //// Source File
#endif // !_PPDC_H_
//
-// End of "$Id: ppdc.h 8698 2009-06-05 20:49:06Z mike $".
+// End of "$Id: ppdc.h 10338 2012-03-07 06:05:39Z mike $".
//