summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2011-02-16 15:44:17 -0500
committerEric S. Raymond <esr@thyrsus.com>2011-02-16 15:44:17 -0500
commit9856fc48b5a3cc949eda67f10abd4d1ad302ec00 (patch)
tree0e0d7980d1d1facd9e518244dbc5dd9561b042e6
parent2ca93b4a293a354ef99b0ce8d63c19fdbcbb2749 (diff)
downloadgpsd-9856fc48b5a3cc949eda67f10abd4d1ad302ec00.tar.gz
splint cleanup. All regression tests pass.
-rw-r--r--gpsdecode.c4
-rw-r--r--libgpsd_core.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/gpsdecode.c b/gpsdecode.c
index 792a4e16..3058e9dd 100644
--- a/gpsdecode.c
+++ b/gpsdecode.c
@@ -358,7 +358,7 @@ static void aivdm_csv_dump(struct ais_t *ais, char *buf, size_t buflen)
}
#endif
-/*@ -compdestroy -compdef -usedef @*/
+/*@ -compdestroy -compdef -usedef -uniondef @*/
static void decode(FILE * fpin, FILE * fpout)
/* sensor data on fpin to dump format on fpout */
{
@@ -412,7 +412,7 @@ static void decode(FILE * fpin, FILE * fpout)
}
}
}
-/*@ +compdestroy +compdef +usedef @*/
+/*@ +compdestroy +compdef +usedef +uniondef @*/
/*@ -compdestroy @*/
static void encode(FILE * fpin, FILE * fpout)
diff --git a/libgpsd_core.c b/libgpsd_core.c
index 4e6cdd70..a1d7654d 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -151,6 +151,7 @@ int gpsd_switch_driver(struct gps_device_t *session, char *type_name)
/*@ +compmempass @*/
}
+/*@-compdestroy@*/
void gps_context_init(struct gps_context_t *context)
{
/* *INDENT-OFF* */
@@ -185,6 +186,7 @@ void gps_context_init(struct gps_context_t *context)
/* *INDENT-ON* */
(void)memcpy(context, &nullcontext, sizeof(struct gps_context_t));
}
+/*@+compdestroy@*/
void gpsd_init(struct gps_device_t *session, struct gps_context_t *context,
char *device)