diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2011-01-10 14:36:36 -0500 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2011-01-10 14:36:36 -0500 |
| commit | 8e56d2fdd22d9d5f2c1254183fb5c18bfc3485e2 (patch) | |
| tree | 15f6889e71b1ed62c3cc47d9ddd1007a7624633c /libgps_core.c | |
| parent | 0fdde9419256de23185ee412d58abb19f20a4bed (diff) | |
| download | gpsd-8e56d2fdd22d9d5f2c1254183fb5c18bfc3485e2.tar.gz | |
Remove subframesflag so they're omitted uncinditionally.
Diffstat (limited to 'libgps_core.c')
| -rw-r--r-- | libgps_core.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libgps_core.c b/libgps_core.c index 4b849d01..3d38ab85 100644 --- a/libgps_core.c +++ b/libgps_core.c @@ -642,7 +642,7 @@ int gps_stream(struct gps_data_t *gpsdata, unsigned int flags, { char buf[GPS_JSON_COMMAND_MAX]; - if ((flags & (WATCH_JSON | WATCH_OLDSTYLE | WATCH_NMEA | WATCH_RAW | WATCH_SUBFRAMES)) == 0) { + if ((flags & (WATCH_JSON | WATCH_OLDSTYLE | WATCH_NMEA | WATCH_RAW)) == 0) { flags |= WATCH_JSON; } #ifndef USE_QT @@ -664,8 +664,6 @@ int gps_stream(struct gps_data_t *gpsdata, unsigned int flags, (void)strlcat(buf, "\"raw\":1,", sizeof(buf)); if (flags & WATCH_RARE) (void)strlcat(buf, "\"raw\":0,", sizeof(buf)); - if (flags & WATCH_SUBFRAMES) - (void)strlcat(buf, "\"subframes\":false,", sizeof(buf)); if (flags & WATCH_SCALED) (void)strlcat(buf, "\"scaled\":false,", sizeof(buf)); if (buf[strlen(buf) - 1] == ',') @@ -690,8 +688,6 @@ int gps_stream(struct gps_data_t *gpsdata, unsigned int flags, (void)strlcat(buf, "\"raw\":1,", sizeof(buf)); if (flags & WATCH_RAW) (void)strlcat(buf, "\"raw\":2,", sizeof(buf)); - if (flags & WATCH_SUBFRAMES) - (void)strlcat(buf, "\"subframes\":true,", sizeof(buf)); if (flags & WATCH_SCALED) (void)strlcat(buf, "\"scaled\":true,", sizeof(buf)); /*@-nullpass@*//* shouldn't be needed, splint has a bug */ |