From aef73497e29db14b23448b2ae312b20733a01aac Mon Sep 17 00:00:00 2001
From: "Gary E. Miller" <gem@rellim.com>
Date: Wed, 25 Mar 2015 15:36:51 -0700
Subject: Yet more:  Line expects to suppress X error, found 0 errors

---
 bits.c       | 6 +++---
 gpsutils.c   | 8 ++++----
 libgps_shm.c | 2 +-
 netlib.c     | 2 +-
 ntpshmread.c | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bits.c b/bits.c
index 19a86b47..bba72e46 100644
--- a/bits.c
+++ b/bits.c
@@ -25,16 +25,16 @@ uint64_t ubits(unsigned char buf[], unsigned int start, unsigned int width, bool
     unsigned int i;
     unsigned end;
 
-    /*@i1@*/ assert(width <= sizeof(uint64_t) * CHAR_BIT);
+    assert(width <= sizeof(uint64_t) * CHAR_BIT);
     for (i = start / CHAR_BIT;
 	 i < (start + width + CHAR_BIT - 1) / CHAR_BIT; i++) {
-	/*@i1@*/fld <<= CHAR_BIT;
+	fld <<= CHAR_BIT;
 	fld |= (unsigned char)buf[i];
     }
 
     end = (start + width) % CHAR_BIT;
     if (end != 0) {
-	/*@i1@*/fld >>= (CHAR_BIT - end);
+	fld >>= (CHAR_BIT - end);
     }
 
     /*@ -shiftimplementation @*/
diff --git a/gpsutils.c b/gpsutils.c
index ea5c45bb..52a4b66a 100644
--- a/gpsutils.c
+++ b/gpsutils.c
@@ -300,8 +300,8 @@ void gps_merge_fix( /*@ out @*/ struct gps_fix_t *to,
 timestamp_t timestamp(void)
 {
      struct timespec ts;
-     /*@i2@*/(void)clock_gettime(CLOCK_REALTIME, &ts);
-     /*@i3@*/return (timestamp_t)(ts.tv_sec + ts.tv_nsec * 1e-9);
+     (void)clock_gettime(CLOCK_REALTIME, &ts);
+     return (timestamp_t)(ts.tv_sec + ts.tv_nsec * 1e-9);
 }
 
 time_t mkgmtime(register struct tm * t)
@@ -343,7 +343,7 @@ timestamp_t iso8601_to_unix( /*@in@*/ char *isotime)
     struct tm tm;
     memset(&tm,0,sizeof(tm));
 
-    /*@i1@*/ dp = strptime(isotime, "%Y-%m-%dT%H:%M:%S", &tm);
+    dp = strptime(isotime, "%Y-%m-%dT%H:%M:%S", &tm);
     if (dp != NULL && *dp == '.')
 	usec = strtod(dp, NULL);
     else
@@ -392,7 +392,7 @@ timestamp_t iso8601_to_unix( /*@in@*/ char *isotime)
      */
     (void)snprintf(fractstr, sizeof(fractstr), "%.3f", fractional);
     /* add fractional part, ignore leading 0; "0.2" -> ".2" */
-    /*@i2@*/(void)snprintf(isotime, len, "%s%sZ",timestr, strchr(fractstr,'.'));
+    (void)snprintf(isotime, len, "%s%sZ",timestr, strchr(fractstr,'.'));
     return isotime;
 }
 /* *INDENT-ON* */
diff --git a/libgps_shm.c b/libgps_shm.c
index 8eb38041..faa4c548 100644
--- a/libgps_shm.c
+++ b/libgps_shm.c
@@ -136,7 +136,7 @@ int gps_shm_read(struct gps_data_t *gpsdata)
 	    (void)memcpy((void *)gpsdata,
 			 (void *)&noclobber,
 			 sizeof(struct gps_data_t));
-	    /*@i1@*/gpsdata->privdata = private_save;
+	    gpsdata->privdata = private_save;
 	    PRIVATE(gpsdata)->tick = after;
 	    if ((gpsdata->set & REPORT_IS)!=0) {
 		if (gpsdata->fix.mode >= 2)
diff --git a/netlib.c b/netlib.c
index fc49cf9d..8718fc3d 100644
--- a/netlib.c
+++ b/netlib.c
@@ -189,7 +189,7 @@ char *netlib_sock2ip(socket_t fd)
 {
     sockaddr_t fsin;
     socklen_t alen = (socklen_t) sizeof(fsin);
-    /*@i1@*/ static char ip[INET6_ADDRSTRLEN];
+    static char ip[INET6_ADDRSTRLEN];
     int r;
 
     r = getpeername(fd, &(fsin.sa), &alen);
diff --git a/ntpshmread.c b/ntpshmread.c
index 1282f779..3abe984e 100644
--- a/ntpshmread.c
+++ b/ntpshmread.c
@@ -52,7 +52,7 @@ char *ntp_name(const int unit)
 {
     static char name[5] = "NTP\0";
 
-    /*@i2@*/name[3] = '0' + (char)unit;
+    name[3] = '0' + (char)unit;
 
     return name;
 }
-- 
cgit v1.2.1