Fix Linux build errors.

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

diff --git a/backend/socket.c b/backend/socket.c
index 666ce56370202711bd850dd8e7470b6284550f4d..579e1907742a61eebab6e7ebc015f16d6c9d1b5f 100644 (file)
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -3,7 +3,7 @@
  *
  *   AppSocket backend for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007-2009 by Apple Inc.
+ *   Copyright 2007-2010 by Apple Inc.
  *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -72,10 +72,11 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
                sep;                    /* Option separator */
   int          print_fd;               /* Print file */
   int          copies;                 /* Number of copies to print */
-  time_t       start_time,             /* Time of first connect */
-               current_time,           /* Current time */
+  time_t       start_time;             /* Time of first connect */
+#ifdef __APPLE__
+  time_t       current_time,           /* Current time */
                wait_time;              /* Time to wait before shutting down socket */
-  int          recoverable;            /* Recoverable error shown? */
+#endif /* __APPLE__ */
   int          contimeout;             /* Connection timeout */
   int          waiteof;                /* Wait for end-of-file? */
   int          port;                   /* Port number */
@@ -255,8 +256,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 +265,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 +307,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 +322,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 +334,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"));
 
@@ -393,7 +377,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
       lseek(print_fd, 0, SEEK_SET);
     }
 
-    tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addr->addr), 1,
+    tbytes = backendRunLoop(print_fd, device_fd, snmp_fd, &(addr->addr), 1, 0, 
                             backendNetworkSideCB);
 
     if (print_fd != 0 && tbytes >= 0)
@@ -406,6 +390,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
                      CUPS_LLCAST tbytes);
   }
 
+#ifdef __APPLE__
  /*
   * Wait up to 5 seconds to get any pending back-channel data...
   */
@@ -414,6 +399,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
   while (wait_time >= time(&current_time))
     if (wait_bc(device_fd, wait_time - current_time) <= 0)
       break;
+#endif /* __APPLE__ */
 
   if (waiteof)
   {
@@ -492,7 +478,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);
     }