diff options
| author | emaste <emaste@FreeBSD.org> | 2013-05-07 20:35:47 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2013-05-07 20:35:47 +0000 |
| commit | b4216c2acc612269c751817555e7e57c958af030 (patch) | |
| tree | 7acba2152a3cd9ad50b0a1d0e6912b45e852a881 /lib/libusb | |
| parent | 85384d7eba4df6c382b0d985fd28fadbcc4fa9a3 (diff) | |
| download | FreeBSD-src-b4216c2acc612269c751817555e7e57c958af030.zip FreeBSD-src-b4216c2acc612269c751817555e7e57c958af030.tar.gz | |
Constify libusb_get_pollfds return
The correct return type, per our libusb(3) man page and the libusb.org
and libusbx projects (whose interface we intend to follow for our libusb),
is const struct libusb_pollfd **.
Unfortunately the doxygen-generated libusbx API documentation[1] omits[2]
the const for some reason.
[1] http://libusbx.sourceforge.net/api-1.0/group__poll.html#gab1a72869a926552b27a6c667695df3a2
[2] http://sourceforge.net/mailarchive/forum.php?thread_name=497D10BE.8090007%40n-dimensional.de&forum_name=libusb-devel
Reviewed by: hselasky@
Diffstat (limited to 'lib/libusb')
| -rw-r--r-- | lib/libusb/libusb.h | 2 | ||||
| -rw-r--r-- | lib/libusb/libusb10_io.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/libusb/libusb.h b/lib/libusb/libusb.h index 225b539..52ad914 100644 --- a/lib/libusb/libusb.h +++ b/lib/libusb/libusb.h @@ -441,7 +441,7 @@ int libusb_handle_events(libusb_context * ctx); int libusb_handle_events_locked(libusb_context * ctx, struct timeval *tv); int libusb_get_next_timeout(libusb_context * ctx, struct timeval *tv); void libusb_set_pollfd_notifiers(libusb_context * ctx, libusb_pollfd_added_cb added_cb, libusb_pollfd_removed_cb removed_cb, void *user_data); -struct libusb_pollfd **libusb_get_pollfds(libusb_context * ctx); +const struct libusb_pollfd **libusb_get_pollfds(libusb_context * ctx); /* Synchronous device I/O */ diff --git a/lib/libusb/libusb10_io.c b/lib/libusb/libusb10_io.c index 489ceb7..9aa31c4 100644 --- a/lib/libusb/libusb10_io.c +++ b/lib/libusb/libusb10_io.c @@ -397,7 +397,7 @@ libusb_set_pollfd_notifiers(libusb_context *ctx, ctx->fd_cb_user_data = user_data; } -struct libusb_pollfd ** +const struct libusb_pollfd ** libusb_get_pollfds(libusb_context *ctx) { struct libusb_super_pollfd *pollfd; @@ -423,7 +423,7 @@ libusb_get_pollfds(libusb_context *ctx) done: CTX_UNLOCK(ctx); - return (ret); + return ((const struct libusb_pollfd **)ret); } |
