Author: emaste
Date: Tue Aug 20 14:25:44 2013
New Revision: 254567
URL: http://svnweb.freebsd.org/changeset/base/254567
Log:
MFC r250335: 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 **.
Modified:
stable/9/lib/libusb/libusb.h
stable/9/lib/libusb/libusb10_io.c
Directory Properties:
stable/9/lib/libusb/ (props changed)
Modified: stable/9/lib/libusb/libusb.h
==============================================================================
--- stable/9/lib/libusb/libusb.h Tue Aug 20 14:19:00 2013
(r254566)
+++ stable/9/lib/libusb/libusb.h Tue Aug 20 14:25:44 2013
(r254567)
@@ -438,7 +438,7 @@ int libusb_handle_events(libusb_context
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 */
Modified: stable/9/lib/libusb/libusb10_io.c
==============================================================================
--- stable/9/lib/libusb/libusb10_io.c Tue Aug 20 14:19:00 2013
(r254566)
+++ stable/9/lib/libusb/libusb10_io.c Tue Aug 20 14:25:44 2013
(r254567)
@@ -392,7 +392,7 @@ libusb_set_pollfd_notifiers(libusb_conte
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;
@@ -418,7 +418,7 @@ libusb_get_pollfds(libusb_context *ctx)
done:
CTX_UNLOCK(ctx);
- return (ret);
+ return ((const struct libusb_pollfd **)ret);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
