Merge changes from CUPS 1.7svn-r10704.

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

diff --git a/backend/socket.c b/backend/socket.c
index 77255a394f871310b85d03bea8c1385f0bcaa284..2da3d07f2a8626e1c538ffbe28ad56e3be451e8c 100644 (file)
--- a/backend/socket.c
+++ b/backend/socket.c
@@ -73,10 +73,6 @@ main(int  argc,                              /* I - Number of command-line arguments (6 or 7) */
   int          print_fd;               /* Print file */
   int          copies;                 /* Number of copies to print */
   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 */
-#endif /* __APPLE__ */
   int          contimeout;             /* Connection timeout */
   int          waiteof;                /* Wait for end-of-file? */
   int          port;                   /* Port number */
@@ -410,7 +406,7 @@ main(int  argc,                             /* I - Number of command-line arguments (6 or 7) */
 
   fprintf(stderr, "DEBUG: Connected to %s:%d...\n",
          httpAddrString(&(addr->addr), addrname, sizeof(addrname)),
-         _httpAddrPort(&(addr->addr)));
+         httpAddrPort(&(addr->addr)));
 
  /*
   * Print everything...
@@ -438,17 +434,6 @@ main(int  argc,                            /* I - Number of command-line arguments (6 or 7) */
       _cupsLangPrintFilter(stderr, "INFO", _("Print file sent."));
   }
 
-#ifdef __APPLE__
- /*
-  * Wait up to 5 seconds to get any pending back-channel data...
-  */
-
-  wait_time = time(NULL) + 5;
-  while (wait_time >= time(&current_time))
-    if (wait_bc(device_fd, wait_time - current_time) <= 0)
-      break;
-#endif /* __APPLE__ */
-
   if (waiteof)
   {
    /*