Merge changes from CUPS 1.5svn-r8829.

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

diff --git a/backend/parallel.c b/backend/parallel.c
index 41238a8e97acce9da3a9c9fcb6152a26b7a93913..03d59d443dd062c735c6a51118e506f7a4dcb82e 100644 (file)
--- a/backend/parallel.c
+++ b/backend/parallel.c
@@ -59,7 +59,7 @@
  */
 
 static void    list_devices(void);
-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);
 
 
@@ -615,7 +615,7 @@ list_devices(void)
  * '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) */
@@ -634,10 +634,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)
   {
@@ -680,7 +677,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));
 }