Merge changes from 1.1 tree.

[thirdparty/cups.git] / pdftops / Error.cxx

diff --git a/pdftops/Error.cxx b/pdftops/Error.cxx
index 4594516a6befac83b49cad7fdc67ddd705ffb6b8..96a96d2bf2fdbdeb4bafe72057b6b31692f6b712 100644 (file)
--- a/pdftops/Error.cxx
+++ b/pdftops/Error.cxx
@@ -21,10 +21,14 @@ FILE *errFile;
 GBool errQuiet;
 
 void errorInit() {
-  errFile = stderr;
+  if (errQuiet) {
+    errFile = NULL;
+  } else {
+    errFile = stderr;
+  }
 }
 
-void CDECL error(int pos, char *msg, ...) {
+void CDECL error(int pos, const char *msg, ...) {
   va_list args;
 
   if (errQuiet) {