svn commit: r203815 - head/lib/libusb

[Wojciech A. Koszek]

Author: wkoszek
Date: Sat Feb 13 09:45:50 2010
New Revision: 203815
URL: http://svn.freebsd.org/changeset/base/203815

Log:
  Resort includes to match style(9) a bit more. No functional change
  is expected after this commit.
  
  Tested by:	make buildworld
  Reviewed by:	hps (patch without .h changes)

Modified:
  head/lib/libusb/libusb.h
  head/lib/libusb/libusb10.c
  head/lib/libusb/libusb10_desc.c
  head/lib/libusb/libusb10_io.c
  head/lib/libusb/libusb20.c
  head/lib/libusb/libusb20.h
  head/lib/libusb/libusb20_compat01.c
  head/lib/libusb/libusb20_desc.c
  head/lib/libusb/libusb20_ugen20.c
  head/lib/libusb/usb.h

Modified: head/lib/libusb/libusb.h
==============================================================================
--- head/lib/libusb/libusb.h	Sat Feb 13 08:23:47 2010	(r203814)
+++ head/lib/libusb/libusb.h	Sat Feb 13 09:45:50 2010	(r203815)
@@ -30,8 +30,6 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-
-
 #ifdef __cplusplus
 extern	"C" {
 #endif

Modified: head/lib/libusb/libusb10.c
==============================================================================
--- head/lib/libusb/libusb10.c	Sat Feb 13 08:23:47 2010	(r203814)
+++ head/lib/libusb/libusb10.c	Sat Feb 13 09:45:50 2010	(r203815)
@@ -25,16 +25,17 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/queue.h>
+
 #include <assert.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
+#include <errno.h>
 #include <poll.h>
 #include <pthread.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <sys/fcntl.h>
-#include <sys/queue.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
 
 #include "libusb20.h"
 #include "libusb20_desc.h"

Modified: head/lib/libusb/libusb10_desc.c
==============================================================================
--- head/lib/libusb/libusb10_desc.c	Sat Feb 13 08:23:47 2010	(r203814)
+++ head/lib/libusb/libusb10_desc.c	Sat Feb 13 09:45:50 2010	(r203815)
@@ -24,10 +24,11 @@
  * SUCH DAMAGE.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <sys/queue.h>
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include "libusb20.h"
 #include "libusb20_desc.h"
 #include "libusb20_int.h"

Modified: head/lib/libusb/libusb10_io.c
==============================================================================
--- head/lib/libusb/libusb10_io.c	Sat Feb 13 08:23:47 2010	(r203814)
+++ head/lib/libusb/libusb10_io.c	Sat Feb 13 09:45:50 2010	(r203815)
@@ -24,14 +24,15 @@
  * SUCH DAMAGE.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
+#include <sys/queue.h>
+
+#include <errno.h>
 #include <poll.h>
 #include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <time.h>
-#include <errno.h>
-#include <sys/queue.h>
+#include <unistd.h>
 
 #include "libusb20.h"
 #include "libusb20_desc.h"

Modified: head/lib/libusb/libusb20.c
==============================================================================
--- head/lib/libusb/libusb20.c	Sat Feb 13 08:23:47 2010	(r203814)
+++ head/lib/libusb/libusb20.c	Sat Feb 13 09:45:50 2010	(r203815)
@@ -24,12 +24,13 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/queue.h>
+
+#include <ctype.h>
+#include <poll.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <poll.h>
-#include <ctype.h>
-#include <sys/queue.h>
 
 #include "libusb20.h"
 #include "libusb20_desc.h"

Modified: head/lib/libusb/libusb20.h
==============================================================================
--- head/lib/libusb/libusb20.h	Sat Feb 13 08:23:47 2010	(r203814)
+++ head/lib/libusb/libusb20.h	Sat Feb 13 09:45:50 2010	(r203815)
@@ -29,13 +29,13 @@
 #ifndef _LIBUSB20_H_
 #define	_LIBUSB20_H_
 
-#include <stdint.h>
-#include <time.h>
-#include <string.h>
-
+#include <sys/endian.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/endian.h>
+
+#include <stdint.h>
+#include <string.h>
+#include <time.h>
 
 #ifdef __cplusplus
 extern	"C" {

Modified: head/lib/libusb/libusb20_compat01.c
==============================================================================
--- head/lib/libusb/libusb20_compat01.c	Sat Feb 13 08:23:47 2010	(r203814)
+++ head/lib/libusb/libusb20_compat01.c	Sat Feb 13 09:45:50 2010	(r203815)
@@ -30,9 +30,9 @@
 
 #include <sys/queue.h>
 
-#include <stdlib.h>
-#include <stdio.h>
 #include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "libusb20.h"
 #include "libusb20_desc.h"

Modified: head/lib/libusb/libusb20_desc.c
==============================================================================
--- head/lib/libusb/libusb20_desc.c	Sat Feb 13 08:23:47 2010	(r203814)
+++ head/lib/libusb/libusb20_desc.c	Sat Feb 13 09:45:50 2010	(r203815)
@@ -24,10 +24,11 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/queue.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/queue.h>
 
 #include "libusb20.h"
 #include "libusb20_desc.h"

Modified: head/lib/libusb/libusb20_ugen20.c
==============================================================================
--- head/lib/libusb/libusb20_ugen20.c	Sat Feb 13 08:23:47 2010	(r203814)
+++ head/lib/libusb/libusb20_ugen20.c	Sat Feb 13 09:45:50 2010	(r203815)
@@ -27,12 +27,12 @@
 #include <sys/queue.h>
 #include <sys/types.h>
 
+#include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <fcntl.h>
-#include <errno.h>
+#include <unistd.h>
 
 #include "libusb20.h"
 #include "libusb20_desc.h"

Modified: head/lib/libusb/usb.h
==============================================================================
--- head/lib/libusb/usb.h	Sat Feb 13 08:23:47 2010	(r203814)
+++ head/lib/libusb/usb.h	Sat Feb 13 09:45:50 2010	(r203815)
@@ -27,9 +27,10 @@
 #ifndef _LIBUSB20_COMPAT_01_H_
 #define	_LIBUSB20_COMPAT_01_H_
 
-#include <stdint.h>
-#include <sys/types.h>
 #include <sys/param.h>
+#include <sys/endian.h>
+
+#include <stdint.h>
 
 /* USB interface class codes */