diff options
author | Benny Prijono <bennylp@teluu.com> | 2006-07-03 15:19:31 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2006-07-03 15:19:31 +0000 |
commit | ed98898bb501d02e69093d34961bf1fb46d2ed4d (patch) | |
tree | e068af64b6db7985a173fe39a7559356608c108d /pjlib/src/pjlib-test | |
parent | 63147d55f091ec8ba1a5b57cb04b421938ec9fde (diff) |
Change all pj_memset to pj_bzero(), where applicable
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@582 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/src/pjlib-test')
-rw-r--r-- | pjlib/src/pjlib-test/ioq_udp.c | 10 | ||||
-rw-r--r-- | pjlib/src/pjlib-test/ioq_unreg.c | 4 | ||||
-rw-r--r-- | pjlib/src/pjlib-test/select.c | 2 | ||||
-rw-r--r-- | pjlib/src/pjlib-test/sock.c | 8 | ||||
-rw-r--r-- | pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c | 2 | ||||
-rw-r--r-- | pjlib/src/pjlib-test/util.c | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/pjlib/src/pjlib-test/ioq_udp.c b/pjlib/src/pjlib-test/ioq_udp.c index 7d00690b..31d013b4 100644 --- a/pjlib/src/pjlib-test/ioq_udp.c +++ b/pjlib/src/pjlib-test/ioq_udp.c @@ -164,7 +164,7 @@ static int compliance_test(void) // Bind server socket. TRACE_("bind socket..."); - pj_memset(&addr, 0, sizeof(addr)); + pj_bzero(&addr, sizeof(addr)); addr.sin_family = PJ_AF_INET; addr.sin_port = pj_htons(PORT); if (pj_sock_bind(ssock, &addr, sizeof(addr))) { @@ -201,7 +201,7 @@ static int compliance_test(void) // Register reading from ioqueue. TRACE_("start recvfrom..."); - pj_memset(&addr, 0, sizeof(addr)); + pj_bzero(&addr, sizeof(addr)); addrlen = sizeof(addr); bytes = bufsize; rc = pj_ioqueue_recvfrom(skey, &read_op, recv_buf, &bytes, 0, @@ -386,7 +386,7 @@ static int unregister_test(void) } /* Register rsock to ioqueue. */ - pj_memset(&cb, 0, sizeof(cb)); + pj_bzero(&cb, sizeof(cb)); cb.on_read_complete = &on_read_complete; packet_cnt = 0; status = pj_ioqueue_register_sock(pool, ioqueue, rsock, &packet_cnt, @@ -617,7 +617,7 @@ static int bench_test(int bufsize, int inactive_sock_count) } // Bind server socket. - pj_memset(&addr, 0, sizeof(addr)); + pj_bzero(&addr, sizeof(addr)); addr.sin_family = PJ_AF_INET; addr.sin_port = pj_htons(PORT); if (pj_sock_bind(ssock, &addr, sizeof(addr))) @@ -638,7 +638,7 @@ static int bench_test(int bufsize, int inactive_sock_count) inactive_sock_count*sizeof(pj_sock_t)); inactive_read_op = (pj_ioqueue_op_key_t*)pj_pool_alloc(pool, inactive_sock_count*sizeof(pj_ioqueue_op_key_t)); - pj_memset(&addr, 0, sizeof(addr)); + pj_bzero(&addr, sizeof(addr)); addr.sin_family = PJ_AF_INET; for (i=0; i<inactive_sock_count; ++i) { pj_ssize_t bytes; diff --git a/pjlib/src/pjlib-test/ioq_unreg.c b/pjlib/src/pjlib-test/ioq_unreg.c index 475d62fe..d099eb1b 100644 --- a/pjlib/src/pjlib-test/ioq_unreg.c +++ b/pjlib/src/pjlib-test/ioq_unreg.c @@ -165,7 +165,7 @@ static int perform_unreg_test(pj_ioqueue_t *ioqueue, return -12; } - pj_memset(&callback, 0, sizeof(callback)); + pj_bzero(&callback, sizeof(callback)); status = pj_ioqueue_register_sock(test_pool, ioqueue, osd.sock, NULL, &callback, &osd.key); if (status != PJ_SUCCESS) { @@ -226,7 +226,7 @@ static int perform_unreg_test(pj_ioqueue_t *ioqueue, } /* Register socket to ioqueue */ - pj_memset(&callback, 0, sizeof(callback)); + pj_bzero(&callback, sizeof(callback)); callback.on_read_complete = &on_read_complete; status = pj_ioqueue_register_sock(sock_data.pool, ioqueue, sock_data.sock, NULL, &callback, &sock_data.key); diff --git a/pjlib/src/pjlib-test/select.c b/pjlib/src/pjlib-test/select.c index ed2edd40..42836c03 100644 --- a/pjlib/src/pjlib-test/select.c +++ b/pjlib/src/pjlib-test/select.c @@ -124,7 +124,7 @@ int select_test() } // Bind one of the UDP socket. - pj_memset(&udp_addr, 0, sizeof(udp_addr)); + pj_bzero(&udp_addr, sizeof(udp_addr)); udp_addr.sin_family = PJ_AF_INET; udp_addr.sin_port = UDP_PORT; udp_addr.sin_addr = pj_inet_addr(pj_cstr(&s, "127.0.0.1")); diff --git a/pjlib/src/pjlib-test/sock.c b/pjlib/src/pjlib-test/sock.c index cf7dfadb..0cac5285 100644 --- a/pjlib/src/pjlib-test/sock.c +++ b/pjlib/src/pjlib-test/sock.c @@ -109,7 +109,7 @@ static int format_test(void) * including sin_zero. */ pj_sockaddr_in_init(&addr2, 0, 1000); - pj_memset(zero, 0, sizeof(zero)); + pj_bzero(zero, sizeof(zero)); if (pj_memcmp(addr2.sin_zero, zero, sizeof(addr2.sin_zero)) != 0) return -35; @@ -196,7 +196,7 @@ static int send_recv_test(int sock_type, pj_sockaddr_in addr; int srclen = sizeof(addr); - pj_memset(&addr, 0, sizeof(addr)); + pj_bzero(&addr, sizeof(addr)); received = DATA_LEN; rc = pj_sock_recvfrom(ss, recvdata, &received, 0, &addr, &srclen); @@ -334,7 +334,7 @@ static int udp_test(void) return -110; /* Bind server socket. */ - pj_memset(&dstaddr, 0, sizeof(dstaddr)); + pj_bzero(&dstaddr, sizeof(dstaddr)); dstaddr.sin_family = PJ_AF_INET; dstaddr.sin_port = pj_htons(UDP_PORT); dstaddr.sin_addr = pj_inet_addr(pj_cstr(&s, ADDRESS)); @@ -345,7 +345,7 @@ static int udp_test(void) } /* Bind client socket. */ - pj_memset(&srcaddr, 0, sizeof(srcaddr)); + pj_bzero(&srcaddr, sizeof(srcaddr)); srcaddr.sin_family = PJ_AF_INET; srcaddr.sin_port = pj_htons(UDP_PORT-1); srcaddr.sin_addr = pj_inet_addr(pj_cstr(&s, ADDRESS)); diff --git a/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c b/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c index 50db4931..9113972f 100644 --- a/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c +++ b/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c @@ -162,7 +162,7 @@ int udp_echo_srv_ioqueue(void) pj_thread_t *thread[ECHO_SERVER_MAX_THREADS]; pj_status_t rc; - pj_memset(&callback, 0, sizeof(callback)); + pj_bzero(&callback, sizeof(callback)); callback.on_read_complete = &on_read_complete; callback.on_write_complete = &on_write_complete; diff --git a/pjlib/src/pjlib-test/util.c b/pjlib/src/pjlib-test/util.c index ea1d4652..aacd0057 100644 --- a/pjlib/src/pjlib-test/util.c +++ b/pjlib/src/pjlib-test/util.c @@ -45,7 +45,7 @@ pj_status_t app_socket(int family, int type, int proto, int port, if (rc != PJ_SUCCESS) return rc; - pj_memset(&addr, 0, sizeof(addr)); + pj_bzero(&addr, sizeof(addr)); addr.sin_family = (pj_uint16_t)family; addr.sin_port = (short)(port!=-1 ? pj_htons((pj_uint16_t)port) : 0); rc = pj_sock_bind(sock, &addr, sizeof(addr)); @@ -85,7 +85,7 @@ pj_status_t app_socketpair(int family, int type, int protocol, } /* Retry bind */ - pj_memset(&addr, 0, sizeof(addr)); + pj_bzero(&addr, sizeof(addr)); addr.sin_family = PJ_AF_INET; for (i=0; i<5; ++i) { addr.sin_port = pj_htons(port++); |