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/runloop.c | |
| parent | 7a0cbd5e5715d715c3fddfaace2f800ef820d328 (diff) | |
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/runloop.c')
| -rw-r--r-- | backend/runloop.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/backend/runloop.c b/backend/runloop.c index fa8825ce2..d5de2e4c3 100644 --- a/backend/runloop.c +++ b/backend/runloop.c @@ -147,7 +147,7 @@ backendRunLoop( int snmp_fd, /* I - SNMP socket or -1 if none */ http_addr_t *addr, /* I - Address of device */ int use_bc, /* I - Use back-channel? */ - void (*side_cb)(int, int, int, http_addr_t *, int)) + int (*side_cb)(int, int, int, http_addr_t *, int)) /* I - Side-channel callback */ { int nfds; /* Maximum file descriptor value + 1 */ @@ -274,7 +274,8 @@ backendRunLoop( * loop since it may have read from print_fd... */ - (*side_cb)(print_fd, device_fd, snmp_fd, addr, use_bc); + if ((*side_cb)(print_fd, device_fd, snmp_fd, addr, use_bc)) + side_cb = NULL; continue; } |