Index: ossp-pkg/sa/sa_test.c RCS File: /v/ossp/cvs/ossp-pkg/sa/sa_test.c,v rcsdiff -q -kk '-r1.10' '-r1.11' -u '/v/ossp/cvs/ossp-pkg/sa/sa_test.c,v' 2>/dev/null --- sa_test.c 2001/10/31 19:28:49 1.10 +++ sa_test.c 2001/10/31 20:09:00 1.11 @@ -65,24 +65,25 @@ ts_test_check(TS_CTX, "sa_addr_create"); if ((rv = sa_addr_create(&saa)) != SA_OK) ts_test_fail(TS_CTX, "sa_addr_create -> %d[%s] (expected %d[%s])", - rv, sa_error(rv), SA_OK, sa_error(SA_OK)); + rv, sa_error(rv), SA_OK, sa_error(SA_OK)); for (i = 0; i < sizeof(table)/sizeof(table[0]); i++) { ts_test_check(TS_CTX, "sa_addr_u2a(\"%s\")", table[i].in); if ((rv = sa_addr_u2a(saa, table[i].in)) != table[i].rv) ts_test_fail(TS_CTX, "sa_addr_a2u -> %d[%s] (expected %d[%s])", - rv, sa_error(rv), table[i].rv, sa_error(table[i].rv)); + rv, sa_error(rv), table[i].rv, sa_error(table[i].rv)); ts_test_check(TS_CTX, "sa_addr_a2u"); if ((rv = sa_addr_a2u(saa, &cp)) != SA_OK) ts_test_fail(TS_CTX, "sa_addr_u2a -> %d[%s] (expected %d[%s])", - rv, sa_error(rv), SA_OK, sa_error(SA_OK)); + rv, sa_error(rv), SA_OK, sa_error(SA_OK)); if (table[i].rv == SA_OK) if (strcmp(cp, table[i].out) != 0) - ts_test_fail(TS_CTX, "sa_addr_a2u -> \"%s\" (expected \"%s\")", cp, table[i].out); + ts_test_fail(TS_CTX, "sa_addr_a2u -> \"%s\" (expected \"%s\")", + cp, table[i].out); } ts_test_check(TS_CTX, "sa_addr_destroy"); if ((rv = sa_addr_destroy(saa)) != SA_OK) ts_test_fail(TS_CTX, "sa_addr_destroy -> %d[%s] (expected %d[%s])", - rv, sa_error(rv), SA_OK, sa_error(SA_OK)); + rv, sa_error(rv), SA_OK, sa_error(SA_OK)); } TS_TEST(test_saa_match) @@ -121,10 +122,10 @@ if ((rv = sa_addr_u2a(saa2, table[i].acl)) != SA_OK) continue; ts_test_check(TS_CTX, "sa_addr_match(\"%s\", \"%s\", %d)", - table[i].in, table[i].acl, table[i].prefixlen); + table[i].in, table[i].acl, table[i].prefixlen); if ((rv = sa_addr_match(saa1, saa2, table[i].prefixlen)) != table[i].rv) ts_test_fail(TS_CTX, "sa_addr_match -> %d[%s] (expected %d[%s])", - rv, sa_error(rv), table[i].rv, sa_error(table[i].rv)); + rv, sa_error(rv), table[i].rv, sa_error(table[i].rv)); } sa_addr_destroy(saa1); sa_addr_destroy(saa2);