diff options
author | Benny Prijono <bennylp@teluu.com> | 2009-01-01 20:56:36 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2009-01-01 20:56:36 +0000 |
commit | 423bd3b19d5611412da90b87f6989dc89339defa (patch) | |
tree | e2d8a8d63b37d55ca2a8777e64a7ed054088683d /pjlib-util/src/pjlib-util-test/resolver_test.c | |
parent | 808f9942b9b55991273a490f234900cdf0bb457f (diff) |
Fixed unreached code, deprecated fopen(), unused arguments, and other warnings with MSVC
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2407 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib-util/src/pjlib-util-test/resolver_test.c')
-rw-r--r-- | pjlib-util/src/pjlib-util-test/resolver_test.c | 70 |
1 files changed, 41 insertions, 29 deletions
diff --git a/pjlib-util/src/pjlib-util-test/resolver_test.c b/pjlib-util/src/pjlib-util-test/resolver_test.c index 5482150f..d6be1411 100644 --- a/pjlib-util/src/pjlib-util-test/resolver_test.c +++ b/pjlib-util/src/pjlib-util-test/resolver_test.c @@ -702,13 +702,14 @@ static void dns_callback(void *user_data, { PJ_UNUSED_ARG(user_data); - pj_assert(status == PJ_SUCCESS); - pj_assert(resp); - pj_assert(resp->hdr.anscount == 1); - pj_assert(resp->ans[0].type == PJ_DNS_TYPE_A); - pj_assert(resp->ans[0].rdata.a.ip_addr.s_addr == IP_ADDR0); - pj_sem_post(sem); + + PJ_ASSERT_ON_FAIL(status == PJ_SUCCESS, return); + PJ_ASSERT_ON_FAIL(resp, return); + PJ_ASSERT_ON_FAIL(resp->hdr.anscount == 1, return); + PJ_ASSERT_ON_FAIL(resp->ans[0].type == PJ_DNS_TYPE_A, return); + PJ_ASSERT_ON_FAIL(resp->ans[0].rdata.a.ip_addr.s_addr == IP_ADDR0, return); + } @@ -778,9 +779,10 @@ static void dns_callback_1b(void *user_data, PJ_UNUSED_ARG(user_data); PJ_UNUSED_ARG(resp); - pj_assert(status == PJ_STATUS_FROM_DNS_RCODE(PJ_DNS_RCODE_NXDOMAIN)); - pj_sem_post(sem); + + PJ_ASSERT_ON_FAIL(status==PJ_STATUS_FROM_DNS_RCODE(PJ_DNS_RCODE_NXDOMAIN), + return); } @@ -1014,16 +1016,20 @@ static void srv_cb_1(void *user_data, { PJ_UNUSED_ARG(user_data); - pj_assert(status == PJ_SUCCESS); - pj_assert(rec->count == 1); - pj_assert(rec->entry[0].priority == 1); - pj_assert(rec->entry[0].weight == 2); - pj_assert(pj_strcmp2(&rec->entry[0].server.name, "sip.somedomain.com")==0); - pj_assert(pj_strcmp2(&rec->entry[0].server.alias, "sipalias.somedomain.com")==0); - pj_assert(rec->entry[0].server.addr[0].s_addr == IP_ADDR1); - pj_assert(rec->entry[0].port == PORT1); - pj_sem_post(sem); + + PJ_ASSERT_ON_FAIL(status == PJ_SUCCESS, return); + PJ_ASSERT_ON_FAIL(rec->count == 1, return); + PJ_ASSERT_ON_FAIL(rec->entry[0].priority == 1, return); + PJ_ASSERT_ON_FAIL(rec->entry[0].weight == 2, return); + PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.name, "sip.somedomain.com")==0, + return); + PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.alias, "sipalias.somedomain.com")==0, + return); + PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[0].s_addr == IP_ADDR1, return); + PJ_ASSERT_ON_FAIL(rec->entry[0].port == PORT1, return); + + } static void srv_cb_1b(void *user_data, @@ -1032,10 +1038,11 @@ static void srv_cb_1b(void *user_data, { PJ_UNUSED_ARG(user_data); - pj_assert(status == PJ_STATUS_FROM_DNS_RCODE(PJ_DNS_RCODE_NXDOMAIN)); - pj_assert(rec->count == 0); - pj_sem_post(sem); + + PJ_ASSERT_ON_FAIL(status==PJ_STATUS_FROM_DNS_RCODE(PJ_DNS_RCODE_NXDOMAIN), + return); + PJ_ASSERT_ON_FAIL(rec->count == 0, return); } static int srv_resolver_test(void) @@ -1175,16 +1182,18 @@ static void srv_cb_2(void *user_data, { PJ_UNUSED_ARG(user_data); - pj_assert(status == PJ_SUCCESS); - pj_assert(rec->count == 1); - pj_assert(rec->entry[0].priority == 0); - pj_assert(rec->entry[0].weight == 0); - pj_assert(pj_strcmp2(&rec->entry[0].server.name, TARGET)==0); - pj_assert(pj_strcmp2(&rec->entry[0].server.alias, "sipalias01." TARGET)==0); - pj_assert(rec->entry[0].server.addr[0].s_addr == IP_ADDR2); - pj_assert(rec->entry[0].port == PORT2); - pj_sem_post(sem); + + PJ_ASSERT_ON_FAIL(status == PJ_SUCCESS, return); + PJ_ASSERT_ON_FAIL(rec->count == 1, return); + PJ_ASSERT_ON_FAIL(rec->entry[0].priority == 0, return); + PJ_ASSERT_ON_FAIL(rec->entry[0].weight == 0, return); + PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.name, TARGET)==0, + return); + PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.alias, "sipalias01." TARGET)==0, + return); + PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[0].s_addr == IP_ADDR2, return); + PJ_ASSERT_ON_FAIL(rec->entry[0].port == PORT2, return); } static int srv_resolver_fallback_test(void) @@ -1306,9 +1315,12 @@ static void srv_cb_3(void *user_data, unsigned i; PJ_UNUSED_ARG(user_data); + PJ_UNUSED_ARG(status); + PJ_UNUSED_ARG(rec); pj_assert(status == PJ_SUCCESS); pj_assert(rec->count == PJ_DNS_SRV_MAX_ADDR); + for (i=0; i<PJ_DNS_SRV_MAX_ADDR; ++i) { unsigned j; |