From d004b6a55f36506cbc5977d817bd4ce3c3903c6f Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sun, 27 Mar 2011 10:57:51 -0400 Subject: Re-identify most *_IS flags with corresponding *_SET flags. Required so clients looking at flag masks in data exported via the shared-memory interface will see the right thing. These were separated originally in order to avoid pushing the reqyuired width of the gpsdata.set flag mask over 32 bits. It became 64 bits in the Version 5 API change, so that constraint went away. All regression tests pass. --- gpsdecode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gpsdecode.c') diff --git a/gpsdecode.c b/gpsdecode.c index a8530688..213f4e55 100644 --- a/gpsdecode.c +++ b/gpsdecode.c @@ -381,11 +381,11 @@ static void decode(FILE *fpin, FILE*fpout) { gps_mask_t changed = gpsd_poll(&session); - if (changed == ERROR_IS || changed == NODATA_IS) + if (changed == ERROR_SET || changed == NODATA_IS) break; if (verbose >= 1 && TEXTUAL_PACKET_TYPE(session.packet.type)) (void)fputs((char *)session.packet.outbuffer, fpout); - if ((changed & (REPORT_IS|SUBFRAME_IS|AIS_IS|RTCM2_IS|RTCM3_IS)) == 0) + if ((changed & (REPORT_IS|SUBFRAME_SET|AIS_SET|RTCM2_SET|RTCM3_SET)) == 0) continue; else if (json) { json_data_report(changed, @@ -394,7 +394,7 @@ static void decode(FILE *fpin, FILE*fpout) (void)fputs(buf, fpout); #ifdef AIVDM_ENABLE } else if (session.packet.type == AIVDM_PACKET) { - if ((changed & AIS_IS)!=0) { + if ((changed & AIS_SET)!=0) { aivdm_csv_dump(&session.gpsdata.ais, buf, sizeof(buf)); (void)fputs(buf, fpout); } -- cgit v1.2.1