From 06f60e2a3be7befc41d03ca1533aaadf20f274de Mon Sep 17 00:00:00 2001 From: Erik Ekman Date: Sat, 12 Jul 2008 20:57:30 +0000 Subject: [PATCH] Removed needless va_str() --- tests/base32.c | 10 +++++----- tests/base64.c | 14 ++++++------- tests/dns.c | 16 +++++++-------- tests/encoding.c | 8 ++++---- tests/read.c | 52 ++++++++++++++++++++++++------------------------ tests/test.c | 16 +-------------- 6 files changed, 51 insertions(+), 65 deletions(-) diff --git a/tests/base32.c b/tests/base32.c index b020cda..849790c 100644 --- a/tests/base32.c +++ b/tests/base32.c @@ -31,7 +31,7 @@ static struct tuple } testpairs[] = { { "iodinetestingtesting", "nfxwi0lomv0gk21unfxgo3dfon0gs1th" }, { "abc123", "mfrggmjsgm" }, - { NULL, NULL } + { NULL, NULL } }; START_TEST(test_base32_encode) @@ -46,8 +46,8 @@ START_TEST(test_base32_encode) val = base32_encode(buf, &len, testpairs[i].a, strlen(testpairs[i].a)); fail_unless(val > 0, strerror(errno)); - fail_unless(strcmp(buf, testpairs[i].b) == 0, - va_str("'%s' != '%s'", buf, testpairs[i].b)); + fail_unless(strcmp(buf, testpairs[i].b) == 0, + "'%s' != '%s'", buf, testpairs[i].b); } } END_TEST @@ -65,8 +65,8 @@ START_TEST(test_base32_decode) fail_unless(val > 0, strerror(errno)); fail_unless(buf != NULL, "buf == NULL"); - fail_unless(strcmp(buf, testpairs[i].a) == 0, - va_str("'%s' != '%s'", buf, testpairs[i].a)); + fail_unless(strcmp(buf, testpairs[i].a) == 0, + "'%s' != '%s'", buf, testpairs[i].a); } } END_TEST diff --git a/tests/base64.c b/tests/base64.c index 7f12bf4..4516879 100644 --- a/tests/base64.c +++ b/tests/base64.c @@ -31,7 +31,7 @@ static struct tuple } testpairs[] = { { "iodinetestingtesting", "Aw8KAw4LDgvZDgLUz2rLC2rPBMC" }, { "abc123", "ywjJmtiZ" }, - { + { "\xFF\xEF\x7C\xEF\xAE\x78\xDF\x6D\x74\xCF\x2C\x70\xBE\xEB\x6C\xAE\xAA\x68" "\x9E\x69\x64\x8E\x28\x60\x7D\xE7\x5C\x6D\xA6\x58\x5D\x65\x54\x4D\x24\x50" "\x3C\xE3\x4C\x2C\xA2\x48\x1C\x61\x44\x0C\x20\x40\x3F\x3F\x3C\xEF\xAE\x78" @@ -45,7 +45,7 @@ static struct tuple "776543210-ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba9abba87654" "3210-ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfe999dcba" }, - { + { "\xFF\xEF\x7C\xEF\xAE\x78\xDF\x6D\x74\xCF\x2C\x70\xBE\xEB\x6C\xAE\xAA\x68" "\x9E\x69\x64\x8E\x28\x60\x7D\xE7\x5C\x6D\xA6\x58\x5D\x65\x54\x4D\x24\x50" "\x3C\xE3\x4C\x2C\xA2\x48\x1C\x61\x44\x0C\x20\x40\x3F\x3F\x3C\xEF\xAE\x78" @@ -59,7 +59,7 @@ static struct tuple "776543210-ZYXWVUTSRQfHKwfHGsHGFEDCBAzyxwvutsrqponmlkjihgfedcbaML87654321" "0-ZYXWVUTSRQfHKwfHGsHGFEDCBAzyxwvutsrqponmlkjihgfedcba" }, - { NULL, NULL } + { NULL, NULL } }; START_TEST(test_base64_encode) @@ -74,8 +74,8 @@ START_TEST(test_base64_encode) val = base64_encode(buf, &len, testpairs[i].a, strlen(testpairs[i].a)); fail_unless(val > 0, strerror(errno)); - fail_unless(strcmp(buf, testpairs[i].b) == 0, - va_str("'%s' != '%s'", buf, testpairs[i].b)); + fail_unless(strcmp(buf, testpairs[i].b) == 0, + "'%s' != '%s'", buf, testpairs[i].b); } } END_TEST @@ -93,8 +93,8 @@ START_TEST(test_base64_decode) fail_unless(val > 0, strerror(errno)); fail_unless(buf != NULL, "buf == NULL"); - fail_unless(strcmp(buf, testpairs[i].a) == 0, - va_str("'%s' != '%s'", buf, testpairs[i].a)); + fail_unless(strcmp(buf, testpairs[i].a) == 0, + "'%s' != '%s'", buf, testpairs[i].a); } } END_TEST diff --git a/tests/dns.c b/tests/dns.c index 1311d33..0ccf232 100644 --- a/tests/dns.c +++ b/tests/dns.c @@ -33,24 +33,24 @@ static void dump_packet(char *, size_t); -static char queryPacket[] = +static char queryPacket[] = "\x05\x39\x01\x00\x00\x01\x00\x00\x00\x00\x00\x01\x2D\x41\x6A\x62\x63" "\x75\x79\x74\x63\x70\x65\x62\x30\x67\x71\x30\x6C\x74\x65\x62\x75\x78" "\x67\x69\x64\x75\x6E\x62\x73\x73\x61\x33\x64\x66\x6F\x6E\x30\x63\x61" "\x7A\x64\x62\x6F\x72\x71\x71\x04\x6B\x72\x79\x6F\x02\x73\x65\x00\x00" "\x0A\x00\x01\x00\x00\x29\x10\x00\x00\x00\x80\x00\x00\x00"; -static char answerPacket[] = +static char answerPacket[] = "\x05\x39\x84\x00\x00\x01\x00\x01\x00\x00\x00\x00\x05\x73\x69\x6C\x6C" "\x79\x04\x68\x6F\x73\x74\x02\x6F\x66\x06\x69\x6F\x64\x69\x6E\x65\x04" "\x63\x6F\x64\x65\x04\x6B\x72\x79\x6F\x02\x73\x65\x00\x00\x0A\x00\x01" "\xC0\x0C\x00\x0A\x00\x01\x00\x00\x00\x00\x00\x23\x74\x68\x69\x73\x20" "\x69\x73\x20\x74\x68\x65\x20\x6D\x65\x73\x73\x61\x67\x65\x20\x74\x6F" "\x20\x62\x65\x20\x64\x65\x6C\x69\x76\x65\x72\x65\x64"; - + static char *msgData = "this is the message to be delivered"; static char *topdomain = "kryo.se"; - + static char *innerData = "HELLO this is the test data"; START_TEST(test_encode_query) @@ -88,7 +88,7 @@ START_TEST(test_encode_query) dump_packet(buf, ret); } fail_unless(strncmp(queryPacket, buf, sizeof(queryPacket)) == 0, "Did not compile expected packet"); - fail_unless(ret == len, va_str("Bad packet length: %d, expected %d", ret, len)); + fail_unless(ret == len, "Bad packet length: %d, expected %d", ret, len); } END_TEST @@ -112,7 +112,7 @@ START_TEST(test_decode_query) unpack_data(buf, len, &(q.name[1]), (int) (domain - q.name) - 1, enc); fail_unless(strncmp(buf, innerData, strlen(innerData)) == 0, "Did not extract expected host: '%s'", buf); - fail_unless(strlen(buf) == strlen(innerData), va_str("Bad host length: %d, expected %d: '%s'", strlen(buf), strlen(innerData), buf)); + fail_unless(strlen(buf) == strlen(innerData), "Bad host length: %d, expected %d: '%s'", strlen(buf), strlen(innerData), buf); } END_TEST @@ -135,7 +135,7 @@ START_TEST(test_encode_response) len = sizeof(answerPacket) - 1; /* Skip extra null character */ fail_unless(strncmp(answerPacket, buf, sizeof(answerPacket)) == 0, "Did not compile expected packet"); - fail_unless(ret == len, va_str("Bad packet length: %d, expected %d", ret, len)); + fail_unless(ret == len, "Bad packet length: %d, expected %d", ret, len); } END_TEST @@ -150,7 +150,7 @@ START_TEST(test_decode_response) ret = dns_decode(buf, len, NULL, QR_ANSWER, answerPacket, sizeof(answerPacket)-1); fail_unless(strncmp(msgData, buf, sizeof(msgData)) == 0, "Did not extract expected data"); - fail_unless(ret == strlen(msgData), va_str("Bad data length: %d, expected %d", ret, strlen(msgData))); + fail_unless(ret == strlen(msgData), "Bad data length: %d, expected %d", ret, strlen(msgData)); } END_TEST diff --git a/tests/encoding.c b/tests/encoding.c index fcfae49..767a697 100644 --- a/tests/encoding.c +++ b/tests/encoding.c @@ -27,9 +27,9 @@ struct tuple char *a; char *b; } dottests[] = { - { "aaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + { "aaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "aaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.a"}, - { "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + { "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa."}, { "abc123", "abc123" }, { NULL, NULL } @@ -49,7 +49,7 @@ START_TEST(test_inline_dotify) inline_dotify(b, sizeof(temp)); fail_unless(strcmp(dottests[i].b, temp) == 0, - va_str("'%s' != '%s'", temp, dottests[i].b)); + "'%s' != '%s'", temp, dottests[i].b); i++; } } @@ -69,7 +69,7 @@ START_TEST(test_inline_undotify) inline_undotify(b, sizeof(temp)); fail_unless(strcmp(dottests[i].a, temp) == 0, - va_str("'%s' != '%s'", temp, dottests[i].a)); + "'%s' != '%s'", temp, dottests[i].a); i++; } } diff --git a/tests/read.c b/tests/read.c index 14a139a..e82546a 100644 --- a/tests/read.c +++ b/tests/read.c @@ -33,7 +33,7 @@ #include "dns.h" #include "read.h" #include "test.h" - + START_TEST(test_read_putshort) { unsigned short k; @@ -44,15 +44,15 @@ START_TEST(test_read_putshort) for (i = 0; i < 65536; i++) { p = (char*)&k; putshort(&p, i); - fail_unless(ntohs(k) == i, - va_str("Bad value on putshort for %d: %d != %d", - i, ntohs(k), i)); + fail_unless(ntohs(k) == i, + "Bad value on putshort for %d: %d != %d", + i, ntohs(k), i); p = (char*)&k; readshort(NULL, &p, (short *) &l); fail_unless(l == i, - va_str("Bad value on readshort for %d: %d != %d", - i, l, i)); + "Bad value on readshort for %d: %d != %d", + i, l, i); } } END_TEST @@ -71,14 +71,14 @@ START_TEST(test_read_putlong) putlong(&p, j); - fail_unless(ntohl(k) == j, - va_str("Bad value on putlong for %d: %d != %d", i, ntohl(j), j)); - + fail_unless(ntohl(k) == j, + "Bad value on putlong for %d: %d != %d", i, ntohl(j), j); + p = (char*)&k; readlong(NULL, &p, &l); fail_unless(l == j, - va_str("Bad value on readlong for %d: %d != %d", i, l, j)); + "Bad value on readlong for %d: %d != %d", i, l, j); } } END_TEST @@ -87,11 +87,11 @@ START_TEST(test_read_name) { unsigned char emptyloop[] = { 'A', 'A', 0x81, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xc0, 0x0c, 0x00, 0x01, 0x00, 0x01 }; + 0xc0, 0x0c, 0x00, 0x01, 0x00, 0x01 }; unsigned char infloop[] = { 'A', 'A', 0x81, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 'A', 0xc0, 0x0c, 0x00, 0x01, 0x00, 0x01 }; - unsigned char longname[] = + 0x01, 'A', 0xc0, 0x0c, 0x00, 0x01, 0x00, 0x01 }; + unsigned char longname[] = "AA\x81\x80\x00\x01\x00\x00\x00\x00\x00\x00" "\x3FzBCDEFGHIJKLMNOPQURSTUVXYZ0123456789abcdefghijklmnopqrstuvxyzAA" "\x3FzBCDEFGHIJKLMNOPQURSTUVXYZ0123456789abcdefghijklmnopqrstuvxyzAA" @@ -100,15 +100,15 @@ START_TEST(test_read_name) "\x3FzBCDEFGHIJKLMNOPQURSTUVXYZ0123456789abcdefghijklmnopqrstuvxyzAA" "\x3FzBCDEFGHIJKLMNOPQURSTUVXYZ0123456789abcdefghijklmnopqrstuvxyzAA" "\x00\x00\x01\x00\x01"; - unsigned char onejump[] = + unsigned char onejump[] = "AA\x81\x80\x00\x01\x00\x00\x00\x00\x00\x00" "\x02hh\xc0\x15\x00\x01\x00\x01\x05zBCDE\x00"; unsigned char badjump[] = { 'A', 'A', 0x81, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xfe, 0xcc, 0x00, 0x01, 0x00, 0x01 }; + 0xfe, 0xcc, 0x00, 0x01, 0x00, 0x01 }; unsigned char badjump2[] = { 'A', 'A', 0x81, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x02, 'B', 'A', 0xfe, 0xcc, 0x00, 0x01, 0x00, 0x01 }; + 0x02, 'B', 'A', 0xfe, 0xcc, 0x00, 0x01, 0x00, 0x01 }; unsigned char *jumper; char buf[1024]; char *data; @@ -119,13 +119,13 @@ START_TEST(test_read_name) buf[1023] = 'A'; rv = readname((char *) emptyloop, sizeof(emptyloop), &data, buf, 1023); fail_unless(buf[1023] == 'A', NULL); - + memset(buf, 0, sizeof(buf)); data = (char*) infloop + sizeof(HEADER); buf[4] = '\a'; rv = readname((char*) infloop, sizeof(infloop), &data, buf, 4); fail_unless(buf[4] == '\a', NULL); - + memset(buf, 0, sizeof(buf)); data = (char*) longname + sizeof(HEADER); buf[256] = '\a'; @@ -136,7 +136,7 @@ START_TEST(test_read_name) data = (char*) onejump + sizeof(HEADER); rv = readname((char*) onejump, sizeof(onejump), &data, buf, 256); fail_unless(rv == 9, NULL); - + /* These two tests use malloc to cause segfault if jump is executed */ memset(buf, 0, sizeof(buf)); jumper = malloc(sizeof(badjump)); @@ -149,7 +149,7 @@ START_TEST(test_read_name) fail_unless(buf[0] == 0, NULL); } free(jumper); - + memset(buf, 0, sizeof(buf)); jumper = malloc(sizeof(badjump2)); if (jumper) { @@ -158,8 +158,8 @@ START_TEST(test_read_name) rv = readname((char*) jumper, sizeof(badjump2), &data, buf, 256); fail_unless(rv == 4, NULL); - fail_unless(strcmp("BA.", buf) == 0, - va_str("buf is not BA: %s", buf)); + fail_unless(strcmp("BA.", buf) == 0, + "buf is not BA: %s", buf); } free(jumper); } @@ -184,11 +184,11 @@ START_TEST(test_putname) fail_unless(strncmp(buf, out, ret) == 0, "Happy flow failed"); } END_TEST - + START_TEST(test_putname_nodot) { char buf[256]; - char *nodot = + char *nodot = "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ"; char *b; @@ -205,11 +205,11 @@ START_TEST(test_putname_nodot) fail_unless(b == buf, NULL); } END_TEST - + START_TEST(test_putname_toolong) { char buf[256]; - char *toolong = + char *toolong = "ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ." "ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ." "ABCDEFGHIJKLMNOPQRSTUVWXYZ.ABCDEFGHIJKLMNOPQRSTUVWXYZ." diff --git a/tests/test.c b/tests/test.c index b01417f..df354a9 100644 --- a/tests/test.c +++ b/tests/test.c @@ -22,20 +22,6 @@ #include "test.h" -char * -va_str(const char *fmt, ...) -{ - static char buf[512]; - va_list ap; - - memset(buf, 0, sizeof(buf)); - va_start(ap, fmt); - vsnprintf(buf, sizeof(buf), fmt, ap); - va_end(ap); - - return buf; -} - int main() { @@ -68,7 +54,7 @@ main() suite_add_tcase(iodine, test); runner = srunner_create(iodine); - srunner_run_all(runner, CK_VERBOSE); + srunner_run_all(runner, CK_MINIMAL); failed = srunner_ntests_failed(runner); srunner_free(runner);