diff options
author | Eric S. Raymond <esr@thyrsus.com> | 2011-09-27 16:07:50 -0400 |
---|---|---|
committer | Eric S. Raymond <esr@thyrsus.com> | 2011-09-27 16:07:50 -0400 |
commit | 7800222b3ddb462a6ab92f0f1950abf78eabf10b (patch) | |
tree | 7efea7787d531318f9cc400910e31668e6a70091 /gpxlogger.c | |
parent | e7ad4f5d8ccb1203b6590c763444755c58a1d759 (diff) | |
download | gpsd-7800222b3ddb462a6ab92f0f1950abf78eabf10b.tar.gz |
More API convergence.
Diffstat (limited to 'gpxlogger.c')
-rw-r--r-- | gpxlogger.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/gpxlogger.c b/gpxlogger.c index f9e35bb5..46a2fe93 100644 --- a/gpxlogger.c +++ b/gpxlogger.c @@ -230,6 +230,7 @@ static int socket_mainloop(void) print_gpx_header(); gps_sock_mainloop(&gpsdata, 5000000, conditionally_log_fix); print_gpx_footer(); + (void)gps_sock_close(&gpsdata); return 0; } /*@+mustfreefresh +compdestroy@*/ @@ -254,16 +255,9 @@ static int shm_mainloop(void) } print_gpx_header(); - for (;;) { - status = gps_read(&gpsdata); - - if (status == -1) - break; - if (status > 0) - conditionally_log_fix(&gpsdata, true); - } + gps_shm_mainloop(&gpsdata, 0, conditionally_log_fix); print_gpx_footer(); - (void)gps_close(&gpsdata); + (void)gps_shm_close(&gpsdata); return 0; } |