diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-09-07 22:31:27 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-09-07 22:31:27 +0000 |
commit | 85dda01c84763aecc4d31e15246d0ac5986eedae (patch) | |
tree | 4f8b999e8443b1c8def8c79d70338bd4e0179e29 /berkeley | |
parent | a48458814a4c26a6430b27105c0ab747c907473f (diff) | |
download | cups-85dda01c84763aecc4d31e15246d0ac5986eedae.tar.gz |
Merge changes from CUPS 1.6svn-r9968.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3411 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'berkeley')
-rw-r--r-- | berkeley/Dependencies | 40 | ||||
-rw-r--r-- | berkeley/lpq.c | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/berkeley/Dependencies b/berkeley/Dependencies index de9ba9799..9d43ccaf8 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/lpq.c b/berkeley/lpq.c index 24e49e423..e798cf8c6 100644 --- a/berkeley/lpq.c +++ b/berkeley/lpq.c @@ -39,7 +39,7 @@ static http_t *connect_server(const char *, http_t *); static int show_jobs(const char *, http_t *, const char *, const char *, const int, const int); static void show_printer(const char *, http_t *, const char *); -static void usage(void); +static void usage(void) __attribute__((noreturn)); /* |