summaryrefslogtreecommitdiff
path: root/monitor
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-11-30 03:16:24 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2010-11-30 03:16:24 +0000
commit0837b7e828b9fc312fcf8f5741d2ba9683742672 (patch)
tree1209ad6c3a50b6fc8c2e7fdc4ce05445f17f1d86 /monitor
parent1106b00e75e37e7f25a28ee95da560de55520018 (diff)
downloadcups-0837b7e828b9fc312fcf8f5741d2ba9683742672.tar.gz
Merge changes from CUPS 1.5svn-r9385.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2873 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'monitor')
-rw-r--r--monitor/Dependencies18
-rw-r--r--monitor/bcp.c7
-rw-r--r--monitor/tbcp.c7
3 files changed, 22 insertions, 10 deletions
diff --git a/monitor/Dependencies b/monitor/Dependencies
index 83791215b..005e3eb1e 100644
--- a/monitor/Dependencies
+++ b/monitor/Dependencies
@@ -1,8 +1,18 @@
# DO NOT DELETE THIS LINE -- make depend depends on it.
-bcp.o: ../cups/string-private.h ../config.h ../cups/cups.h ../cups/file.h
+bcp.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
bcp.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
-bcp.o: ../cups/language.h ../cups/ppd.h ../cups/cups.h
-tbcp.o: ../cups/string-private.h ../config.h ../cups/cups.h ../cups/file.h
+bcp.o: ../cups/language.h ../cups/string-private.h ../config.h
+bcp.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
+bcp.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+bcp.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+bcp.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+bcp.o: ../cups/thread-private.h
+tbcp.o: ../cups/cups-private.h ../cups/cups.h ../cups/file.h
tbcp.o: ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h
-tbcp.o: ../cups/language.h ../cups/ppd.h ../cups/cups.h
+tbcp.o: ../cups/language.h ../cups/string-private.h ../config.h
+tbcp.o: ../cups/debug-private.h ../cups/ppd-private.h ../cups/ppd.h
+tbcp.o: ../cups/cups.h ../cups/pwg-private.h ../cups/http-private.h
+tbcp.o: ../cups/http.h ../cups/md5-private.h ../cups/ipp-private.h
+tbcp.o: ../cups/ipp.h ../cups/language-private.h ../cups/transcode.h
+tbcp.o: ../cups/thread-private.h
diff --git a/monitor/bcp.c b/monitor/bcp.c
index 06a48232e..ffd32d575 100644
--- a/monitor/bcp.c
+++ b/monitor/bcp.c
@@ -25,8 +25,7 @@
* Include necessary headers...
*/
-#include <cups/string-private.h>
-#include <cups/cups.h>
+#include <cups/cups-private.h>
#include <cups/ppd.h>
@@ -59,7 +58,9 @@ main(int argc, /* I - Number of command-line args */
if (argc < 6 || argc > 7)
{
- fputs("ERROR: tbcp job-id user title copies options [file]\n", stderr);
+ _cupsLangPrintf(stderr,
+ _("Usage: %s job-id user title copies options [file]"),
+ argv[0]);
return (1);
}
diff --git a/monitor/tbcp.c b/monitor/tbcp.c
index 94cf7b692..4170d493b 100644
--- a/monitor/tbcp.c
+++ b/monitor/tbcp.c
@@ -25,8 +25,7 @@
* Include necessary headers...
*/
-#include <cups/string-private.h>
-#include <cups/cups.h>
+#include <cups/cups-private.h>
#include <cups/ppd.h>
@@ -58,7 +57,9 @@ main(int argc, /* I - Number of command-line args */
if (argc < 6 || argc > 7)
{
- fputs("ERROR: tbcp job-id user title copies options [file]\n", stderr);
+ _cupsLangPrintf(stderr,
+ _("Usage: %s job-id user title copies options [file]"),
+ argv[0]);
return (1);
}