[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gpsd-commit-watch
Subject:    [Gpsd-commit-watch] r3171 - trunk
From:       esr () berlios ! de (Eric S !  Raymond at BerliOS)
Date:       2005-08-20 13:29:56
Message-ID: 200508201329.j7KDTu1d002656 () sheep ! berlios ! de
[Download RAW message or body]

Author: esr
Date: 2005-08-20 15:29:52 +0200 (Sat, 20 Aug 2005)
New Revision: 3171

Modified:
   trunk/cgps.c
   trunk/garmin.c
   trunk/gpspipe.c
   trunk/italk.c
   trunk/libgpsd_core.c
   trunk/rtcm.c
   trunk/sirfflash.c
Log:
Warning and splint cleanup.


Modified: trunk/cgps.c
===================================================================
--- trunk/cgps.c	2005-08-20 13:18:03 UTC (rev 3170)
+++ trunk/cgps.c	2005-08-20 13:29:52 UTC (rev 3171)
@@ -306,15 +306,17 @@
     (void)signal(SIGINT,die);
     (void)signal(SIGHUP,die);
 
+    /*@ -onlytrans @*/
     datawin    = newwin(13, 45, 1, 0);
     satellites = newwin(13, 35, 1, 45);
     messages   = newwin(0,  0,  14, 0);
+    /*@ +onlytrans @*/
     (void)scrollok(messages, true);
     (void)wsetscrreg(messages, 0, LINES-13);
     (void)nodelay(messages,(bool)TRUE);
 
-    mvprintw(0, 31, "cgps test client");
-    refresh();
+    (void)mvprintw(0, 31, "cgps test client");
+    (void)refresh();
 
     /* Do the initial field label setup. */
     (void)mvwprintw(datawin, 1,5, "Time:");

Modified: trunk/garmin.c
===================================================================
--- trunk/garmin.c	2005-08-20 13:18:03 UTC (rev 3170)
+++ trunk/garmin.c	2005-08-20 13:29:52 UTC (rev 3171)
@@ -869,7 +869,7 @@
 	//SendPacket(session,  thePacket);
 }
 
-static void garmin_close(struct gps_device_t *session) 
+static void garmin_close(struct gps_device_t *session UNUSED) 
 {
     /* FIXME -- do we need to put the garmin to sleep?  or is closing the port
        sufficient? */

Modified: trunk/gpspipe.c
===================================================================
--- trunk/gpspipe.c	2005-08-20 13:18:03 UTC (rev 3170)
+++ trunk/gpspipe.c	2005-08-20 13:29:52 UTC (rev 3171)
@@ -132,12 +132,14 @@
 	}
 	/*@ +branchstate @*/
 
+	/*@ -nullpass @*/
 	s = netlib_connectsock( server, port, "tcp");
 	if ( s < 0 ) {
 		fprintf( stderr, "%s: could not connect to gpsd %s:%s, %s(%d)\n"
 			, argv[0] , server, port, strerror(errno), errno);
 		exit (1);
 	}
+	/*@ +nullpass @*/
 
 	wrote = write( s, cstr, strlen(cstr) );
 	if ( (ssize_t)strlen(cstr) != wrote ) {

Modified: trunk/italk.c
===================================================================
--- trunk/italk.c	2005-08-20 13:18:03 UTC (rev 3170)
+++ trunk/italk.c	2005-08-20 13:29:52 UTC (rev 3171)
@@ -72,8 +72,8 @@
 	return 0;
 }
 
-static bool italk_set_mode(struct gps_device_t *session, 
-			      speed_t speed, bool mode)
+static bool italk_set_mode(struct gps_device_t *session UNUSED, 
+			      speed_t speed UNUSED, bool mode UNUSED)
 {
     /*@ +charint @*/
     unsigned char msg[] = {0,};

Modified: trunk/libgpsd_core.c
===================================================================
--- trunk/libgpsd_core.c	2005-08-20 13:18:03 UTC (rev 3170)
+++ trunk/libgpsd_core.c	2005-08-20 13:29:52 UTC (rev 3171)
@@ -658,7 +658,7 @@
     static char hexbuf[MAX_PACKET_LENGTH*2+1];
     size_t i;
     size_t len = (size_t)((binbuflen > MAX_PACKET_LENGTH) ? MAX_PACKET_LENGTH : binbuflen);
-    char *ibuf = (char *)binbuf;
+    const char *ibuf = (const char *)binbuf;
     memset(hexbuf, 0, sizeof(hexbuf));
 
     for (i = 0; i < len; i++) {

Modified: trunk/rtcm.c
===================================================================
--- trunk/rtcm.c	2005-08-20 13:18:03 UTC (rev 3170)
+++ trunk/rtcm.c	2005-08-20 13:29:52 UTC (rev 3171)
@@ -866,7 +866,7 @@
 static bool length_check(struct gps_device_t *session)
 {
     return session->driver.isgps.bufindex >= 2 
-	&& session->driver.isgps.bufindex >= ((struct rtcm_msg_t *)session->driver.isgps.buf)->w2.frmlen + 2;
+	&& session->driver.isgps.bufindex >= ((struct rtcm_msg_t *)session->driver.isgps.buf)->w2.frmlen + 2u;
 }
 
 enum isgpsstat_t rtcm_decode(struct gps_device_t *session, unsigned int c)

Modified: trunk/sirfflash.c
===================================================================
--- trunk/sirfflash.c	2005-08-20 13:18:03 UTC (rev 3170)
+++ trunk/sirfflash.c	2005-08-20 13:29:52 UTC (rev 3171)
@@ -217,9 +217,9 @@
     return sirfSetProto(fd, term, PROTO_SIRF, 38400);
 }
 
-static int sirfVersionCheck(int fd, const char *version,
-			    const char *loader, size_t ls,
-			    const char *firmware, size_t fs)
+static int sirfVersionCheck(int fd, const char *version UNUSED,
+			    const char *loader, size_t ls UNUSED,
+			    const char *firmware, size_t fs UNUSED)
 {
     /*
      * This implies that any SiRF loader and firmware image is good for 
@@ -228,14 +228,14 @@
     return 0;
 }
 
-static int wait2seconds(int fd)
+static int wait2seconds(int fd UNUSED)
 {
     /* again we wait, this time for our uploaded code to start running */
     gpsd_report(1, "waiting 2 seconds...\n");
     return (int)sleep(2);
 }
 
-static int wait5seconds(int fd)
+static int wait5seconds(int fd UNUSED)
 {
     /* wait for firmware upload to settle in */
     gpsd_report(1, "waiting 5 seconds...\n");


[prev in list] [next in list] [prev in thread] [next in thread]