From: Bert Vermeulen Date: Mon, 21 Jul 2014 13:08:53 +0000 (+0200) Subject: Remove unnecessary level of indirection for source manipulation. X-Git-Tag: libsigrok-0.4.0~1230 X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=64668fae1936bf57ff0da768c58646283773f549 Remove unnecessary level of indirection for source manipulation. --- diff --git a/hwdriver.c b/hwdriver.c index 4434a5b7..04d877ae 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -465,60 +465,4 @@ SR_API const struct sr_config_info *sr_config_info_name_get(const char *optname) return NULL; } -/* Unnecessary level of indirection follows. */ - -/** @private - * @see sr_session_source_remove() - */ -SR_PRIV int sr_source_remove(int fd) -{ - return sr_session_source_remove(sr_current_session, fd); -} - -/** @private - * @see sr_session_source_remove_pollfd() - */ -SR_PRIV int sr_source_remove_pollfd(GPollFD *pollfd) -{ - return sr_session_source_remove_pollfd(sr_current_session, pollfd); -} - -/** @private - * @see sr_session_source_remove_channel() - */ -SR_PRIV int sr_source_remove_channel(GIOChannel *channel) -{ - return sr_session_source_remove_channel(sr_current_session, channel); -} - -/** @private - * @see sr_session_source_add() - */ -SR_PRIV int sr_source_add(int fd, int events, int timeout, - sr_receive_data_callback cb, void *cb_data) -{ - return sr_session_source_add(sr_current_session, - fd, events, timeout, cb, cb_data); -} - -/** @private - * @see sr_session_source_add_pollfd() - */ -SR_PRIV int sr_source_add_pollfd(GPollFD *pollfd, int timeout, - sr_receive_data_callback cb, void *cb_data) -{ - return sr_session_source_add_pollfd(sr_current_session, - pollfd, timeout, cb, cb_data); -} - -/** @private - * @see sr_session_source_add_channel() - */ -SR_PRIV int sr_source_add_channel(GIOChannel *channel, int events, - int timeout, sr_receive_data_callback cb, void *cb_data) -{ - return sr_session_source_add_channel(sr_current_session, - channel, events, timeout, cb, cb_data); -} - /** @} */