diff options
| -rw-r--r-- | gpxlogger.c | 1 | ||||
| -rw-r--r-- | libgps_core.c | 4 | ||||
| -rw-r--r-- | libgps_sock.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/gpxlogger.c b/gpxlogger.c index cf0f5cf0..c46df2ff 100644 --- a/gpxlogger.c +++ b/gpxlogger.c @@ -262,7 +262,6 @@ int main(int argc, char **argv) case 'l': export_list(stderr); exit(0); - break; case 'm': minmove = (double )atoi(optarg); break; diff --git a/libgps_core.c b/libgps_core.c index 25600ea3..f8edff46 100644 --- a/libgps_core.c +++ b/libgps_core.c @@ -183,9 +183,10 @@ int gps_stream(struct gps_data_t *gpsdata CONDITIONALLY_UNUSED, return status; } -const char /*@observer@*/ *gps_data(const struct gps_data_t *gpsdata CONDITIONALLY_UNUSED) +const char /*@null observer@*/ *gps_data(const struct gps_data_t *gpsdata CONDITIONALLY_UNUSED) /* return the contents of the client data buffer */ { + /*@-dependenttrans -observertrans@*/ const char *bufp = NULL; #ifdef SOCKET_EXPORT_ENABLE @@ -193,6 +194,7 @@ const char /*@observer@*/ *gps_data(const struct gps_data_t *gpsdata CONDITIONAL #endif /* SOCKET_EXPORT_ENABLE */ return bufp; + /*@+dependenttrans +observertrans@*/ } bool gps_waiting(const struct gps_data_t *gpsdata CONDITIONALLY_UNUSED, int timeout CONDITIONALLY_UNUSED) diff --git a/libgps_sock.c b/libgps_sock.c index eee2b926..7a34a75b 100644 --- a/libgps_sock.c +++ b/libgps_sock.c @@ -39,6 +39,7 @@ extern char *strtok_r(char *, const char *, char **); #endif /* S_SPLINT_S */ +/*@-matchfields@*/ struct privdata_t { bool newstyle; @@ -49,6 +50,7 @@ struct privdata_t int waitcount; #endif /* LIBGPS_DEBUG */ }; +/*@+matchfields@*/ #define PRIVATE(gpsdata) ((struct privdata_t *)gpsdata->privdata) /*@-branchstate@*/ |