diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2015-03-13 09:01:36 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2015-03-13 09:01:36 -0400 |
| commit | a4fa606b6ed5b0a920504397f2726082d127b148 (patch) | |
| tree | 57bdf5f1f3faf8bdfc093f3f78021a0f5b5cb2af /ntpshmmon.c | |
| parent | df28d9d7f9eabd2373df031fa2939d0b41ee6caa (diff) | |
| download | gpsd-a4fa606b6ed5b0a920504397f2726082d127b148.tar.gz | |
Fix minor bug in ntpshmmon uncovered by Coverity.
Diffstat (limited to 'ntpshmmon.c')
| -rw-r--r-- | ntpshmmon.c | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/ntpshmmon.c b/ntpshmmon.c index 38447960..bfe4fd4c 100644 --- a/ntpshmmon.c +++ b/ntpshmmon.c @@ -21,21 +21,11 @@ static struct shmTime *segments[NTPSEGMENTS + 1]; static struct timespec tick[NTPSEGMENTS + 1]; -static void shm_shutdown(void) -/* shut down all active segments */ -{ - struct shmTime **pp; - - for (pp = segments; pp < segments + NTPSEGMENTS; pp++) - if (*pp != NULL) - (void)shmdt((void *)(*pp)); -} - int main(int argc, char **argv) { - int units = 0; int option; int i; + bool killall = false; bool verbose = false; int nsamples = INT_MAX; time_t timeout = (time_t)INT_MAX, starttime = time(NULL); @@ -47,14 +37,8 @@ int main(int argc, char **argv) nsamples = atoi(optarg); break; case 's': - if (units > 0) { - shm_shutdown(); - exit(EXIT_SUCCESS); - } else { - fprintf(stderr, "ntpshmmon: zero units declared.\n"); - exit(EXIT_FAILURE); - } - //break; + killall = true; + break; case 't': timeout = (time_t)atoi(optarg); break; @@ -78,6 +62,16 @@ int main(int argc, char **argv) if (verbose && segments[i] != NULL) fprintf(stderr, "unit %d opened\n", i); } + + if (killall) { + struct shmTime **pp; + + for (pp = segments; pp < segments + NTPSEGMENTS; pp++) + if (*pp != NULL) + (void)shmdt((void *)(*pp)); + exit(EXIT_SUCCESS); + } + (void)printf("ntpshmmon version 1\n"); do { |