svn commit: r250335 - head/lib/libusb

[Ed Maste]

Author: emaste
Date: Tue May  7 20:35:47 2013
New Revision: 250335
URL: http://svnweb.freebsd.org/changeset/base/250335

Log:
  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@

Modified:
  head/lib/libusb/libusb.h
  head/lib/libusb/libusb10_io.c

Modified: head/lib/libusb/libusb.h
==============================================================================
--- head/lib/libusb/libusb.h	Tue May  7 18:45:34 2013	(r250334)
+++ head/lib/libusb/libusb.h	Tue May  7 20:35:47 2013	(r250335)
@@ -441,7 +441,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: head/lib/libusb/libusb10_io.c
==============================================================================
--- head/lib/libusb/libusb10_io.c	Tue May  7 18:45:34 2013	(r250334)
+++ head/lib/libusb/libusb10_io.c	Tue May  7 20:35:47 2013	(r250335)
@@ -397,7 +397,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;
@@ -423,7 +423,7 @@ libusb_get_pollfds(libusb_context *ctx)
 
 done:
 	CTX_UNLOCK(ctx);
-	return (ret);
+	return ((const struct libusb_pollfd **)ret);
 }