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

17 files changed, 47 insertions, 47 deletions

diff --git a/pjsip/include/pjsua-lib/pjsua.h b/pjsip/include/pjsua-lib/pjsua.h
index 9ada6a8a..771268ab 100644
--- a/pjsip/include/pjsua-lib/pjsua.h
+++ b/pjsip/include/pjsua-lib/pjsua.h
@@ -251,7 +251,7 @@ typedef struct pjsua_logging_config
  */
 PJ_INLINE(void) pjsua_logging_config_default(pjsua_logging_config *cfg)
 {
-    pj_memset(cfg, 0, sizeof(*cfg));
+    pj_bzero(cfg, sizeof(*cfg));
 
     cfg->msg_logging = PJ_TRUE;
     cfg->level = 5;
@@ -427,7 +427,7 @@ typedef struct pjsua_config
  */
 PJ_INLINE(void) pjsua_config_default(pjsua_config *cfg)
 {
-    pj_memset(cfg, 0, sizeof(*cfg));
+    pj_bzero(cfg, sizeof(*cfg));
 
     cfg->max_calls = 4;
     cfg->thread_cnt = 1;
@@ -503,7 +503,7 @@ typedef struct pjsua_msg_data
  */
 PJ_INLINE(void) pjsua_msg_data_init(pjsua_msg_data *msg_data)
 {
-    pj_memset(msg_data, 0, sizeof(*msg_data));
+    pj_bzero(msg_data, sizeof(*msg_data));
     pj_list_init(&msg_data->hdr_list);
 }
 
@@ -703,7 +703,7 @@ typedef struct pjsua_stun_config
  */
 PJ_INLINE(void) pjsua_stun_config_default(pjsua_stun_config *cfg)
 {
-    pj_memset(cfg, 0, sizeof(*cfg));
+    pj_bzero(cfg, sizeof(*cfg));
 }
 
 
@@ -746,7 +746,7 @@ typedef struct pjsua_transport_config
  */
 PJ_INLINE(void) pjsua_transport_config_default(pjsua_transport_config *cfg)
 {
-    pj_memset(cfg, 0, sizeof(*cfg));
+    pj_bzero(cfg, sizeof(*cfg));
 }
 
 
@@ -1072,7 +1072,7 @@ typedef struct pjsua_acc_config
  */
 PJ_INLINE(void) pjsua_acc_config_default(pjsua_acc_config *cfg)
 {
-    pj_memset(cfg, 0, sizeof(*cfg));
+    pj_bzero(cfg, sizeof(*cfg));
 
     cfg->reg_timeout = PJSUA_REG_INTERVAL;
 }
@@ -2058,7 +2058,7 @@ struct pjsua_media_config
  */
 PJ_INLINE(void) pjsua_media_config_default(pjsua_media_config *cfg)
 {
-    pj_memset(cfg, 0, sizeof(*cfg));
+    pj_bzero(cfg, sizeof(*cfg));
 
     cfg->clock_rate = 16000;
     cfg->max_media_ports = 32;
diff --git a/pjsip/src/pjsip/sip_endpoint.c b/pjsip/src/pjsip/sip_endpoint.c
index 940fdf16..70af7f29 100644
--- a/pjsip/src/pjsip/sip_endpoint.c
+++ b/pjsip/src/pjsip/sip_endpoint.c
@@ -842,7 +842,7 @@ static void endpt_on_rx_msg( pjsip_endpoint *endpt,
     /* Must clear mod_data before returning rdata to transport, since
      * rdata may be reused.
      */
-    pj_memset(&rdata->endpt_info, 0, sizeof(rdata->endpt_info));
+    pj_bzero(&rdata->endpt_info, sizeof(rdata->endpt_info));
 }
 
 /*
diff --git a/pjsip/src/pjsip/sip_msg.c b/pjsip/src/pjsip/sip_msg.c
index 25a5ae19..38603bc1 100644
--- a/pjsip/src/pjsip/sip_msg.c
+++ b/pjsip/src/pjsip/sip_msg.c
@@ -968,7 +968,7 @@ PJ_DEF(pjsip_contact_hdr*) pjsip_contact_hdr_init( pj_pool_t *pool,
 
     PJ_UNUSED_ARG(pool);
 
-    pj_memset(mem, 0, sizeof(pjsip_contact_hdr));
+    pj_bzero(mem, sizeof(pjsip_contact_hdr));
     init_hdr(hdr, PJSIP_H_CONTACT, &contact_hdr_vptr);
     hdr->expires = -1;
     pj_list_init(&hdr->other_param);
@@ -1097,7 +1097,7 @@ PJ_DEF(pjsip_ctype_hdr*) pjsip_ctype_hdr_init( pj_pool_t *pool,
 
     PJ_UNUSED_ARG(pool);
 
-    pj_memset(mem, 0, sizeof(pjsip_ctype_hdr));
+    pj_bzero(mem, sizeof(pjsip_ctype_hdr));
     init_hdr(hdr, PJSIP_H_CONTENT_TYPE, &ctype_hdr_vptr);
     return hdr;
 
@@ -1213,7 +1213,7 @@ PJ_DEF(pjsip_from_hdr*) pjsip_from_hdr_init( pj_pool_t *pool,
 
     PJ_UNUSED_ARG(pool);
 
-    pj_memset(mem, 0, sizeof(pjsip_from_hdr));
+    pj_bzero(mem, sizeof(pjsip_from_hdr));
     init_hdr(hdr, PJSIP_H_FROM, &fromto_hdr_vptr);
     pj_list_init(&hdr->other_param);
     return hdr;
@@ -1232,7 +1232,7 @@ PJ_DEF(pjsip_to_hdr*) pjsip_to_hdr_init( pj_pool_t *pool,
 
     PJ_UNUSED_ARG(pool);
 
-    pj_memset(mem, 0, sizeof(pjsip_to_hdr));
+    pj_bzero(mem, sizeof(pjsip_to_hdr));
     init_hdr(hdr, PJSIP_H_TO, &fromto_hdr_vptr);
     pj_list_init(&hdr->other_param);
     return hdr;
@@ -1595,7 +1595,7 @@ PJ_DEF(pjsip_via_hdr*) pjsip_via_hdr_init( pj_pool_t *pool,
 
     PJ_UNUSED_ARG(pool);
 
-    pj_memset(mem, 0, sizeof(pjsip_via_hdr));
+    pj_bzero(mem, sizeof(pjsip_via_hdr));
     init_hdr(hdr, PJSIP_H_VIA, &via_hdr_vptr);
     hdr->ttl_param = -1;
     hdr->rport_param = -1;
diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c
index 204eff12..aa49615e 100644
--- a/pjsip/src/pjsip/sip_transport.c
+++ b/pjsip/src/pjsip/sip_transport.c
@@ -595,7 +595,7 @@ PJ_DEF(pj_status_t) pjsip_transport_register( pjsip_tpmgr *mgr,
 
     /* Init. */
     tp->tpmgr = mgr;
-    pj_memset(&tp->idle_timer, 0, sizeof(tp->idle_timer));
+    pj_bzero(&tp->idle_timer, sizeof(tp->idle_timer));
     tp->idle_timer.user_data = tp;
     tp->idle_timer.cb = &transport_idle_callback;
 
@@ -926,7 +926,7 @@ PJ_DEF(pj_ssize_t) pjsip_tpmgr_receive_packet( pjsip_tpmgr *mgr,
 	 * Endpoint might inspect the values there when we call the callback
 	 * to report some errors.
 	 */
-	pj_memset(&rdata->msg_info, 0, sizeof(rdata->msg_info));
+	pj_bzero(&rdata->msg_info, sizeof(rdata->msg_info));
 	pj_list_init(&rdata->msg_info.parse_err);
 	rdata->msg_info.msg_buf = current_pkt;
 	rdata->msg_info.len = remaining_len;
@@ -1097,7 +1097,7 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport(pjsip_tpmgr *mgr,
 	{
 	    pj_sockaddr_in *addr = (pj_sockaddr_in*)&key.addr;
 
-	    pj_memset(addr, 0, sizeof(pj_sockaddr_in));
+	    pj_bzero(addr, sizeof(pj_sockaddr_in));
 	    key_len = sizeof(key.type) + sizeof(pj_sockaddr_in);
 	    transport = pj_hash_get(mgr->table, &key, key_len, NULL);
 	}
@@ -1108,7 +1108,7 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport(pjsip_tpmgr *mgr,
 	{
 	    pj_sockaddr_in *addr = (pj_sockaddr_in*)&key.addr;
 
-	    pj_memset(addr, 0, sizeof(pj_sockaddr_in));
+	    pj_bzero(addr, sizeof(pj_sockaddr_in));
 	    addr->sin_family = PJ_AF_INET;
 
 	    key_len = sizeof(key.type) + sizeof(pj_sockaddr_in);
diff --git a/pjsip/src/pjsip/sip_transport_tcp.c b/pjsip/src/pjsip/sip_transport_tcp.c
index 42339c25..fa754074 100644
--- a/pjsip/src/pjsip/sip_transport_tcp.c
+++ b/pjsip/src/pjsip/sip_transport_tcp.c
@@ -270,7 +270,7 @@ PJ_DEF(pj_status_t) pjsip_tcp_transport_start( pjsip_endpoint *endpt,
 
 
     /* Register socket to ioqeuue */
-    pj_memset(&listener_cb, 0, sizeof(listener_cb));
+    pj_bzero(&listener_cb, sizeof(listener_cb));
     listener_cb.on_accept_complete = &on_accept_complete;
     status = pj_ioqueue_register_sock(pool, pjsip_endpt_get_ioqueue(endpt),
 				      listener->sock, listener,
@@ -474,7 +474,7 @@ static pj_status_t tcp_create( struct tcp_listener *listener,
 
 
     /* Register socket to ioqueue */
-    pj_memset(&tcp_callback, 0, sizeof(pj_ioqueue_callback));
+    pj_bzero(&tcp_callback, sizeof(pj_ioqueue_callback));
     tcp_callback.on_read_complete = &on_read_complete;
     tcp_callback.on_write_complete = &on_write_complete;
     tcp_callback.on_connect_complete = &on_connect_complete;
diff --git a/pjsip/src/pjsip/sip_uri.c b/pjsip/src/pjsip/sip_uri.c
index c408d0d9..37fd3c4f 100644
--- a/pjsip/src/pjsip/sip_uri.c
+++ b/pjsip/src/pjsip/sip_uri.c
@@ -206,7 +206,7 @@ static void *pjsip_name_addr_get_uri( pjsip_name_addr *name )
 
 PJ_DEF(void) pjsip_sip_uri_init(pjsip_sip_uri *url, int secure)
 {
-    pj_memset(url, 0, sizeof(*url));
+    pj_bzero(url, sizeof(*url));
     url->ttl_param = -1;
     url->vptr = secure ? &sips_url_vptr : &sip_url_vptr;
     pj_list_init(&url->other_param);
diff --git a/pjsip/src/pjsip/sip_util.c b/pjsip/src/pjsip/sip_util.c
index d4f3a365..56928e6e 100644
--- a/pjsip/src/pjsip/sip_util.c
+++ b/pjsip/src/pjsip/sip_util.c
@@ -705,7 +705,7 @@ PJ_DEF(pj_status_t) pjsip_get_request_addr( pjsip_tx_data *tdata,
     /* The target URI must be a SIP/SIPS URL so we can resolve it's address.
      * Otherwise we're in trouble (i.e. there's no host part in tel: URL).
      */
-    pj_memset(dest_info, 0, sizeof(*dest_info));
+    pj_bzero(dest_info, sizeof(*dest_info));
 
     if (PJSIP_URI_SCHEME_IS_SIPS(target_uri)) {
 	pjsip_uri *uri = (pjsip_uri*) target_uri;
diff --git a/pjsip/src/pjsua-lib/pjsua_acc.c b/pjsip/src/pjsua-lib/pjsua_acc.c
index 8e11f2a2..feb3bebd 100644
--- a/pjsip/src/pjsua-lib/pjsua_acc.c
+++ b/pjsip/src/pjsua-lib/pjsua_acc.c
@@ -548,7 +548,7 @@ PJ_DEF(pj_status_t) pjsua_acc_get_info( pjsua_acc_id acc_id,
 
     PJ_ASSERT_RETURN(info != NULL, PJ_EINVAL);
     
-    pj_memset(info, 0, sizeof(pjsua_acc_info));
+    pj_bzero(info, sizeof(pjsua_acc_info));
 
     PJ_ASSERT_RETURN(acc_id>=0 && acc_id<(int)PJ_ARRAY_SIZE(pjsua_var.acc), 
 		     PJ_EINVAL);
diff --git a/pjsip/src/pjsua-lib/pjsua_call.c b/pjsip/src/pjsua-lib/pjsua_call.c
index 466d9818..cf1aa2b7 100644
--- a/pjsip/src/pjsua-lib/pjsua_call.c
+++ b/pjsip/src/pjsua-lib/pjsua_call.c
@@ -104,7 +104,7 @@ pj_status_t pjsua_call_subsys_init(const pjsua_config *cfg)
     pjsua_config_dup(pjsua_var.pool, &pjsua_var.ua_cfg, cfg);
 
     /* Initialize invite session callback. */
-    pj_memset(&inv_cb, 0, sizeof(inv_cb));
+    pj_bzero(&inv_cb, sizeof(inv_cb));
     inv_cb.on_state_changed = &pjsua_call_on_state_changed;
     inv_cb.on_new_session = &pjsua_call_on_forked;
     inv_cb.on_media_update = &pjsua_call_on_media_update;
@@ -562,7 +562,7 @@ PJ_DEF(pj_status_t) pjsua_call_get_info( pjsua_call_id call_id,
     PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls,
 		     PJ_EINVAL);
 
-    pj_memset(info, 0, sizeof(*info));
+    pj_bzero(info, sizeof(*info));
 
     PJSUA_LOCK();
 
@@ -2128,7 +2128,7 @@ static void on_call_transfered( pjsip_inv_session *inv,
 	      refer_to->hvalue.ptr));
 
     /* Init callback */
-    pj_memset(&xfer_cb, 0, sizeof(xfer_cb));
+    pj_bzero(&xfer_cb, sizeof(xfer_cb));
     xfer_cb.on_evsub_state = &xfer_on_evsub_state;
 
     /* Create transferee event subscription */
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c
index 30bfdd9a..09624311 100644
--- a/pjsip/src/pjsua-lib/pjsua_core.c
+++ b/pjsip/src/pjsua-lib/pjsua_core.c
@@ -667,7 +667,7 @@ static pj_status_t create_sip_udp_sock(pj_in_addr bound_addr,
 	pj_memcpy(&stun, stun_param, sizeof(*stun_param));
 	pjsua_normalize_stun_config(&stun);
     } else {
-	pj_memset(&stun, 0, sizeof(pjsua_stun_config));
+	pj_bzero(&stun, sizeof(pjsua_stun_config));
     }
 
     /* Get the published address, either by STUN or by resolving
@@ -698,7 +698,7 @@ static pj_status_t create_sip_udp_sock(pj_in_addr bound_addr,
 	    return status;
 	}
 
-	pj_memset(p_pub_addr, 0, sizeof(pj_sockaddr_in));
+	pj_bzero(p_pub_addr, sizeof(pj_sockaddr_in));
 	p_pub_addr->sin_family = PJ_AF_INET;
 	p_pub_addr->sin_port = pj_htons((pj_uint16_t)port);
 	p_pub_addr->sin_addr = *(pj_in_addr*)he.h_addr;
@@ -910,7 +910,7 @@ PJ_DEF(pj_status_t) pjsua_transport_get_info( pjsua_transport_id id,
 {
     struct transport_data *t = &pjsua_var.tpdata[id];
 
-    pj_memset(info, 0, sizeof(*info));
+    pj_bzero(info, sizeof(*info));
 
     /* Make sure id is in range. */
     PJ_ASSERT_RETURN(id>=0 && id<PJ_ARRAY_SIZE(pjsua_var.tpdata), PJ_EINVAL);
@@ -1076,7 +1076,7 @@ void pjsua_parse_media_type( pj_pool_t *pool,
     pj_str_t tmp;
     char *pos;
 
-    pj_memset(media_type, 0, sizeof(*media_type));
+    pj_bzero(media_type, sizeof(*media_type));
 
     pj_strdup_with_null(pool, &tmp, mime);
 
diff --git a/pjsip/src/pjsua-lib/pjsua_media.c b/pjsip/src/pjsua-lib/pjsua_media.c
index 5a462eb2..a25c6745 100644
--- a/pjsip/src/pjsua-lib/pjsua_media.c
+++ b/pjsip/src/pjsua-lib/pjsua_media.c
@@ -266,7 +266,7 @@ static pj_status_t create_rtp_rtcp_sock(const pjsua_transport_config *cfg,
 	    /* Get local IP address. */
 	    hostname = pj_gethostname();
 
-	    pj_memset( &addr, 0, sizeof(addr));
+	    pj_bzero( &addr, sizeof(addr));
 	    addr.sin_family = PJ_AF_INET;
 	    status = pj_sockaddr_in_set_str_addr( &addr, hostname);
 	    if (status != PJ_SUCCESS) {
@@ -552,7 +552,7 @@ PJ_DEF(pj_status_t) pjsua_conf_get_port_info( pjsua_conf_port_id id,
     if (status != PJ_SUCCESS)
 	return status;
 
-    pj_memset(info, 0, sizeof(*info));
+    pj_bzero(info, sizeof(*info));
     info->slot_id = id;
     info->name = cinfo.name;
     info->clock_rate = cinfo.clock_rate;
diff --git a/pjsip/src/pjsua-lib/pjsua_pres.c b/pjsip/src/pjsua-lib/pjsua_pres.c
index 7948a3ec..8ef87661 100644
--- a/pjsip/src/pjsua-lib/pjsua_pres.c
+++ b/pjsip/src/pjsua-lib/pjsua_pres.c
@@ -85,7 +85,7 @@ PJ_DEF(pj_status_t) pjsua_buddy_get_info( pjsua_buddy_id buddy_id,
 
     PJSUA_LOCK();
 
-    pj_memset(info, 0, sizeof(pjsua_buddy_info));
+    pj_bzero(info, sizeof(pjsua_buddy_info));
 
     buddy = &pjsua_var.buddy[buddy_id];
     info->id = buddy->index;
@@ -129,7 +129,7 @@ PJ_DEF(pj_status_t) pjsua_buddy_get_info( pjsua_buddy_id buddy_id,
  */
 static void reset_buddy(pjsua_buddy_id id)
 {
-    pj_memset(&pjsua_var.buddy[id], 0, sizeof(pjsua_var.buddy[id]));
+    pj_bzero(&pjsua_var.buddy[id], sizeof(pjsua_var.buddy[id]));
     pjsua_var.buddy[id].index = id;
 }
 
@@ -479,7 +479,7 @@ static pj_bool_t pres_on_rx_request(pjsip_rx_data *rdata)
     pjsip_auth_clt_set_credentials(&dlg->auth_sess, acc->cred_cnt, acc->cred);
 
     /* Init callback: */
-    pj_memset(&pres_cb, 0, sizeof(pres_cb));
+    pj_bzero(&pres_cb, sizeof(pres_cb));
     pres_cb.on_evsub_state = &pres_evsub_on_srv_state;
 
     /* Create server presence subscription: */
@@ -522,7 +522,7 @@ static pj_bool_t pres_on_rx_request(pjsip_rx_data *rdata)
 
 
     /* Set our online status: */
-    pj_memset(&pres_status, 0, sizeof(pres_status));
+    pj_bzero(&pres_status, sizeof(pres_status));
     pres_status.info_cnt = 1;
     pres_status.info[0].basic_open = pjsua_var.acc[acc_id].online_status;
     //Both pjsua_var.local_uri and pjsua_var.contact_uri are enclosed in "<" and ">"
diff --git a/pjsip/src/test-pjsip/msg_test.c b/pjsip/src/test-pjsip/msg_test.c
index ebe43025..f93539fe 100644
--- a/pjsip/src/test-pjsip/msg_test.c
+++ b/pjsip/src/test-pjsip/msg_test.c
@@ -711,7 +711,7 @@ static int msg_benchmark(unsigned *p_detect, unsigned *p_parse,
     pj_highprec_t avg_detect, avg_parse, avg_print, kbytes;
 
 
-    pj_memset(&var, 0, sizeof(var));
+    pj_bzero(&var, sizeof(var));
     zero.u64 = 0;
 
     for (loop=0; loop<LOOP; ++loop) {
diff --git a/pjsip/src/test-pjsip/transport_test.c b/pjsip/src/test-pjsip/transport_test.c
index 5aa491a2..2d84efea 100644
--- a/pjsip/src/test-pjsip/transport_test.c
+++ b/pjsip/src/test-pjsip/transport_test.c
@@ -554,7 +554,7 @@ int transport_rt_test( pjsip_transport_type_e tp_type,
 	char buf[1];
 	pj_str_t str_id = { buf, 1 };
 
-	pj_memset(&rt_test_data[i], 0, sizeof(rt_test_data[i]));
+	pj_bzero(&rt_test_data[i], sizeof(rt_test_data[i]));
 
 	/* Init timer entry */
 	rt_test_data[i].tx_timer.id = i;
@@ -613,8 +613,8 @@ int transport_rt_test( pjsip_transport_type_e tp_type,
     }
 
     /* Gather statistics. */
-    pj_memset(&total_time, 0, sizeof(total_time));
-    pj_memset(&zero_time, 0, sizeof(zero_time));
+    pj_bzero(&total_time, sizeof(total_time));
+    pj_bzero(&zero_time, sizeof(zero_time));
     usec_rt = total_sent = total_recv = 0;
     for (i=0; i<THREADS; ++i) {
 	total_sent += rt_test_data[i].sent_request_count;
diff --git a/pjsip/src/test-pjsip/tsx_bench.c b/pjsip/src/test-pjsip/tsx_bench.c
index 53c950cb..08e20ae0 100644
--- a/pjsip/src/test-pjsip/tsx_bench.c
+++ b/pjsip/src/test-pjsip/tsx_bench.c
@@ -51,7 +51,7 @@ static int uac_tsx_bench(unsigned working_set, pj_timestamp *p_elapsed)
     /* Create transaction array */
     tsx = pj_pool_zalloc(request->pool, working_set * sizeof(pj_pool_t*));
 
-    pj_memset(&mod_tsx_user, 0, sizeof(mod_tsx_user));
+    pj_bzero(&mod_tsx_user, sizeof(mod_tsx_user));
     mod_tsx_user.id = -1;
 
     /* Benchmark */
@@ -121,7 +121,7 @@ static int uas_tsx_bench(unsigned working_set, pj_timestamp *p_elapsed)
     
 
     /* Create "dummy" rdata from the tdata */
-    pj_memset(&rdata, 0, sizeof(pjsip_rx_data));
+    pj_bzero(&rdata, sizeof(pjsip_rx_data));
     rdata.tp_info.pool = request->pool;
     rdata.msg_info.msg = request->msg;
     rdata.msg_info.from = pjsip_msg_find_hdr(request->msg, PJSIP_H_FROM, NULL);
@@ -143,7 +143,7 @@ static int uas_tsx_bench(unsigned working_set, pj_timestamp *p_elapsed)
     /* Create transaction array */
     tsx = pj_pool_zalloc(request->pool, working_set * sizeof(pj_pool_t*));
 
-    pj_memset(&mod_tsx_user, 0, sizeof(mod_tsx_user));
+    pj_bzero(&mod_tsx_user, sizeof(mod_tsx_user));
     mod_tsx_user.id = -1;
 
 
diff --git a/pjsip/src/test-pjsip/txdata_test.c b/pjsip/src/test-pjsip/txdata_test.c
index a7f0fb0b..da90906f 100644
--- a/pjsip/src/test-pjsip/txdata_test.c
+++ b/pjsip/src/test-pjsip/txdata_test.c
@@ -265,7 +265,7 @@ static int core_txdata_test(void)
     }
 
     /* Modify dummy_rdata to simulate receiving response. */
-    pj_memset(&dummy_rdata, 0, sizeof(dummy_rdata));
+    pj_bzero(&dummy_rdata, sizeof(dummy_rdata));
     dummy_rdata.msg_info.msg = response->msg;
     dummy_rdata.msg_info.to = HFIND(response->msg, to, TO);
 
@@ -632,7 +632,7 @@ static int create_request_bench(pj_timestamp *p_elapsed)
     elapsed.u64 = 0;
 
     for (i=0; i<LOOP; i+=COUNT) {
-	pj_memset(tdata, 0, sizeof(tdata));
+	pj_bzero(tdata, sizeof(tdata));
 
 	pj_get_timestamp(&t1);
 
@@ -711,7 +711,7 @@ static int create_response_bench(pj_timestamp *p_elapsed)
     
 
     /* Create "dummy" rdata from the tdata */
-    pj_memset(&rdata, 0, sizeof(pjsip_rx_data));
+    pj_bzero(&rdata, sizeof(pjsip_rx_data));
     rdata.tp_info.pool = request->pool;
     rdata.msg_info.msg = request->msg;
     rdata.msg_info.from = pjsip_msg_find_hdr(request->msg, PJSIP_H_FROM, NULL);
@@ -726,7 +726,7 @@ static int create_response_bench(pj_timestamp *p_elapsed)
     elapsed.u64 = 0;
 
     for (i=0; i<LOOP; i+=COUNT) {
-	pj_memset(tdata, 0, sizeof(tdata));
+	pj_bzero(tdata, sizeof(tdata));
 
 	pj_get_timestamp(&t1);
 
diff --git a/pjsip/src/test-pjsip/uri_test.c b/pjsip/src/test-pjsip/uri_test.c
index 916a30f4..1d2d9981 100644
--- a/pjsip/src/test-pjsip/uri_test.c
+++ b/pjsip/src/test-pjsip/uri_test.c
@@ -823,7 +823,7 @@ static int uri_benchmark(unsigned *p_parse, unsigned *p_print, unsigned *p_cmp)
     pj_time_val elapsed;
     pj_highprec_t avg_parse, avg_print, avg_cmp, kbytes;
 
-    pj_memset(&var, 0, sizeof(var));
+    pj_bzero(&var, sizeof(var));
 
     zero.u32.hi = zero.u32.lo = 0;