Merge changes from CUPS 1.3.1.

[thirdparty/cups.git] / backend / scsi-linux.c

diff --git a/backend/scsi-linux.c b/backend/scsi-linux.c
index dbd1c7085d662681cfe6cf551ac098306bfda0ea..e7017e5722c3b95ce8ed3fac2f5ce04be41bd3ab 100644 (file)
--- a/backend/scsi-linux.c
+++ b/backend/scsi-linux.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: scsi-linux.c 6649 2007-07-11 21:46:42Z mike $"
+ * "$Id: scsi-linux.c 6835 2007-08-22 18:34:34Z mike $"
  *
  *   Linux SCSI printer support for the Common UNIX Printing System (CUPS).
  *
@@ -110,7 +110,8 @@ print_device(const char *resource,  /* I - SCSI device */
 
   if (strncmp(resource, "/dev/sg", 7) != 0)
   {
-    fprintf(stderr, _("ERROR: Bad SCSI device file \"%s\"!\n"), resource);
+    _cupsLangPrintf(stderr, _("ERROR: Bad SCSI device file \"%s\"!\n"),
+                    resource);
     return (CUPS_BACKEND_STOP);
   }
 
@@ -148,13 +149,15 @@ print_device(const char *resource,        /* I - SCSI device */
 
       if (errno != EAGAIN && errno != EBUSY)
       {
-       fprintf(stderr, _("ERROR: Unable to open device file \"%s\": %s\n"),
-               resource, strerror(errno));
+       _cupsLangPrintf(stderr,
+                       _("ERROR: Unable to open device file \"%s\": %s\n"),
+                       resource, strerror(errno));
        return (CUPS_BACKEND_FAILED);
       }
       else
       {
-        fputs(_("INFO: Printer busy; will retry in 30 seconds...\n"), stderr);
+        _cupsLangPuts(stderr,
+                     _("INFO: Printer busy; will retry in 30 seconds...\n"));
         sleep(30);
       }
     }
@@ -220,9 +223,9 @@ print_device(const char *resource,  /* I - SCSI device */
        if (ioctl(scsi_fd, SG_IO, &scsi_req) < 0 ||
             scsi_req.status != 0)
         {
-         fprintf(stderr,
-                 _("WARNING: SCSI command timed out (%d); retrying...\n"),
-                 scsi_req.status);
+         _cupsLangPrintf(stderr,
+                         _("WARNING: SCSI command timed out (%d); "
+                           "retrying...\n"), scsi_req.status);
           sleep(try + 1);
        }
        else
@@ -230,8 +233,8 @@ print_device(const char *resource,  /* I - SCSI device */
 
       if (try >= 10)
       {
-       fprintf(stderr, _("ERROR: Unable to send print data (%d)\n"),
-               scsi_req.status);
+       _cupsLangPrintf(stderr, _("ERROR: Unable to send print data (%d)\n"),
+                       scsi_req.status);
         close(scsi_fd);
        return (CUPS_BACKEND_FAILED);
       }
@@ -252,5 +255,5 @@ print_device(const char *resource,  /* I - SCSI device */
 
 
 /*
- * End of "$Id: scsi-linux.c 6649 2007-07-11 21:46:42Z mike $".
+ * End of "$Id: scsi-linux.c 6835 2007-08-22 18:34:34Z mike $".
  */