diff options
author | Fred Wright <fw@fwright.net> | 2017-03-05 18:07:39 -0800 |
---|---|---|
committer | Fred Wright <fw@fwright.net> | 2017-03-05 18:08:49 -0800 |
commit | de68447c41f253681a31a431a898909a2e48fc51 (patch) | |
tree | 48ee7745668284dcfdc7c224fd23b2c332ad2bdd /packet.c | |
parent | 6a0c1cf434ae84165156ff41c1f94923bf479be7 (diff) | |
download | gpsd-de68447c41f253681a31a431a898909a2e48fc51.tar.gz |
Reverts broken portion of old character pushback change.
This one instance of the 63 character-pushback changes in commit
fbaaaa76 broke the packet-regress test, though that was masked due to
another bug's causing that test to be disabled. With this instance
reverted, the test passes again.
It's not entirely clear why a change within Zodiac-specific code broke
one SiRF test and two Evermore tests, but that's empirically the case.
This change affects one daemon regression test. The ublox-8 test
begins with a $GPRMC sentence preceded by a bunch of garbage. The
broken version of packet.c skips this sentence, while the fixed
version recognizes it. The test data has been updated accordingly.
TESTED:
Manually ran the packet-regress test successfully.
Ran "scons build-all www check".
Diffstat (limited to 'packet.c')
-rw-r--r-- | packet.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1104,7 +1104,7 @@ static bool nextstate(struct gps_lexer_t *lexer, unsigned char c) if (c == 0x81) lexer->state = ZODIAC_LEADER_2; else - return character_pushback(lexer, GROUND_STATE); + (void) character_pushback(lexer, GROUND_STATE); break; case ZODIAC_LEADER_2: lexer->state = ZODIAC_ID_1; |