From 72a8d5a077a3fd437fe451e57d6505933e3f4d3b Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Fri, 24 Dec 2010 06:11:25 -0500
Subject: Partial splint cleanup.

---
 driver_garmin.c | 8 +++-----
 driver_rtcm3.c  | 2 +-
 net_dgpsip.c    | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/driver_garmin.c b/driver_garmin.c
index d1629aee..b4214ae0 100644
--- a/driver_garmin.c
+++ b/driver_garmin.c
@@ -810,7 +810,7 @@ static void Build_Send_SER_Packet(struct gps_device_t *session,
  *
  * libudev: http://www.kernel.org/pub/linux/utils/kernel/hotplug/libudev/
  */
-/*@-compdef -usedef@*/
+/*@-compdef -usedef -nullpass@*/
 static bool is_usb_device(const char *path UNUSED, int vendor, int product)
 {
     // discover devices
@@ -820,15 +820,13 @@ static bool is_usb_device(const char *path UNUSED, int vendor, int product)
     bool found = false;
 
     gpsd_report(LOG_SHOUT, "attempting USB device enumeration.\n");
-    libusb_init(NULL);
+    (void)libusb_init(NULL);
 
-    /*@-nullpass@*/
     if ((cnt = libusb_get_device_list(NULL, &list)) < 0) {
 	gpsd_report(LOG_ERROR, "USB device list call failed.\n");
 	libusb_exit(NULL);
 	return false;
     }
-    /*@+nullpass@*/
 
     for (i = 0; i < cnt; i++) {
 	struct libusb_device_descriptor desc;
@@ -861,7 +859,7 @@ static bool is_usb_device(const char *path UNUSED, int vendor, int product)
     return found;
 }
 
-/*@-compdef -usedef@*/
+/*@-compdef -usedef -nullpass@*/
 #endif /* HAVE_LIBUSB || S_SPLINT_S */
 
 /*
diff --git a/driver_rtcm3.c b/driver_rtcm3.c
index 90401418..05fd5718 100644
--- a/driver_rtcm3.c
+++ b/driver_rtcm3.c
@@ -28,13 +28,13 @@ BSD terms apply: see the file COPYING in the distribution root for details.
 *****************************************************************************/
 
 #include <sys/types.h>
-#include <netinet/in.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include "gpsd_config.h"
 #ifndef S_SPLINT_S
 #include <arpa/inet.h>		/* for ntohl(3) and friends */
+#include <netinet/in.h>
 #endif /* S_SPLINT_S */
 
 #include "gpsd.h"
diff --git a/net_dgpsip.c b/net_dgpsip.c
index 88ae7988..f555d20b 100644
--- a/net_dgpsip.c
+++ b/net_dgpsip.c
@@ -4,13 +4,13 @@
  * BSD terms apply: see the file COPYING in the distribution root for details.
  */
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 #ifndef S_SPLINT_S
 #include <netdb.h>
+#include <sys/socket.h>
 #include <unistd.h>
 #endif /* S_SPLINT_S */
 
-- 
cgit v1.2.1