Merge changes from CUPS 1.5svn-r8849.

[thirdparty/cups.git] / backend / socket.c

diff --git a/backend/socket.c b/backend/socket.c
index 35d35e8bf716ba0b28f07f4c25e3f4e96904804d..506ba9ec21c756d1ed51ee7f31bb114b70525163 100644 (file)
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -75,7 +75,6 @@ main(int  argc,                               /* I - Number of command-line arguments (6 or 7) */
   time_t       start_time,             /* Time of first connect */
                current_time,           /* Current time */
                wait_time;              /* Time to wait before shutting down socket */
-  int          recoverable;            /* Recoverable error shown? */
   int          contimeout;             /* Connection timeout */
   int          waiteof;                /* Wait for end-of-file? */
   int          port;                   /* Port number */
@@ -255,8 +254,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
   * Then try to connect to the remote host...
   */
 
-  recoverable = 0;
-  start_time  = time(NULL);
+  start_time = time(NULL);
 
   sprintf(portname, "%d", port);
 
@@ -265,7 +263,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
 
   if ((addrlist = httpAddrGetList(hostname, AF_UNSPEC, portname)) == NULL)
   {
-    _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'!\n"),
+    _cupsLangPrintf(stderr, _("ERROR: Unable to locate printer \'%s\'\n"),
                     hostname);
     return (CUPS_BACKEND_STOP);
   }
@@ -307,16 +305,13 @@ main(int  argc,                           /* I - Number of command-line arguments (6 or 7) */
       {
         if (contimeout && (time(NULL) - start_time) > contimeout)
        {
-         _cupsLangPuts(stderr, _("ERROR: Printer not responding!\n"));
+         _cupsLangPuts(stderr, _("ERROR: Printer not responding\n"));
          return (CUPS_BACKEND_FAILED);
        }
 
-        recoverable = 1;
-
        _cupsLangPrintf(stderr,
-                       _("WARNING: recoverable: Network host \'%s\' is busy; "
-                         "will retry in %d seconds...\n"),
-                       hostname, delay);
+                       _("WARNING: Network host \'%s\' is busy; will retry in "
+                         "%d seconds...\n"), hostname, delay);
 
        sleep(delay);
 
@@ -325,13 +320,11 @@ main(int  argc,                           /* I - Number of command-line arguments (6 or 7) */
       }
       else
       {
-        recoverable = 1;
-
         _cupsLangPrintf(stderr, "DEBUG: Connection error: %s\n",
                        strerror(errno));
        _cupsLangPuts(stderr,
-                     _("ERROR: recoverable: Unable to connect to printer; "
-                       "will retry in 30 seconds...\n"));
+                     _("ERROR: Unable to connect to printer; will retry in 30 "
+                       "seconds...\n"));
        sleep(30);
       }
     }
@@ -339,17 +332,6 @@ main(int  argc,                            /* I - Number of command-line arguments (6 or 7) */
       break;
   }
 
-  if (recoverable)
-  {
-   /*
-    * If we've shown a recoverable error make sure the printer proxies have a
-    * chance to see the recovered message. Not pretty but necessary for now...
-    */
-
-    fputs("INFO: recovered: \n", stderr);
-    sleep(5);
-  }
-
   fputs("STATE: -connecting-to-device\n", stderr);
   _cupsLangPuts(stderr, _("INFO: Connected to printer...\n"));
 
@@ -492,7 +474,7 @@ wait_bc(int device_fd,                      /* I - Socket */
 
     if ((bytes = read(device_fd, buffer, sizeof(buffer))) > 0)
     {
-      fprintf(stderr, "DEBUG: Received %d bytes of back-channel data!\n",
+      fprintf(stderr, "DEBUG: Received %d bytes of back-channel data\n",
              (int)bytes);
       cupsBackChannelWrite(buffer, bytes, 1.0);
     }