diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-06-30 04:37:26 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-06-30 04:37:26 -0400 |
| commit | cfb5daa16285c63739384dcf256a44b2134e7828 (patch) | |
| tree | c22f1de76b5d4eac0516685eb07b85d184e8b4bc | |
| parent | 835994cbf2fe3bd516c914ca269596dfbab680de (diff) | |
| download | gpsd-cfb5daa16285c63739384dcf256a44b2134e7828.tar.gz | |
Cosmetic fix from mike_t, slightly hacked. All regression tests pass.
| -rw-r--r-- | gpsdclient.h | 3 | ||||
| -rw-r--r-- | gpxlogger.c | 4 | ||||
| -rw-r--r-- | monitor_nmea.c | 6 | ||||
| -rw-r--r-- | monitor_sirf.c | 4 |
4 files changed, 10 insertions, 7 deletions
diff --git a/gpsdclient.h b/gpsdclient.h index 799de6ce..acc4017e 100644 --- a/gpsdclient.h +++ b/gpsdclient.h @@ -28,5 +28,8 @@ extern void gpsd_source_spec(/*@null@*/const char *fromstring, char *maidenhead(double n,double e); +/* this needs to match JSON_DATE_MAX in gpsd.h */ +#define CLIENT_DATE_MAX 24 + #endif /* _GPSDCLIENT_H_ */ /* gpsdclient.h ends here */ diff --git a/gpxlogger.c b/gpxlogger.c index 02aa7377..ce049316 100644 --- a/gpxlogger.c +++ b/gpxlogger.c @@ -47,7 +47,7 @@ static int debug; static void print_gpx_header(void) { - char tbuf[128]; + char tbuf[CLIENT_DATE_MAX+1]; (void)fprintf(logfile,"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"); (void)fprintf(logfile,"<gpx version=\"1.1\" creator=\"GPSD %s - http://gpsd.berlios.de/\"\n", VERSION); @@ -86,7 +86,7 @@ static void print_gpx_trk_start(void) static void print_fix(struct gps_data_t *gpsdata, double time) { - char tbuf[128]; + char tbuf[CLIENT_DATE_MAX+1]; (void)fprintf(logfile," <trkpt lat=\"%f\" lon=\"%f\">\n", gpsdata->fix.latitude, gpsdata->fix.longitude); diff --git a/monitor_nmea.c b/monitor_nmea.c index cf4cb722..2cdac01f 100644 --- a/monitor_nmea.c +++ b/monitor_nmea.c @@ -44,7 +44,7 @@ static bool nmea_initialize(void) (void)syncok(cookedwin, true); (void)wattrset(cookedwin, A_BOLD); (void)mvwaddstr(cookedwin, 1, 1, "Time: "); - (void)mvwaddstr(cookedwin, 1, 31, "Lat: "); + (void)mvwaddstr(cookedwin, 1, 32, "Lat: "); (void)mvwaddstr(cookedwin, 1, 55, "Lon: "); (void)mvwaddstr(cookedwin, 2, 34, " Cooked PVT "); (void)wattrset(cookedwin, A_NORMAL); @@ -134,7 +134,7 @@ static void cooked_pvt(void) (void)unix_to_iso8601(session.gpsdata.fix.time, scr, sizeof(scr)); } else (void)snprintf(scr, sizeof(scr), "n/a"); - (void)mvwprintw(cookedwin, 1, 7, "%-22s", scr); + (void)mvwprintw(cookedwin, 1, 7, "%-24s", scr); if (session.gpsdata.fix.mode >= MODE_2D @@ -145,7 +145,7 @@ static void cooked_pvt(void) (session.gpsdata.fix.latitude < 0) ? 'S' : 'N'); } else (void)snprintf(scr, sizeof(scr), "n/a"); - (void)mvwprintw(cookedwin, 1, 36, "%-17s", scr); + (void)mvwprintw(cookedwin, 1, 37, "%-17s", scr); if (session.gpsdata.fix.mode >= MODE_2D && isnan(session.gpsdata.fix.longitude) == 0) { diff --git a/monitor_sirf.c b/monitor_sirf.c index b647f2ed..96e57d45 100644 --- a/monitor_sirf.c +++ b/monitor_sirf.c @@ -271,7 +271,7 @@ static void sirf_update(void) unsigned char *buf; size_t len; uint8_t dgps; - char tbuf[128]; + char tbuf[JSON_DATE_MAX+1]; assert(mid27win != NULL); buf = session.packet.outbuffer + 4; @@ -292,7 +292,7 @@ static void sirf_update(void) 17) / 8); /* line 3 */ (void)wmove(mid2win, 3, 7); - (void)wprintw(mid2win, "%-22s", + (void)wprintw(mid2win, "%-24s", unix_to_iso8601(session.gpsdata.fix.time, tbuf, sizeof(tbuf)) ); (void)wmove(mid2win, 3, 38); |