diff options
author | Zbigniew Chyla <zbigniew.chyla@nsn.com> | 2015-01-16 15:46:59 +0100 |
---|---|---|
committer | Eric S. Raymond <esr@thyrsus.com> | 2015-01-21 10:47:26 -0500 |
commit | 4abdcf1ac9a891a5010f238214150adbc2073b38 (patch) | |
tree | ccd55b9a74504246569a0d84d7853370541cad34 /pseudonmea.c | |
parent | b500289f7af867ee5d5c236247f8f8a2a48ad342 (diff) | |
download | gpsd-4abdcf1ac9a891a5010f238214150adbc2073b38.tar.gz |
Add str_{,v}appendf, use it everywhere.
This change doesn't affect generated binary code.
Diffstat (limited to 'pseudonmea.c')
-rw-r--r-- | pseudonmea.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/pseudonmea.c b/pseudonmea.c index d92e99dd..153e1765 100644 --- a/pseudonmea.c +++ b/pseudonmea.c @@ -9,6 +9,7 @@ #include <time.h> #include "gpsd.h" +#include "strfuncs.h" /* * Support for generic binary drivers. These functions dump NMEA for passing @@ -52,24 +53,19 @@ void gpsd_position_fix_dump(struct gps_device_t *session, if (isnan(session->gpsdata.dop.hdop)) (void)strlcat(bufp, ",", len); else - (void)snprintf(bufp + strlen(bufp), len - strlen(bufp), - "%.2f,", session->gpsdata.dop.hdop); + str_appendf(bufp, len, "%.2f,", session->gpsdata.dop.hdop); if (isnan(session->gpsdata.fix.altitude)) (void)strlcat(bufp, ",", len); else - (void)snprintf(bufp + strlen(bufp), len - strlen(bufp), - "%.2f,M,", session->gpsdata.fix.altitude); + str_appendf(bufp, len, "%.2f,M,", session->gpsdata.fix.altitude); if (isnan(session->gpsdata.separation)) (void)strlcat(bufp, ",", len); else - (void)snprintf(bufp + strlen(bufp), len - strlen(bufp), - "%.3f,M,", session->gpsdata.separation); + str_appendf(bufp, len, "%.3f,M,", session->gpsdata.separation); if (isnan(session->mag_var)) (void)strlcat(bufp, ",", len); else { - (void)snprintf(bufp + strlen(bufp), - len - strlen(bufp), - "%3.2f,", fabs(session->mag_var)); + str_appendf(bufp, len, "%3.2f,", fabs(session->mag_var)); (void)strlcat(bufp, (session->mag_var > 0) ? "E" : "W", len); } nmea_add_checksum(bufp); |