More splint cleanup.

3 files changed, 6 insertions, 4 deletions

diff --git a/cgps.c b/cgps.c
index fb656d8c..4241dce5 100644
--- a/cgps.c
+++ b/cgps.c
@@ -180,6 +180,7 @@ static void update_probe(struct gps_data_t *gpsdata,
 }
 
 
+/*@ -globstate @*/
 static void windowsetup(void){
   /* Set the window sizes per the following criteria:
 
@@ -328,6 +329,7 @@ static void windowsetup(void){
     (void)wborder(satellites, 0, 0, 0, 0, 0, 0, 0, 0);
   }
 }
+/*@ +globstate @*/
 
 /* This gets called once for each new compass sentence. */
 static void update_compass_panel(struct gps_data_t *gpsdata,
diff --git a/gpsd.c b/gpsd.c
index e9004fd3..ce7707d7 100644
--- a/gpsd.c
+++ b/gpsd.c
@@ -236,10 +236,10 @@ static int passivesock(char *service, char *protocol, int qlen)
     ppe = getprotobyname(protocol);
     if (strcmp(protocol, "udp") == 0) {
 	type = SOCK_DGRAM;
-	/*@i1@*/proto = (ppe) ? ppe->p_proto : IPPROTO_UDP;
+	/*@i@*/proto = (ppe) ? ppe->p_proto : IPPROTO_UDP;
     } else {
 	type = SOCK_STREAM;
-	/*@i1@*/proto = (ppe) ? ppe->p_proto : IPPROTO_TCP;
+	/*@i@*/proto = (ppe) ? ppe->p_proto : IPPROTO_TCP;
     }
     if ((s = socket(PF_INET, type, /*@i1@*/proto)) < 0) {
 	gpsd_report(LOG_ERROR, "Can't create socket\n");
diff --git a/sirf.c b/sirf.c
index d06e0e63..04a31578 100644
--- a/sirf.c
+++ b/sirf.c
@@ -470,10 +470,10 @@ static gps_mask_t sirf_msg_geodetic(struct gps_device_t *session, unsigned char
 	unpacked_date.tm_min = (int)getub(buf, 16);
 	unpacked_date.tm_sec = 0;
 	subseconds = getuw(buf, 17)*1e-3;
-	/*@ -compdef */
+	/*@ -compdef -unrecog */
 	session->gpsdata.fix.time = session->gpsdata.sentence_time =
 	    (double)timegm(&unpacked_date)+subseconds;
-	/*@ +compdef */
+	/*@ +compdef +unrecog */
 	gpsd_report(LOG_PROG, "MID 41 UTC: %lf\n", session->gpsdata.fix.time);
 #ifdef NTPSHM_ENABLE
 	if (session->gpsdata.fix.mode > MODE_NO_FIX && unpacked_date.tm_year != 0) {