diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-09-24 23:50:39 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-09-24 23:50:39 +0000 |
| commit | 18ecb4282108afe096df4958d992c80bb5f2b570 (patch) | |
| tree | d41d1b895293498ec62aa785616eb291919db0cf /backend/usb-unix.c | |
| parent | 7a0cbd5e5715d715c3fddfaace2f800ef820d328 (diff) | |
| download | cups-18ecb4282108afe096df4958d992c80bb5f2b570.tar.gz | |
Merge changes from CUPS 1.5svn-r8829.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1695 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'backend/usb-unix.c')
| -rw-r--r-- | backend/usb-unix.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/backend/usb-unix.c b/backend/usb-unix.c index 9808f8c0a..44faa630c 100644 --- a/backend/usb-unix.c +++ b/backend/usb-unix.c @@ -36,7 +36,7 @@ */ static int open_device(const char *uri, int *use_bc); -static void side_cb(int print_fd, int device_fd, int snmp_fd, +static int side_cb(int print_fd, int device_fd, int snmp_fd, http_addr_t *addr, int use_bc); @@ -560,7 +560,7 @@ open_device(const char *uri, /* I - Device URI */ * 'side_cb()' - Handle side-channel requests... */ -static void +static int /* O - 0 on success, -1 on error */ side_cb(int print_fd, /* I - Print file */ int device_fd, /* I - Device file */ int snmp_fd, /* I - SNMP socket (unused) */ @@ -579,10 +579,7 @@ side_cb(int print_fd, /* I - Print file */ datalen = sizeof(data); if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0)) - { - _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n")); - return; - } + return (-1); switch (command) { @@ -625,7 +622,7 @@ side_cb(int print_fd, /* I - Print file */ break; } - cupsSideChannelWrite(command, status, data, datalen, 1.0); + return (cupsSideChannelWrite(command, status, data, datalen, 1.0)); } |