diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2014-08-27 16:26:52 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2014-08-27 16:26:52 -0400 |
| commit | 6203e5b8fcac9d78ea54b7b3c53cb8d084e8a219 (patch) | |
| tree | d8611d8e44267151c29ab8920702cc94e86063c5 /test_packet.c | |
| parent | b53db1322c70f8b86dfe72e982d6097304a749ae (diff) | |
| download | gpsd-6203e5b8fcac9d78ea54b7b3c53cb8d084e8a219.tar.gz | |
Introduce struct errout_t to encapsulate error-reporting hooks.
A major step towards eliminating reverse linkage.
All regression tests pass.
Diffstat (limited to 'test_packet.c')
| -rw-r--r-- | test_packet.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/test_packet.c b/test_packet.c index 5adadd47..f0e5b503 100644 --- a/test_packet.c +++ b/test_packet.c @@ -272,21 +272,21 @@ static struct map runontests[] = { static int packet_test(struct map *mp) { - struct gps_lexer_t packet; + struct gps_lexer_t lexer; int failure = 0; - lexer_init(&packet); - packet.debug = verbose; - /*@i@*/ memcpy(packet.inbufptr = packet.inbuffer, mp->test, mp->testlen); - packet.inbuflen = mp->testlen; + lexer_init(&lexer); + lexer.errout.debug = verbose; + /*@i@*/ memcpy(lexer.inbufptr = lexer.inbuffer, mp->test, mp->testlen); + lexer.inbuflen = mp->testlen; /*@ -compdef -uniondef -usedef -formatcode @*/ - packet_parse(&packet); - if (packet.type != mp->type) + packet_parse(&lexer); + if (lexer.type != mp->type) printf("%2zi: %s test FAILED (packet type %d wrong).\n", - mp - singletests + 1, mp->legend, packet.type); + mp - singletests + 1, mp->legend, lexer.type); else if (memcmp - (mp->test + mp->garbage_offset, packet.outbuffer, - packet.outbuflen)) { + (mp->test + mp->garbage_offset, lexer.outbuffer, + lexer.outbuflen)) { printf("%2zi: %s test FAILED (data garbled).\n", mp - singletests + 1, mp->legend); ++failure; @@ -299,18 +299,18 @@ static int packet_test(struct map *mp) static void runon_test(struct map *mp) { - struct gps_lexer_t packet; + struct gps_lexer_t lexer; int nullfd = open("/dev/null", O_RDONLY); ssize_t st; - lexer_init(&packet); - packet.debug = verbose; - /*@i@*/ memcpy(packet.inbufptr = packet.inbuffer, mp->test, mp->testlen); - packet.inbuflen = mp->testlen; + lexer_init(&lexer); + lexer.errout.debug = verbose; + /*@i@*/ memcpy(lexer.inbufptr = lexer.inbuffer, mp->test, mp->testlen); + lexer.inbuflen = mp->testlen; /*@ -compdef -uniondef -usedef -formatcode @*/ (void)fputs(mp->test, stdout); do { - st = packet_get(nullfd, &packet); + st = packet_get(nullfd, &lexer); //printf("packet_parse() returned %zd\n", st); } while (st > 0); /*@ +compdef +uniondef +usedef +formatcode @*/ |