Merge CUPS 1.4svn-r7588 (dependency updates, compiler warnings, and one web UI buglet)

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@774 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/backend/Dependencies b/backend/Dependencies
index 3925daacd9aa1f3e6664a8d055ef78cbefbf4eb9..ecd5b130f679043ec36d27589e40d51a96db90cf 100644 (file)
--- a/backend/Dependencies
+++ b/backend/Dependencies
@@ -2,67 +2,72 @@
 
 ipp.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/versioning.h
 ipp.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h backend-private.h
-ipp.o: ../cups/backend.h ../cups/sidechannel.h ../cups/cups.h ../cups/ppd.h
-ipp.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-ipp.o: ../cups/i18n.h ../cups/transcode.h ../cups/snmp-private.h
-ipp.o: ../cups/string.h
+ipp.o: ../cups/backend.h ../cups/sidechannel.h ../cups/ppd-private.h
+ipp.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+ipp.o: ../cups/language.h ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
+ipp.o: ../cups/snmp-private.h ../cups/string.h
 lpd.o: ../cups/http-private.h ../config.h ../cups/http.h ../cups/versioning.h
 lpd.o: ../cups/md5.h ../cups/ipp-private.h ../cups/ipp.h backend-private.h
-lpd.o: ../cups/backend.h ../cups/sidechannel.h ../cups/cups.h ../cups/ppd.h
-lpd.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-lpd.o: ../cups/i18n.h ../cups/transcode.h ../cups/snmp-private.h
-lpd.o: ../cups/string.h
+lpd.o: ../cups/backend.h ../cups/sidechannel.h ../cups/ppd-private.h
+lpd.o: ../cups/cups.h ../cups/ppd.h ../cups/array.h ../cups/file.h
+lpd.o: ../cups/language.h ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
+lpd.o: ../cups/snmp-private.h ../cups/string.h
 mdns.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-mdns.o: ../cups/sidechannel.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-mdns.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-mdns.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
-mdns.o: ../cups/snmp-private.h ../cups/string.h ../config.h ../cups/array.h
+mdns.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+mdns.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+mdns.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
+mdns.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
+mdns.o: ../config.h ../cups/array.h
 pap.o: ../config.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 pap.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 pap.o: ../cups/language.h ../cups/backend.h ../cups/sidechannel.h
 pap.o: ../cups/i18n.h ../cups/transcode.h
 parallel.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-parallel.o: ../cups/sidechannel.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-parallel.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-parallel.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
-parallel.o: ../cups/snmp-private.h ../cups/string.h ../config.h
+parallel.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+parallel.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+parallel.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
+parallel.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
+parallel.o: ../config.h
 scsi.o: ../cups/backend.h ../cups/versioning.h ../cups/cups.h ../cups/ipp.h
 scsi.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 scsi.o: ../cups/language.h ../cups/i18n.h ../cups/transcode.h
 scsi.o: ../cups/string.h ../config.h
 serial.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-serial.o: ../cups/sidechannel.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-serial.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-serial.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
-serial.o: ../cups/snmp-private.h ../cups/string.h ../config.h
+serial.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+serial.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+serial.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
+serial.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
+serial.o: ../config.h
 snmp.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-snmp.o: ../cups/sidechannel.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
-snmp.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
-snmp.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
-snmp.o: ../cups/snmp-private.h ../cups/string.h ../config.h ../cups/array.h
-snmp.o: ../cups/file.h ../cups/http-private.h ../cups/md5.h
-snmp.o: ../cups/ipp-private.h
+snmp.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+snmp.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+snmp.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
+snmp.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
+snmp.o: ../config.h ../cups/array.h ../cups/file.h ../cups/http-private.h
+snmp.o: ../cups/md5.h ../cups/ipp-private.h
 socket.o: ../cups/http-private.h ../config.h ../cups/http.h
 socket.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
 socket.o: ../cups/ipp.h backend-private.h ../cups/backend.h
-socket.o: ../cups/sidechannel.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
-socket.o: ../cups/file.h ../cups/language.h ../cups/debug.h ../cups/i18n.h
-socket.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
+socket.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+socket.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+socket.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
+socket.o: ../cups/snmp-private.h ../cups/string.h
 test1284.o: ../cups/string.h ../config.h ieee1284.c backend-private.h
 test1284.o: ../cups/backend.h ../cups/versioning.h ../cups/sidechannel.h
-test1284.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
-test1284.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/debug.h
-test1284.o: ../cups/i18n.h ../cups/transcode.h ../cups/snmp-private.h
+test1284.o: ../cups/ppd-private.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
+test1284.o: ../cups/ppd.h ../cups/array.h ../cups/file.h ../cups/language.h
+test1284.o: ../cups/debug.h ../cups/i18n.h ../cups/transcode.h
+test1284.o: ../cups/snmp-private.h
 testbackend.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
 testbackend.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h
 testbackend.o: ../cups/array.h ../cups/file.h ../cups/language.h
 testbackend.o: ../cups/sidechannel.h
 testsupplies.o: backend-private.h ../cups/backend.h ../cups/versioning.h
-testsupplies.o: ../cups/sidechannel.h ../cups/cups.h ../cups/ipp.h
-testsupplies.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
-testsupplies.o: ../cups/language.h ../cups/debug.h ../cups/i18n.h
-testsupplies.o: ../cups/transcode.h ../cups/snmp-private.h ../cups/string.h
-testsupplies.o: ../config.h
+testsupplies.o: ../cups/sidechannel.h ../cups/ppd-private.h ../cups/cups.h
+testsupplies.o: ../cups/ipp.h ../cups/http.h ../cups/ppd.h ../cups/array.h
+testsupplies.o: ../cups/file.h ../cups/language.h ../cups/debug.h
+testsupplies.o: ../cups/i18n.h ../cups/transcode.h ../cups/snmp-private.h
+testsupplies.o: ../cups/string.h ../config.h
 usb.o: ../cups/backend.h ../cups/versioning.h ../cups/cups.h ../cups/ipp.h
 usb.o: ../cups/http.h ../cups/ppd.h ../cups/array.h ../cups/file.h
 usb.o: ../cups/language.h ../cups/string.h ../config.h ../cups/i18n.h

diff --git a/backend/backend-private.h b/backend/backend-private.h
index 1b2204aadd78d5dc03e2c6de997b6a1e008c24a2..84feb6b6a6075a60e13d1a60e94afbae67770051 100644 (file)
--- a/backend/backend-private.h
+++ b/backend/backend-private.h
@@ -25,7 +25,7 @@
 
 #  include <cups/backend.h>
 #  include <cups/sidechannel.h>
-#  include <cups/cups.h>
+#  include <cups/ppd-private.h>
 #  include <cups/debug.h>
 #  include <cups/i18n.h>
 #  include <cups/snmp-private.h>

diff --git a/cups/Dependencies b/cups/Dependencies
index eb3def7ea29743d7e7c6ab119e626aee8eeb3901..733948c3a4d9150b08d75fb6acb96ba48a48eb87 100644 (file)
--- a/cups/Dependencies
+++ b/cups/Dependencies
@@ -4,13 +4,16 @@ adminutil.o: adminutil.h cups.h ipp.h http.h versioning.h ppd.h array.h
 adminutil.o: file.h language.h globals.h string.h ../config.h http-private.h
 adminutil.o: md5.h ipp-private.h i18n.h transcode.h debug.h
 array.o: array.h versioning.h string.h ../config.h debug.h
-attr.o: ppd.h array.h versioning.h file.h debug.h string.h ../config.h
+attr.o: ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
+attr.o: language.h debug.h string.h ../config.h
 auth.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 auth.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
 auth.o: i18n.h transcode.h debug.h
 backchannel.o: cups.h ipp.h http.h versioning.h ppd.h array.h file.h
 backchannel.o: language.h
-backend.o: backend.h versioning.h string.h ../config.h
+backend.o: backend.h versioning.h globals.h string.h ../config.h
+backend.o: http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h
+backend.o: array.h file.h language.h i18n.h transcode.h
 custom.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 custom.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
 custom.o: i18n.h transcode.h debug.h
@@ -85,7 +88,7 @@ request.o: i18n.h transcode.h debug.h
 sidechannel.o: sidechannel.h versioning.h string.h ../config.h
 snmp.o: globals.h string.h ../config.h http-private.h http.h versioning.h
 snmp.o: md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-snmp.o: i18n.h transcode.h snmp-private.h
+snmp.o: i18n.h transcode.h debug.h snmp-private.h
 snprintf.o: string.h ../config.h
 string.o: array.h versioning.h debug.h string.h ../config.h
 tempfile.o: globals.h string.h ../config.h http-private.h http.h versioning.h
@@ -122,13 +125,16 @@ adminutil.32.o: adminutil.c  adminutil.h cups.h ipp.h http.h versioning.h ppd.h
 adminutil.32.o: adminutil.c  file.h language.h globals.h string.h ../config.h http-private.h
 adminutil.32.o: adminutil.c  md5.h ipp-private.h i18n.h transcode.h debug.h
 array.32.o: array.c  array.h versioning.h string.h ../config.h debug.h
-attr.32.o: attr.c  ppd.h array.h versioning.h file.h debug.h string.h ../config.h
+attr.32.o: attr.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
+attr.32.o: attr.c  language.h debug.h string.h ../config.h
 auth.32.o: auth.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 auth.32.o: auth.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
 auth.32.o: auth.c  i18n.h transcode.h debug.h
 backchannel.32.o: backchannel.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h
 backchannel.32.o: backchannel.c  language.h
-backend.32.o: backend.c  backend.h versioning.h string.h ../config.h
+backend.32.o: backend.c  backend.h versioning.h globals.h string.h ../config.h
+backend.32.o: backend.c  http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h
+backend.32.o: backend.c  array.h file.h language.h i18n.h transcode.h
 custom.32.o: custom.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 custom.32.o: custom.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
 custom.32.o: custom.c  i18n.h transcode.h debug.h
@@ -203,7 +209,7 @@ request.32.o: request.c  i18n.h transcode.h debug.h
 sidechannel.32.o: sidechannel.c  sidechannel.h versioning.h string.h ../config.h
 snmp.32.o: snmp.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 snmp.32.o: snmp.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-snmp.32.o: snmp.c  i18n.h transcode.h snmp-private.h
+snmp.32.o: snmp.c  i18n.h transcode.h debug.h snmp-private.h
 snprintf.32.o: snprintf.c  string.h ../config.h
 string.32.o: string.c  array.h versioning.h debug.h string.h ../config.h
 tempfile.32.o: tempfile.c  globals.h string.h ../config.h http-private.h http.h versioning.h
@@ -240,13 +246,16 @@ adminutil.64.o: adminutil.c  adminutil.h cups.h ipp.h http.h versioning.h ppd.h
 adminutil.64.o: adminutil.c  file.h language.h globals.h string.h ../config.h http-private.h
 adminutil.64.o: adminutil.c  md5.h ipp-private.h i18n.h transcode.h debug.h
 array.64.o: array.c  array.h versioning.h string.h ../config.h debug.h
-attr.64.o: attr.c  ppd.h array.h versioning.h file.h debug.h string.h ../config.h
+attr.64.o: attr.c  ppd-private.h cups.h ipp.h http.h versioning.h ppd.h array.h file.h
+attr.64.o: attr.c  language.h debug.h string.h ../config.h
 auth.64.o: auth.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 auth.64.o: auth.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
 auth.64.o: auth.c  i18n.h transcode.h debug.h
 backchannel.64.o: backchannel.c  cups.h ipp.h http.h versioning.h ppd.h array.h file.h
 backchannel.64.o: backchannel.c  language.h
-backend.64.o: backend.c  backend.h versioning.h string.h ../config.h
+backend.64.o: backend.c  backend.h versioning.h globals.h string.h ../config.h
+backend.64.o: backend.c  http-private.h http.h md5.h ipp-private.h ipp.h cups.h ppd.h
+backend.64.o: backend.c  array.h file.h language.h i18n.h transcode.h
 custom.64.o: custom.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 custom.64.o: custom.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
 custom.64.o: custom.c  i18n.h transcode.h debug.h
@@ -321,7 +330,7 @@ request.64.o: request.c  i18n.h transcode.h debug.h
 sidechannel.64.o: sidechannel.c  sidechannel.h versioning.h string.h ../config.h
 snmp.64.o: snmp.c  globals.h string.h ../config.h http-private.h http.h versioning.h
 snmp.64.o: snmp.c  md5.h ipp-private.h ipp.h cups.h ppd.h array.h file.h language.h
-snmp.64.o: snmp.c  i18n.h transcode.h snmp-private.h
+snmp.64.o: snmp.c  i18n.h transcode.h debug.h snmp-private.h
 snprintf.64.o: snprintf.c  string.h ../config.h
 string.64.o: string.c  array.h versioning.h debug.h string.h ../config.h
 tempfile.64.o: tempfile.c  globals.h string.h ../config.h http-private.h http.h versioning.h

diff --git a/driver/Dependencies b/driver/Dependencies
index f067c209206c5af27707d755ed6f59fc3e8ea130..2ff3e43900159ecb645c5d9fd612b60ee28e32c1 100644 (file)
--- a/driver/Dependencies
+++ b/driver/Dependencies
@@ -15,11 +15,11 @@ rastertoescpx.o: ../cups/string.h ../config.h ../data/escp.h
 rastertopclx.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 rastertopclx.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 rastertopclx.o: ../cups/file.h ../cups/language.h ../cups/raster.h
-rastertopclx.o: pcl-common.h ../data/pcl.h
+rastertopclx.o: pcl-common.h ../cups/string.h ../config.h ../data/pcl.h
 pcl-common.o: driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 pcl-common.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 pcl-common.o: ../cups/file.h ../cups/language.h ../cups/raster.h pcl-common.h
-pcl-common.o: ../data/pcl.h
+pcl-common.o: ../cups/string.h ../config.h ../data/pcl.h
 testcmyk.o: ../cups/string.h ../config.h driver.h ../cups/cups.h
 testcmyk.o: ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
 testcmyk.o: ../cups/array.h ../cups/file.h ../cups/language.h
@@ -72,11 +72,11 @@ rastertoescpx.32.o: rastertoescpx.c  ../cups/string.h ../config.h ../data/escp.h
 rastertopclx.32.o: rastertopclx.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 rastertopclx.32.o: rastertopclx.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 rastertopclx.32.o: rastertopclx.c  ../cups/file.h ../cups/language.h ../cups/raster.h
-rastertopclx.32.o: rastertopclx.c  pcl-common.h ../data/pcl.h
+rastertopclx.32.o: rastertopclx.c  pcl-common.h ../cups/string.h ../config.h ../data/pcl.h
 pcl-common.32.o: pcl-common.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 pcl-common.32.o: pcl-common.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 pcl-common.32.o: pcl-common.c  ../cups/file.h ../cups/language.h ../cups/raster.h pcl-common.h
-pcl-common.32.o: pcl-common.c  ../data/pcl.h
+pcl-common.32.o: pcl-common.c  ../cups/string.h ../config.h ../data/pcl.h
 testcmyk.32.o: testcmyk.c  ../cups/string.h ../config.h driver.h ../cups/cups.h
 testcmyk.32.o: testcmyk.c  ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
 testcmyk.32.o: testcmyk.c  ../cups/array.h ../cups/file.h ../cups/language.h
@@ -129,11 +129,11 @@ rastertoescpx.64.o: rastertoescpx.c  ../cups/string.h ../config.h ../data/escp.h
 rastertopclx.64.o: rastertopclx.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 rastertopclx.64.o: rastertopclx.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 rastertopclx.64.o: rastertopclx.c  ../cups/file.h ../cups/language.h ../cups/raster.h
-rastertopclx.64.o: rastertopclx.c  pcl-common.h ../data/pcl.h
+rastertopclx.64.o: rastertopclx.c  pcl-common.h ../cups/string.h ../config.h ../data/pcl.h
 pcl-common.64.o: pcl-common.c  driver.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 pcl-common.64.o: pcl-common.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 pcl-common.64.o: pcl-common.c  ../cups/file.h ../cups/language.h ../cups/raster.h pcl-common.h
-pcl-common.64.o: pcl-common.c  ../data/pcl.h
+pcl-common.64.o: pcl-common.c  ../cups/string.h ../config.h ../data/pcl.h
 testcmyk.64.o: testcmyk.c  ../cups/string.h ../config.h driver.h ../cups/cups.h
 testcmyk.64.o: testcmyk.c  ../cups/ipp.h ../cups/http.h ../cups/versioning.h ../cups/ppd.h
 testcmyk.64.o: testcmyk.c  ../cups/array.h ../cups/file.h ../cups/language.h

diff --git a/filter/Dependencies b/filter/Dependencies
index dee74c3c36aa249755fcee31cef10d4ba11ba0c5..75cf78cb08f4875380cbee79a1d1f36f5b014448 100644 (file)
--- a/filter/Dependencies
+++ b/filter/Dependencies
@@ -110,6 +110,10 @@ form-tree.o: form.h common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 form-tree.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 form-tree.o: ../cups/file.h ../cups/language.h ../cups/language.h
 form-tree.o: ../cups/string.h ../config.h
+commandtops.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h
+commandtops.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+commandtops.o: ../cups/file.h ../cups/language.h ../cups/string.h ../config.h
+commandtops.o: ../cups/sidechannel.h
 gziptoany.o: ../cups/file.h ../cups/versioning.h ../cups/string.h ../config.h
 gziptoany.o: ../cups/i18n.h ../cups/transcode.h ../cups/language.h
 gziptoany.o: ../cups/array.h
@@ -279,6 +283,10 @@ form-tree.32.o: form-tree.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cup
 form-tree.32.o: form-tree.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 form-tree.32.o: form-tree.c  ../cups/file.h ../cups/language.h ../cups/language.h
 form-tree.32.o: form-tree.c  ../cups/string.h ../config.h
+commandtops.32.o: commandtops.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h
+commandtops.32.o: commandtops.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+commandtops.32.o: commandtops.c  ../cups/file.h ../cups/language.h ../cups/string.h ../config.h
+commandtops.32.o: commandtops.c  ../cups/sidechannel.h
 gziptoany.32.o: gziptoany.c  ../cups/file.h ../cups/versioning.h ../cups/string.h ../config.h
 gziptoany.32.o: gziptoany.c  ../cups/i18n.h ../cups/transcode.h ../cups/language.h
 gziptoany.32.o: gziptoany.c  ../cups/array.h
@@ -448,6 +456,10 @@ form-tree.64.o: form-tree.c  form.h common.h ../cups/cups.h ../cups/ipp.h ../cup
 form-tree.64.o: form-tree.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 form-tree.64.o: form-tree.c  ../cups/file.h ../cups/language.h ../cups/language.h
 form-tree.64.o: form-tree.c  ../cups/string.h ../config.h
+commandtops.64.o: commandtops.c  ../cups/cups.h ../cups/ipp.h ../cups/http.h
+commandtops.64.o: commandtops.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
+commandtops.64.o: commandtops.c  ../cups/file.h ../cups/language.h ../cups/string.h ../config.h
+commandtops.64.o: commandtops.c  ../cups/sidechannel.h
 gziptoany.64.o: gziptoany.c  ../cups/file.h ../cups/versioning.h ../cups/string.h ../config.h
 gziptoany.64.o: gziptoany.c  ../cups/i18n.h ../cups/transcode.h ../cups/language.h
 gziptoany.64.o: gziptoany.c  ../cups/array.h

diff --git a/scheduler/Dependencies b/scheduler/Dependencies
index 02b8c6261e110f1dbbcdd3c98b7c835f9b112ada..e98ab6128efd653a389078edfa27b5268034800f 100644 (file)
--- a/scheduler/Dependencies
+++ b/scheduler/Dependencies
@@ -79,7 +79,7 @@ ipp.o: ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cups/ipp.h
 ipp.o: ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h
 ipp.o: ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h
 ipp.o: printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
-ipp.o: subscriptions.h ../cups/ppd-private.h
+ipp.o: subscriptions.h ../cups/ppd-private.h ../cups/cups.h
 listen.o: cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
 listen.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
 listen.o: ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
@@ -213,7 +213,7 @@ cups-driverd.o: util.h ../cups/cups.h ../cups/ipp.h ../cups/http.h
 cups-driverd.o: ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 cups-driverd.o: ../cups/file.h ../cups/language.h ../cups/file.h
 cups-driverd.o: ../cups/string.h ../config.h ../cups/dir.h
-cups-driverd.o: ../cups/transcode.h
+cups-driverd.o: ../cups/transcode.h ../cups/ppd-private.h ../cups/cups.h
 cups-lpd.o: ../cups/http-private.h ../config.h ../cups/http.h
 cups-lpd.o: ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
 cups-lpd.o: ../cups/ipp.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
@@ -322,7 +322,7 @@ ipp.32.o: ipp.c  ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cup
 ipp.32.o: ipp.c  ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h
 ipp.32.o: ipp.c  ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h
 ipp.32.o: ipp.c  printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
-ipp.32.o: ipp.c  subscriptions.h ../cups/ppd-private.h
+ipp.32.o: ipp.c  subscriptions.h ../cups/ppd-private.h ../cups/cups.h
 listen.32.o: listen.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
 listen.32.o: listen.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
 listen.32.o: listen.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
@@ -456,7 +456,7 @@ cups-driverd.32.o: cups-driverd.c  util.h ../cups/cups.h ../cups/ipp.h ../cups/h
 cups-driverd.32.o: cups-driverd.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 cups-driverd.32.o: cups-driverd.c  ../cups/file.h ../cups/language.h ../cups/file.h
 cups-driverd.32.o: cups-driverd.c  ../cups/string.h ../config.h ../cups/dir.h
-cups-driverd.32.o: cups-driverd.c  ../cups/transcode.h
+cups-driverd.32.o: cups-driverd.c  ../cups/transcode.h ../cups/ppd-private.h ../cups/cups.h
 cups-lpd.32.o: cups-lpd.c  ../cups/http-private.h ../config.h ../cups/http.h
 cups-lpd.32.o: cups-lpd.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
 cups-lpd.32.o: cups-lpd.c  ../cups/ipp.h ../cups/cups.h ../cups/ppd.h ../cups/array.h
@@ -565,7 +565,7 @@ ipp.64.o: ipp.c  ../cups/array.h ../cups/file.h ../cups/language.h mime.h ../cup
 ipp.64.o: ipp.c  ../cups/file.h ../cups/http.h ../cups/i18n.h ../cups/transcode.h
 ipp.64.o: ipp.c  ../cups/debug.h sysman.h statbuf.h cert.h auth.h client.h policy.h
 ipp.64.o: ipp.c  printers.h classes.h job.h conf.h banners.h dirsvc.h network.h
-ipp.64.o: ipp.c  subscriptions.h ../cups/ppd-private.h
+ipp.64.o: ipp.c  subscriptions.h ../cups/ppd-private.h ../cups/cups.h
 listen.64.o: listen.c  cupsd.h ../cups/http-private.h ../config.h ../cups/http.h
 listen.64.o: listen.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
 listen.64.o: listen.c  ../cups/ipp.h ../cups/string.h ../cups/array.h ../cups/cups.h
@@ -699,7 +699,7 @@ cups-driverd.64.o: cups-driverd.c  util.h ../cups/cups.h ../cups/ipp.h ../cups/h
 cups-driverd.64.o: cups-driverd.c  ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 cups-driverd.64.o: cups-driverd.c  ../cups/file.h ../cups/language.h ../cups/file.h
 cups-driverd.64.o: cups-driverd.c  ../cups/string.h ../config.h ../cups/dir.h
-cups-driverd.64.o: cups-driverd.c  ../cups/transcode.h
+cups-driverd.64.o: cups-driverd.c  ../cups/transcode.h ../cups/ppd-private.h ../cups/cups.h
 cups-lpd.64.o: cups-lpd.c  ../cups/http-private.h ../config.h ../cups/http.h
 cups-lpd.64.o: cups-lpd.c  ../cups/versioning.h ../cups/md5.h ../cups/ipp-private.h
 cups-lpd.64.o: cups-lpd.c  ../cups/ipp.h ../cups/cups.h ../cups/ppd.h ../cups/array.h

diff --git a/scheduler/client.c b/scheduler/client.c
index 136b1f4fc826994954479b4954059c0dacbb2317..bd45262cf19ea5e80bfcaba224ec55b1eb563933 100644 (file)
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -2782,7 +2782,10 @@ cupsdWriteClient(cupsd_client_t *con)    /* I - Client connection */
         return;
       }
       else if (bytes == 0)
+      {
         con->http.activity = time(NULL);
+        return;
+      }
     }
 
     if (bytes > 0)

diff --git a/scheduler/job.c b/scheduler/job.c
index 85427be64b1bf097a8444f85814cabe7333574a9..a9c7bc29328ce6fe0f5ccc23a9fa3b206c532b13 100644 (file)
--- a/scheduler/job.c
+++ b/scheduler/job.c
@@ -3837,7 +3837,7 @@ update_job(cupsd_job_t *job)              /* I - Job to check */
               sizeof(job->printer->state_message));
       cupsdAddPrinterHistory(job->printer);
 
-      if (loglevel < CUPSD_LOG_INFO)
+      if (loglevel <= CUPSD_LOG_INFO)
         event |= CUPSD_EVENT_PRINTER_STATE;
 
       update_job_attrs(job);

diff --git a/systemv/Dependencies b/systemv/Dependencies
index 7e2c8c5d662f472e3280be1acb3eab859f5c77df..69e3912b924f3bfae87fa7682cc618cdf1f6595e 100644 (file)
--- a/systemv/Dependencies
+++ b/systemv/Dependencies
@@ -23,8 +23,8 @@ cupstestdsc.o: ../cups/file.h ../cups/i18n.h ../cups/transcode.h
 cupstestppd.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
 cupstestppd.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h
 cupstestppd.o: ../cups/array.h ../cups/file.h ../cups/language.h
-cupstestppd.o: ../cups/ppd-private.h ../cups/i18n.h ../cups/transcode.h
-cupstestppd.o: ../cups/raster.h
+cupstestppd.o: ../cups/ppd-private.h ../cups/cups.h ../cups/i18n.h
+cupstestppd.o: ../cups/transcode.h ../cups/raster.h
 lp.o: ../cups/string.h ../config.h ../cups/cups.h ../cups/ipp.h
 lp.o: ../cups/http.h ../cups/versioning.h ../cups/ppd.h ../cups/array.h
 lp.o: ../cups/file.h ../cups/language.h ../cups/i18n.h ../cups/transcode.h