diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-04-23 22:44:16 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2012-04-23 22:44:16 +0000 |
commit | f3c17241a42a0845eae2099e6970b5aca9bbd836 (patch) | |
tree | e511e108810d2b80f72ff6cee5efafba472beb6a /cups/sidechannel.c | |
parent | 271780fb877d849c9f41616f338e1e9dd2d69409 (diff) | |
download | cups-f3c17241a42a0845eae2099e6970b5aca9bbd836.tar.gz |
Merge changes from CUPS 1.6svn-r10437.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3794 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/sidechannel.c')
-rw-r--r-- | cups/sidechannel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cups/sidechannel.c b/cups/sidechannel.c index 40091deca..7bd626eaf 100644 --- a/cups/sidechannel.c +++ b/cups/sidechannel.c @@ -69,7 +69,7 @@ * pointed to by the "data" parameter. cupsSideChannelDoRequest() will * update the value to contain the number of data bytes in the buffer. * - * @since CUPS 1.3/Mac OS X 10.5@ + * @since CUPS 1.3/OS X 10.5@ */ cups_sc_status_t /* O - Status of command */ @@ -108,7 +108,7 @@ cupsSideChannelDoRequest( * pointed to by the "data" parameter. cupsSideChannelDoRequest() will * update the value to contain the number of data bytes in the buffer. * - * @since CUPS 1.3/Mac OS X 10.5@ + * @since CUPS 1.3/OS X 10.5@ */ int /* O - 0 on success, -1 on error */ @@ -308,7 +308,7 @@ cupsSideChannelRead( * support SNMP queries. @code CUPS_SC_STATUS_NO_RESPONSE@ is returned when * the printer does not respond to the SNMP query. * - * @since CUPS 1.4/Mac OS X 10.6@ + * @since CUPS 1.4/OS X 10.6@ */ cups_sc_status_t /* O - Query status */ @@ -414,7 +414,7 @@ cupsSideChannelSNMPGet( * support SNMP queries. @code CUPS_SC_STATUS_NO_RESPONSE@ is returned when * the printer does not respond to the first SNMP query. * - * @since CUPS 1.4/Mac OS X 10.6@ + * @since CUPS 1.4/OS X 10.6@ */ cups_sc_status_t /* O - Status of first query of @code CUPS_SC_STATUS_OK@ on success */ @@ -533,7 +533,7 @@ cupsSideChannelSNMPWalk( * This function is normally only called by backend programs to send * responses to a filter, driver, or port monitor program. * - * @since CUPS 1.3/Mac OS X 10.5@ + * @since CUPS 1.3/OS X 10.5@ */ int /* O - 0 on success, -1 on error */ |