Imported Upstream version 1.5.3upstream/1.5.3

2 files changed, 25 insertions, 24 deletions

diff --git a/berkeley/Dependencies b/berkeley/Dependencies
index de9ba979..9d43ccaf 100644
--- a/berkeley/Dependencies
+++ b/berkeley/Dependencies
@@ -3,32 +3,32 @@
 lpc.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 lpc.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
 lpc.o: ../cups/language.h ../cups/string-private.h ../config.h
-lpc.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-lpc.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-lpc.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-lpc.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-lpc.o: ../cups/thread-private.h
+lpc.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
+lpc.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
+lpc.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+lpc.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+lpc.o: ../cups/transcode.h ../cups/thread-private.h
 lpq.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 lpq.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
 lpq.o: ../cups/language.h ../cups/string-private.h ../config.h
-lpq.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-lpq.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-lpq.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-lpq.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-lpq.o: ../cups/thread-private.h
+lpq.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
+lpq.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
+lpq.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+lpq.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+lpq.o: ../cups/transcode.h ../cups/thread-private.h
 lpr.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 lpr.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
 lpr.o: ../cups/language.h ../cups/string-private.h ../config.h
-lpr.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-lpr.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-lpr.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-lpr.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-lpr.o: ../cups/thread-private.h
+lpr.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
+lpr.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
+lpr.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+lpr.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+lpr.o: ../cups/transcode.h ../cups/thread-private.h
 lprm.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
 lprm.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
 lprm.o: ../cups/language.h ../cups/string-private.h ../config.h
-lprm.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
-lprm.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
-lprm.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
-lprm.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
-lprm.o: ../cups/thread-private.h
+lprm.o: ../cups/debug-private.h ../cups/versioning.h ../cups/ppd-private.h
+lprm.o: ../cups/ppd.h ../cups/cups.h ../cups/pwg-private.h
+lprm.o: ../cups/http-private.h ../cups/http.h ../cups/md5-private.h
+lprm.o: ../cups/ipp-private.h ../cups/ipp.h ../cups/language-private.h
+lprm.o: ../cups/transcode.h ../cups/thread-private.h
diff --git a/berkeley/lpc.c b/berkeley/lpc.c
index 2e4491a2..0460a8fb 100644
--- a/berkeley/lpc.c
+++ b/berkeley/lpc.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: lpc.c 9384 2010-11-22 07:06:39Z mike $"
+ * "$Id: lpc.c 10379 2012-03-23 22:16:22Z mike $"
  *
  *   "lpc" command for CUPS.
  *
- *   Copyright 2007-2010 by Apple Inc.
+ *   Copyright 2007-2012 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -364,7 +364,8 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 
 	  for (ptr = printer;
 	       *ptr != '\0' && *dptr != '\0' && *ptr == *dptr;
-	       ptr ++, dptr ++);
+	       ptr ++, dptr ++)
+	    /* do nothing */;
 
           if (*ptr == '\0' && (*dptr == '\0' || *dptr == ',' ||
 	                       isspace(*dptr & 255)))
@@ -445,5 +446,5 @@ show_status(http_t     *http,		/* I - HTTP connection to server */
 
 
 /*
- * End of "$Id: lpc.c 9384 2010-11-22 07:06:39Z mike $".
+ * End of "$Id: lpc.c 10379 2012-03-23 22:16:22Z mike $".
  */