diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-11-16 01:00:05 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-11-16 01:00:05 +0000 |
| commit | a469f8a57669e1948d5cc29005d8c097312de63a (patch) | |
| tree | 4af697f80e08ff9f10989840ea8a2669b73b8e08 /backend/socket.c | |
| parent | 76aa1ac14cceecf4968355e1ea6af822bce9cfc3 (diff) | |
| download | cups-a469f8a57669e1948d5cc29005d8c097312de63a.tar.gz | |
Merge changes from CUPS 1.7svn-r10704.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@4027 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/socket.c')
| -rw-r--r-- | backend/socket.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/backend/socket.c b/backend/socket.c index 77255a394..2da3d07f2 100644 --- 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(¤t_time)) - if (wait_bc(device_fd, wait_time - current_time) <= 0) - break; -#endif /* __APPLE__ */ - if (waiteof) { /* |