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

69 files changed, 154 insertions, 149 deletions

diff --git a/pjlib-util/src/pjlib-util-test/xml.c b/pjlib-util/src/pjlib-util-test/xml.c
index e20a68ff..58fe74c4 100644
--- a/pjlib-util/src/pjlib-util-test/xml.c
+++ b/pjlib-util/src/pjlib-util-test/xml.c
@@ -110,8 +110,7 @@ static int xml_parse_print_test(const char *doc)
 	return -10;
     }
 
-    output = (char*)pj_pool_alloc(pool, msg.slen + 512);
-    pj_memset(output, 0, msg.slen+512);
+    output = (char*)pj_pool_zalloc(pool, msg.slen + 512);
     output_len = pj_xml_print(root, output, msg.slen+512, PJ_TRUE);
     if (output_len < 1) {
 	PJ_LOG(1, (THIS_FILE, "  Error: buffer too small to print XML file"));
diff --git a/pjlib-util/src/pjlib-util/md5.c b/pjlib-util/src/pjlib-util/md5.c
index 233a1da9..d48f683f 100644
--- a/pjlib-util/src/pjlib-util/md5.c
+++ b/pjlib-util/src/pjlib-util/md5.c
@@ -151,15 +151,15 @@ PJ_DEF(void) pj_md5_final(pj_md5_context *ctx, unsigned char digest[16])
     /* Pad out to 56 mod 64 */
     if (count < 8) {
 	/* Two lots of padding:  Pad the first block to 64 bytes */
-	pj_memset(p, 0, count);
+	pj_bzero(p, count);
 	byteReverse(ctx->in, 16);
 	MD5Transform(ctx->buf, (pj_uint32_t *) ctx->in);
 
 	/* Now fill the next block with 56 bytes */
-	pj_memset(ctx->in, 0, 56);
+	pj_bzero(ctx->in, 56);
     } else {
 	/* Pad block to 56 bytes */
-	pj_memset(p, 0, count - 8);
+	pj_bzero(p, count - 8);
     }
     byteReverse(ctx->in, 14);
 
@@ -170,7 +170,7 @@ PJ_DEF(void) pj_md5_final(pj_md5_context *ctx, unsigned char digest[16])
     MD5Transform(ctx->buf, (pj_uint32_t *) ctx->in);
     byteReverse((unsigned char *) ctx->buf, 4);
     pj_memcpy(digest, ctx->buf, 16);
-    pj_memset(ctx, 0, sizeof(ctx));	/* In case it's sensitive */
+    pj_bzero(ctx, sizeof(ctx));	/* In case it's sensitive */
 }
 
 #ifndef ASM_MD5
diff --git a/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c b/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c
index 7ff758c9..0c88a70f 100644
--- a/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c
+++ b/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c
@@ -24,7 +24,7 @@
 
 PJ_DEF(void) pj_cis_buf_init( pj_cis_buf_t *cis_buf)
 {
-    pj_memset(cis_buf->cis_buf, 0, sizeof(cis_buf->cis_buf));
+    pj_bzero(cis_buf->cis_buf, sizeof(cis_buf->cis_buf));
     cis_buf->use_mask = 0;
 }
 
diff --git a/pjlib-util/src/pjlib-util/scanner_cis_uint.c b/pjlib-util/src/pjlib-util/scanner_cis_uint.c
index 46486c6b..41599835 100644
--- a/pjlib-util/src/pjlib-util/scanner_cis_uint.c
+++ b/pjlib-util/src/pjlib-util/scanner_cis_uint.c
@@ -30,7 +30,7 @@ PJ_DEF(void) pj_cis_buf_init( pj_cis_buf_t *cis_buf)
 
 PJ_DEF(pj_status_t) pj_cis_init(pj_cis_buf_t *cis_buf, pj_cis_t *cis)
 {
-    pj_memset(cis->cis_buf, 0, sizeof(cis->cis_buf));
+    pj_bzero(cis->cis_buf, sizeof(cis->cis_buf));
     return PJ_SUCCESS;
 }
 
diff --git a/pjlib/include/pj/compat/cc_gcc.h b/pjlib/include/pj/compat/cc_gcc.h
index 11dfd81e..46b6afc0 100644
--- a/pjlib/include/pj/compat/cc_gcc.h
+++ b/pjlib/include/pj/compat/cc_gcc.h
@@ -49,5 +49,10 @@ typedef unsigned long long pj_uint64_t;
 #define PJ_INT64_FMT		"L"
 
 
+#ifdef __GLIBC__
+#   define PJ_HAS_BZERO		1
+#endif
+
+
 #endif	/* __PJ_COMPAT_CC_GCC_H__ */
 
diff --git a/pjlib/include/pj/pool_i.h b/pjlib/include/pj/pool_i.h
index 05db29b7..3df6b97f 100644
--- a/pjlib/include/pj/pool_i.h
+++ b/pjlib/include/pj/pool_i.h
@@ -68,7 +68,7 @@ PJ_IDEF(void*) pj_pool_calloc( pj_pool_t *pool, pj_size_t count, pj_size_t size)
 {
     void *buf = pj_pool_alloc( pool, size*count);
     if (buf)
-	pj_memset(buf, 0, size * count);
+	pj_bzero(buf, size * count);
     return buf;
 }
 
diff --git a/pjlib/include/pj/string.h b/pjlib/include/pj/string.h
index 7c513e7c..4466567e 100644
--- a/pjlib/include/pj/string.h
+++ b/pjlib/include/pj/string.h
@@ -552,7 +552,11 @@ PJ_DECL(int) pj_utoa_pad( unsigned long val, char *buf, int min_dig, int pad);
  */
 PJ_INLINE(void) pj_bzero(void *dst, pj_size_t size)
 {
+#if defined(PJ_HAS_BZERO) && PJ_HAS_BZERO!=0
     bzero(dst, size);
+#else
+    memset(dst, 0, size);
+#endif
 }
 
 
diff --git a/pjlib/src/pj/file_access_win32.c b/pjlib/src/pj/file_access_win32.c
index 31b32378..47abad4a 100644
--- a/pjlib/src/pj/file_access_win32.c
+++ b/pjlib/src/pj/file_access_win32.c
@@ -142,7 +142,7 @@ static pj_status_t file_time_to_time_val(const FILETIME *file_time,
     //if (!SystemTimeToTzSpecificLocalTime(NULL, &systemTime, &localTime))
     //    return PJ_RETURN_OS_ERROR(GetLastError());
 
-    pj_memset(&pt, 0, sizeof(pt));
+    pj_bzero(&pt, sizeof(pt));
     pt.year = localTime.wYear;
     pt.mon = localTime.wMonth-1;
     pt.day = localTime.wDay;
diff --git a/pjlib/src/pj/ioqueue_common_abs.c b/pjlib/src/pj/ioqueue_common_abs.c
index 05998044..95ca6d6a 100644
--- a/pjlib/src/pj/ioqueue_common_abs.c
+++ b/pjlib/src/pj/ioqueue_common_abs.c
@@ -997,7 +997,7 @@ PJ_DEF(pj_status_t) pj_ioqueue_connect( pj_ioqueue_key_t *key,
 PJ_DEF(void) pj_ioqueue_op_key_init( pj_ioqueue_op_key_t *op_key,
 				     pj_size_t size )
 {
-    pj_memset(op_key, 0, size);
+    pj_bzero(op_key, size);
 }
 
 
diff --git a/pjlib/src/pj/ioqueue_winnt.c b/pjlib/src/pj/ioqueue_winnt.c
index 5c2a79d9..fbf308e1 100644
--- a/pjlib/src/pj/ioqueue_winnt.c
+++ b/pjlib/src/pj/ioqueue_winnt.c
@@ -177,8 +177,8 @@ static void ioqueue_on_accept_complete(ioqueue_accept_rec *accept_overlapped)
         pj_memcpy(accept_overlapped->local, local, locallen);
         pj_memcpy(accept_overlapped->remote, remote, locallen);
     } else {
-        pj_memset(accept_overlapped->local, 0, *accept_overlapped->addrlen);
-        pj_memset(accept_overlapped->remote, 0, *accept_overlapped->addrlen);
+        pj_bzero(accept_overlapped->local, *accept_overlapped->addrlen);
+        pj_bzero(accept_overlapped->remote, *accept_overlapped->addrlen);
     }
     *accept_overlapped->addrlen = locallen;
     if (accept_overlapped->newsock_ptr)
@@ -833,7 +833,7 @@ PJ_DEF(pj_status_t) pj_ioqueue_recv(  pj_ioqueue_key_t *key,
      * No immediate data available.
      * Register overlapped Recv() operation.
      */
-    pj_memset(&op_key_rec->overlapped.overlapped, 0,
+    pj_bzero( &op_key_rec->overlapped.overlapped, 
               sizeof(op_key_rec->overlapped.overlapped));
     op_key_rec->overlapped.operation = PJ_IOQUEUE_OP_RECV;
 
@@ -909,7 +909,7 @@ PJ_DEF(pj_status_t) pj_ioqueue_recvfrom( pj_ioqueue_key_t *key,
      * No immediate data available.
      * Register overlapped Recv() operation.
      */
-    pj_memset(&op_key_rec->overlapped.overlapped, 0,
+    pj_bzero( &op_key_rec->overlapped.overlapped, 
               sizeof(op_key_rec->overlapped.overlapped));
     op_key_rec->overlapped.operation = PJ_IOQUEUE_OP_RECV;
 
@@ -1002,7 +1002,7 @@ PJ_DEF(pj_status_t) pj_ioqueue_sendto( pj_ioqueue_key_t *key,
      * Data can't be sent immediately.
      * Schedule asynchronous WSASend().
      */
-    pj_memset(&op_key_rec->overlapped.overlapped, 0,
+    pj_bzero( &op_key_rec->overlapped.overlapped, 
               sizeof(op_key_rec->overlapped.overlapped));
     op_key_rec->overlapped.operation = PJ_IOQUEUE_OP_SEND;
 
@@ -1099,7 +1099,7 @@ PJ_DEF(pj_status_t) pj_ioqueue_accept( pj_ioqueue_key_t *key,
     op_key_rec->accept.local = local;
     op_key_rec->accept.remote = remote;
     op_key_rec->accept.newsock_ptr = new_sock;
-    pj_memset(&op_key_rec->accept.overlapped, 0, 
+    pj_bzero( &op_key_rec->accept.overlapped, 
 	      sizeof(op_key_rec->accept.overlapped));
 
     rc = AcceptEx( (SOCKET)key->hnd, (SOCKET)op_key_rec->accept.newsock,
@@ -1206,7 +1206,7 @@ PJ_DEF(pj_status_t) pj_ioqueue_connect( pj_ioqueue_key_t *key,
 PJ_DEF(void) pj_ioqueue_op_key_init( pj_ioqueue_op_key_t *op_key,
 				     pj_size_t size )
 {
-    pj_memset(op_key, 0, size);
+    pj_bzero(op_key, size);
 }
 
 PJ_DEF(pj_bool_t) pj_ioqueue_is_pending( pj_ioqueue_key_t *key,
diff --git a/pjlib/src/pj/os_core_linux_kernel.c b/pjlib/src/pj/os_core_linux_kernel.c
index b85e9ba1..ee0f3452 100644
--- a/pjlib/src/pj/os_core_linux_kernel.c
+++ b/pjlib/src/pj/os_core_linux_kernel.c
@@ -261,7 +261,7 @@ PJ_DEF(pj_status_t) pj_thread_register ( const char *cstr_thread_name,
     }
 
     /* Initialize and set the thread entry. */
-    pj_memset(desc, 0, sizeof(struct pj_thread_t));
+    pj_bzero(desc, sizeof(struct pj_thread_t));
 
     if(cstr_thread_name && pj_strlen(&thread_name) < sizeof(thread->obj_name)-1)
 	pj_sprintf(thread->obj_name, cstr_thread_name, thread->thread);
diff --git a/pjlib/src/pj/os_core_unix.c b/pjlib/src/pj/os_core_unix.c
index d37c142b..b447e72c 100644
--- a/pjlib/src/pj/os_core_unix.c
+++ b/pjlib/src/pj/os_core_unix.c
@@ -206,7 +206,7 @@ PJ_DEF(pj_status_t) pj_thread_register ( const char *cstr_thread_name,
     }
 
     /* Initialize and set the thread entry. */
-    pj_memset(desc, 0, sizeof(struct pj_thread_t));
+    pj_bzero(desc, sizeof(struct pj_thread_t));
     thread->thread = pthread_self();
 
     if(cstr_thread_name && pj_strlen(&thread_name) < sizeof(thread->obj_name)-1)
diff --git a/pjlib/src/pj/os_core_win32.c b/pjlib/src/pj/os_core_win32.c
index fbc77dba..726702b2 100644
--- a/pjlib/src/pj/os_core_win32.c
+++ b/pjlib/src/pj/os_core_win32.c
@@ -215,7 +215,7 @@ PJ_DEF(pj_status_t) pj_thread_register ( const char *cstr_thread_name,
     }
 
     /* Initialize and set the thread entry. */
-    pj_memset(desc, 0, sizeof(struct pj_thread_t));
+    pj_bzero(desc, sizeof(struct pj_thread_t));
     thread->hthread = GetCurrentThread();
     thread->idthread = GetCurrentThreadId();
 
diff --git a/pjlib/src/pj/os_time_win32.c b/pjlib/src/pj/os_time_win32.c
index 94f0450b..e3733f98 100644
--- a/pjlib/src/pj/os_time_win32.c
+++ b/pjlib/src/pj/os_time_win32.c
@@ -102,7 +102,7 @@ PJ_DEF(pj_status_t) pj_time_encode(const pj_parsed_time *pt, pj_time_val *tv)
     FILETIME ft;
     LARGE_INTEGER li;
 
-    pj_memset(&st, 0, sizeof(st));
+    pj_bzero(&st, sizeof(st));
     st.wYear = (pj_uint16_t) pt->year;
     st.wMonth = (pj_uint16_t) (pt->mon + 1);
     st.wDay = (pj_uint16_t) pt->day;
diff --git a/pjlib/src/pj/pool.c b/pjlib/src/pj/pool.c
index a9f658c5..513e9fac 100644
--- a/pjlib/src/pj/pool.c
+++ b/pjlib/src/pj/pool.c
@@ -184,7 +184,7 @@ PJ_DEF(pj_pool_t*) pj_pool_create_int( pj_pool_factory *f, const char *name,
 
     /* Set pool administrative data. */
     pool = (pj_pool_t*)buffer;
-    pj_memset(pool, 0, sizeof(*pool));
+    pj_bzero(pool, sizeof(*pool));
 
     pj_list_init(&pool->block_list);
     pool->factory = f;
diff --git a/pjlib/src/pj/pool_caching.c b/pjlib/src/pj/pool_caching.c
index 1c9f3e2f..1aed730a 100644
--- a/pjlib/src/pj/pool_caching.c
+++ b/pjlib/src/pj/pool_caching.c
@@ -47,7 +47,7 @@ PJ_DEF(void) pj_caching_pool_init( pj_caching_pool *cp,
 
     PJ_CHECK_STACK();
 
-    pj_memset(cp, 0, sizeof(*cp));
+    pj_bzero(cp, sizeof(*cp));
     
     cp->max_capacity = max_capacity;
     pj_list_init(&cp->used_list);
diff --git a/pjlib/src/pj/pool_dbg.c b/pjlib/src/pj/pool_dbg.c
index 550fcdc5..0d38dcf2 100644
--- a/pjlib/src/pj/pool_dbg.c
+++ b/pjlib/src/pj/pool_dbg.c
@@ -176,7 +176,7 @@ PJ_DEF(void*) pj_pool_calloc_imp( const char *file, int line,
     if (!mem)
 	return NULL;
 
-    pj_memset(mem, 0, cnt*elemsz);
+    pj_bzero(mem, cnt*elemsz);
     return mem;
 }
 
diff --git a/pjlib/src/pj/sock_bsd.c b/pjlib/src/pj/sock_bsd.c
index b3bb86b4..49fe0232 100644
--- a/pjlib/src/pj/sock_bsd.c
+++ b/pjlib/src/pj/sock_bsd.c
@@ -210,7 +210,7 @@ PJ_DEF(pj_status_t) pj_sockaddr_in_set_str_addr( pj_sockaddr_in *addr,
 
     RESET_LEN(addr);
     addr->sin_family = AF_INET;
-    pj_memset(addr->sin_zero, 0, sizeof(addr->sin_zero));
+    pj_bzero(addr->sin_zero, sizeof(addr->sin_zero));
 
     if (str_addr && str_addr->slen) {
 	addr->sin_addr = pj_inet_addr(str_addr);
@@ -248,7 +248,7 @@ PJ_DEF(pj_status_t) pj_sockaddr_in_init( pj_sockaddr_in *addr,
 
     RESET_LEN(addr);
     addr->sin_family = PJ_AF_INET;
-    pj_memset(addr->sin_zero, 0, sizeof(addr->sin_zero));
+    pj_bzero(addr->sin_zero, sizeof(addr->sin_zero));
     pj_sockaddr_in_set_port(addr, port);
     return pj_sockaddr_in_set_str_addr(addr, str_addr);
 }
@@ -370,7 +370,7 @@ PJ_DEF(pj_status_t) pj_sock_bind_in( pj_sock_t sock,
 
     SET_LEN(&addr, sizeof(pj_sockaddr_in));
     addr.sin_family = PJ_AF_INET;
-    pj_memset(addr.sin_zero, 0, sizeof(addr.sin_zero));
+    pj_bzero(addr.sin_zero, sizeof(addr.sin_zero));
     addr.sin_addr.s_addr = pj_htonl(addr32);
     addr.sin_port = pj_htons(port);
 
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++);
diff --git a/pjmedia/include/pjmedia/types.h b/pjmedia/include/pjmedia/types.h
index d43ef768..c49e6be4 100644
--- a/pjmedia/include/pjmedia/types.h
+++ b/pjmedia/include/pjmedia/types.h
@@ -168,7 +168,7 @@ typedef struct pjmedia_sock_info
 PJ_INLINE(void) pjmedia_zero_samples(pj_int16_t *samples, unsigned count)
 {
 #if 1
-    pj_memset(samples, 0, count*sizeof(pj_int16_t));
+    pj_bzero(samples, count*sizeof(pj_int16_t));
 #elif 0
     unsigned i;
     for (i=0; i<count; ++i) samples[i] = 0;
diff --git a/pjmedia/src/pjmedia-codec/gsm.c b/pjmedia/src/pjmedia-codec/gsm.c
index 48e8ae13..57eb1900 100644
--- a/pjmedia/src/pjmedia-codec/gsm.c
+++ b/pjmedia/src/pjmedia-codec/gsm.c
@@ -241,7 +241,7 @@ static pj_status_t gsm_default_attr (pjmedia_codec_factory *factory,
     PJ_UNUSED_ARG(factory);
     PJ_UNUSED_ARG(id);
 
-    pj_memset(attr, 0, sizeof(pjmedia_codec_param));
+    pj_bzero(attr, sizeof(pjmedia_codec_param));
     attr->info.clock_rate = 8000;
     attr->info.channel_cnt = 1;
     attr->info.avg_bps = 13200;
@@ -268,7 +268,7 @@ static pj_status_t gsm_enum_codecs(pjmedia_codec_factory *factory,
     PJ_UNUSED_ARG(factory);
     PJ_ASSERT_RETURN(codecs && *count > 0, PJ_EINVAL);
 
-    pj_memset(&codecs[0], 0, sizeof(pjmedia_codec_info));
+    pj_bzero(&codecs[0], sizeof(pjmedia_codec_info));
     codecs[0].encoding_name = pj_str("GSM");
     codecs[0].pt = PJMEDIA_RTP_PT_GSM;
     codecs[0].type = PJMEDIA_TYPE_AUDIO;
diff --git a/pjmedia/src/pjmedia-codec/l16.c b/pjmedia/src/pjmedia-codec/l16.c
index 47e4c070..462306ab 100644
--- a/pjmedia/src/pjmedia-codec/l16.c
+++ b/pjmedia/src/pjmedia-codec/l16.c
@@ -234,7 +234,7 @@ static pj_status_t l16_default_attr( pjmedia_codec_factory *factory,
 {
     PJ_UNUSED_ARG(factory);
 
-    pj_memset(attr, 0, sizeof(pjmedia_codec_param));
+    pj_bzero(attr, sizeof(pjmedia_codec_param));
     attr->info.pt = (pj_uint8_t)id->pt;
     attr->info.clock_rate = id->clock_rate;
     attr->info.channel_cnt = id->channel_cnt;
diff --git a/pjmedia/src/pjmedia-codec/speex_codec.c b/pjmedia/src/pjmedia-codec/speex_codec.c
index 6f87668f..6a64c77d 100644
--- a/pjmedia/src/pjmedia-codec/speex_codec.c
+++ b/pjmedia/src/pjmedia-codec/speex_codec.c
@@ -381,7 +381,7 @@ static pj_status_t spx_default_attr (pjmedia_codec_factory *factory,
 
     PJ_ASSERT_RETURN(factory==&spx_factory.base, PJ_EINVAL);
 
-    pj_memset(attr, 0, sizeof(pjmedia_codec_param));
+    pj_bzero(attr, sizeof(pjmedia_codec_param));
     attr->info.pt = (pj_uint8_t)id->pt;
     attr->info.channel_cnt = 1;
 
@@ -441,7 +441,7 @@ static pj_status_t spx_enum_codecs(pjmedia_codec_factory *factory,
 	if (!spx_factory.speex_param[i].enabled)
 	    continue;
 
-	pj_memset(&codecs[*count], 0, sizeof(pjmedia_codec_info));
+	pj_bzero(&codecs[*count], sizeof(pjmedia_codec_info));
 	codecs[*count].encoding_name = pj_str("speex");
 	codecs[*count].pt = spx_factory.speex_param[i].pt;
 	codecs[*count].type = PJMEDIA_TYPE_AUDIO;
@@ -750,7 +750,7 @@ static pj_status_t spx_codec_decode( pjmedia_codec *codec,
     spx = (struct spx_private*) codec->codec_data;
 
     if (input->type != PJMEDIA_FRAME_TYPE_AUDIO) {
-	pj_memset(output->buf, 0, output_buf_len);
+	pj_bzero(output->buf, output_buf_len);
 	output->size = 320;
 	output->timestamp.u64 = input->timestamp.u64;
 	output->type = PJMEDIA_FRAME_TYPE_AUDIO;
diff --git a/pjmedia/src/pjmedia/conference.c b/pjmedia/src/pjmedia/conference.c
index 7c4ed922..176541ad 100644
--- a/pjmedia/src/pjmedia/conference.c
+++ b/pjmedia/src/pjmedia/conference.c
@@ -1532,8 +1532,7 @@ static pj_status_t get_frame(pjmedia_port *this_port,
 	     */
 	    mix_buf = listener->mix_buf;
 	    if (listener->src_level == 0) {
-		pj_memset(mix_buf, 0, 
-			  conf->samples_per_frame*sizeof(mix_buf[0]));
+		pj_bzero( mix_buf, conf->samples_per_frame*sizeof(mix_buf[0]));
 	    }
 
 	    /* A little bit of optimization:
diff --git a/pjmedia/src/pjmedia/dsound.c b/pjmedia/src/pjmedia/dsound.c
index 81ea2f2c..e452fa55 100644
--- a/pjmedia/src/pjmedia/dsound.c
+++ b/pjmedia/src/pjmedia/dsound.c
@@ -114,7 +114,7 @@ static void init_waveformatex (PCMWAVEFORMAT *pcmwf,
 			       unsigned clock_rate,
 			       unsigned channel_count)
 {
-    pj_memset(pcmwf, 0, sizeof(PCMWAVEFORMAT)); 
+    pj_bzero(pcmwf, sizeof(PCMWAVEFORMAT)); 
     pcmwf->wf.wFormatTag = WAVE_FORMAT_PCM; 
     pcmwf->wf.nChannels = (pj_uint16_t)channel_count;
     pcmwf->wf.nSamplesPerSec = clock_rate;
@@ -176,7 +176,7 @@ static pj_status_t init_player_stream( struct dsound_stream *ds_strm,
     bytes_per_frame = samples_per_frame * BYTES_PER_SAMPLE;
 
     /* Set up DSBUFFERDESC structure. */
-    pj_memset(&dsbdesc, 0, sizeof(DSBUFFERDESC)); 
+    pj_bzero(&dsbdesc, sizeof(DSBUFFERDESC)); 
     dsbdesc.dwSize = sizeof(DSBUFFERDESC); 
     dsbdesc.dwFlags = DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLPOSITIONNOTIFY |
 		      DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_GLOBALFOCUS;
@@ -287,7 +287,7 @@ static pj_status_t init_capture_stream( struct dsound_stream *ds_strm,
      * Setup capture buffer using sound buffer structure that was passed
      * to play buffer creation earlier.
      */
-    pj_memset(&dscbdesc, 0, sizeof(DSCBUFFERDESC));
+    pj_bzero(&dscbdesc, sizeof(DSCBUFFERDESC));
     dscbdesc.dwSize = sizeof(DSCBUFFERDESC); 
     dscbdesc.dwFlags = DSCBCAPS_WAVEMAPPED ;
     dscbdesc.dwBufferBytes = buffer_count * bytes_per_frame; 
@@ -548,7 +548,7 @@ static int dsound_dev_thread(void *arg)
 					   bytes_per_frame);
 		
 		if (!rc) {
-		    pj_memset(strm->buffer, 0, bytes_per_frame);
+		    pj_bzero(strm->buffer, bytes_per_frame);
 		}
 
 		/* Call callback */
diff --git a/pjmedia/src/pjmedia/endpoint.c b/pjmedia/src/pjmedia/endpoint.c
index c59a9eda..cd1977c6 100644
--- a/pjmedia/src/pjmedia/endpoint.c
+++ b/pjmedia/src/pjmedia/endpoint.c
@@ -485,7 +485,7 @@ PJ_DEF(pj_status_t) pjmedia_endpt_dump(pjmedia_endpt *endpt)
 						&codec_info[i],
 						&param) != PJ_SUCCESS)
 	{
-	    pj_memset(&param, 0, sizeof(pjmedia_codec_param));
+	    pj_bzero(&param, sizeof(pjmedia_codec_param));
 	}
 
 	PJ_LOG(3,(THIS_FILE, 
diff --git a/pjmedia/src/pjmedia/g711.c b/pjmedia/src/pjmedia/g711.c
index 68a3934c..331f0303 100644
--- a/pjmedia/src/pjmedia/g711.c
+++ b/pjmedia/src/pjmedia/g711.c
@@ -239,7 +239,7 @@ static pj_status_t g711_default_attr (pjmedia_codec_factory *factory,
 {
     PJ_UNUSED_ARG(factory);
 
-    pj_memset(attr, 0, sizeof(pjmedia_codec_param));
+    pj_bzero(attr, sizeof(pjmedia_codec_param));
     attr->info.clock_rate = 8000;
     attr->info.channel_cnt = 1;
     attr->info.avg_bps = G711_BPS;
diff --git a/pjmedia/src/pjmedia/jbuf.c b/pjmedia/src/pjmedia/jbuf.c
index 7e7fd0d5..8582e5fa 100644
--- a/pjmedia/src/pjmedia/jbuf.c
+++ b/pjmedia/src/pjmedia/jbuf.c
@@ -98,7 +98,7 @@ static pj_status_t jb_framelist_init( pj_pool_t *pool,
 {
     PJ_ASSERT_RETURN(pool && framelist, PJ_EINVAL);
 
-    pj_memset(framelist, 0, sizeof(jb_framelist));
+    pj_bzero(framelist, sizeof(jb_framelist));
 
     framelist->flist_frame_size = frame_size;
     framelist->flist_max_count = max_count;
@@ -146,9 +146,9 @@ static pj_bool_t jb_framelist_get(jb_framelist *framelist,
 	*p_type = (pjmedia_jb_frame_type) 
 		  framelist->flist_frame_type[framelist->flist_head];
 
-	pj_memset(framelist->flist_buffer + 
+	pj_bzero(framelist->flist_buffer + 
 		    framelist->flist_head * framelist->flist_frame_size,
-		  0, framelist->flist_frame_size);
+		  framelist->flist_frame_size);
 	framelist->flist_frame_type[framelist->flist_head] = 
 	    PJMEDIA_JB_MISSING_FRAME;
 
@@ -161,7 +161,7 @@ static pj_bool_t jb_framelist_get(jb_framelist *framelist,
 	return PJ_TRUE;
 
     } else {
-	pj_memset(frame, 0, framelist->flist_frame_size);
+	pj_bzero(frame, framelist->flist_frame_size);
 	return PJ_FALSE;
     }
 }
@@ -189,17 +189,15 @@ static void jb_framelist_remove_head( jb_framelist *framelist,
 	    step2 = 0;
 	}
 
-	pj_memset(framelist->flist_buffer + 
+	pj_bzero(framelist->flist_buffer + 
 		    framelist->flist_head * framelist->flist_frame_size,
-	          0,
 	          step1*framelist->flist_frame_size);
 	pj_memset(framelist->flist_frame_type+framelist->flist_head,
 		  PJMEDIA_JB_MISSING_FRAME,
 		  step1*sizeof(framelist->flist_frame_type[0]));
 
 	if (step2) {
-	    pj_memset(framelist->flist_buffer,
-		      0,
+	    pj_bzero( framelist->flist_buffer,
 		      step2*framelist->flist_frame_size);
 	    pj_memset(framelist->flist_frame_type,
 		      PJMEDIA_JB_MISSING_FRAME,
@@ -527,7 +525,7 @@ PJ_DEF(void) pjmedia_jbuf_get_frame( pjmedia_jbuf *jb,
 	/* Can't return frame because jitter buffer is filling up
 	 * minimum prefetch.
 	 */
-	pj_memset(frame, 0, jb->jb_frame_size);
+	pj_bzero(frame, jb->jb_frame_size);
 	if (jb_framelist_size(&jb->jb_framelist) == 0)
 	    *p_frame_type = PJMEDIA_JB_ZERO_EMPTY_FRAME;
 	else
@@ -539,7 +537,7 @@ PJ_DEF(void) pjmedia_jbuf_get_frame( pjmedia_jbuf *jb,
     /* Retrieve a frame from frame list */
     if (jb_framelist_get(&jb->jb_framelist,frame,&ftype) == PJ_FALSE) {
 	/* Can't return frame because jitter buffer is empty! */
-	pj_memset(frame, 0, jb->jb_frame_size);
+	pj_bzero(frame, jb->jb_frame_size);
 	*p_frame_type = PJMEDIA_JB_ZERO_EMPTY_FRAME;
 
 	return;
diff --git a/pjmedia/src/pjmedia/master_port.c b/pjmedia/src/pjmedia/master_port.c
index ce45038a..7f371fad 100644
--- a/pjmedia/src/pjmedia/master_port.c
+++ b/pjmedia/src/pjmedia/master_port.c
@@ -149,7 +149,7 @@ static void clock_callback(const pj_timestamp *ts, void *user_data)
     pj_lock_acquire(m->lock);
 
     /* Get frame from upstream port and pass it to downstream port */
-    pj_memset(&frame, 0, sizeof(frame));
+    pj_bzero(&frame, sizeof(frame));
     frame.buf = m->buff;
     frame.size = m->buff_size;
     frame.timestamp.u64 = ts->u64;
@@ -161,7 +161,7 @@ static void clock_callback(const pj_timestamp *ts, void *user_data)
     status = pjmedia_port_put_frame(m->d_port, &frame);
 
     /* Get frame from downstream port and pass it to upstream port */
-    pj_memset(&frame, 0, sizeof(frame));
+    pj_bzero(&frame, sizeof(frame));
     frame.buf = m->buff;
     frame.size = m->buff_size;
     frame.timestamp.u64 = ts->u64;
diff --git a/pjmedia/src/pjmedia/pasound.c b/pjmedia/src/pjmedia/pasound.c
index d4ed700a..9255f698 100644
--- a/pjmedia/src/pjmedia/pasound.c
+++ b/pjmedia/src/pjmedia/pasound.c
@@ -211,7 +211,7 @@ PJ_DEF(const pjmedia_snd_dev_info*) pjmedia_snd_get_dev_info(unsigned index)
     if (!pa_info)
 	return NULL;
 
-    pj_memset(&info, 0, sizeof(info));
+    pj_bzero(&info, sizeof(info));
     strncpy(info.name, pa_info->name, sizeof(info.name));
     info.name[sizeof(info.name)-1] = '\0';
     info.input_count = pa_info->maxInputChannels;
@@ -285,7 +285,7 @@ PJ_DEF(pj_status_t) pjmedia_snd_open_rec( int index,
     stream->channel_count = channel_count;
     stream->rec_cb = rec_cb;
 
-    pj_memset(&inputParam, 0, sizeof(inputParam));
+    pj_bzero(&inputParam, sizeof(inputParam));
     inputParam.device = index;
     inputParam.channelCount = channel_count;
     inputParam.hostApiSpecificStreamInfo = NULL;
@@ -378,7 +378,7 @@ PJ_DEF(pj_status_t) pjmedia_snd_open_player( int index,
     stream->channel_count = channel_count;
     stream->play_cb = play_cb;
 
-    pj_memset(&outputParam, 0, sizeof(outputParam));
+    pj_bzero(&outputParam, sizeof(outputParam));
     outputParam.device = index;
     outputParam.channelCount = channel_count;
     outputParam.hostApiSpecificStreamInfo = NULL;
@@ -500,7 +500,7 @@ PJ_DEF(pj_status_t) pjmedia_snd_open( int rec_id,
     stream->rec_cb = rec_cb;
     stream->play_cb = play_cb;
 
-    pj_memset(&inputParam, 0, sizeof(inputParam));
+    pj_bzero(&inputParam, sizeof(inputParam));
     inputParam.device = rec_id;
     inputParam.channelCount = channel_count;
     inputParam.hostApiSpecificStreamInfo = NULL;
@@ -509,7 +509,7 @@ PJ_DEF(pj_status_t) pjmedia_snd_open( int rec_id,
 
     paRecHostApiInfo = Pa_GetHostApiInfo(paRecDevInfo->hostApi);
 
-    pj_memset(&outputParam, 0, sizeof(outputParam));
+    pj_bzero(&outputParam, sizeof(outputParam));
     outputParam.device = play_id;
     outputParam.channelCount = channel_count;
     outputParam.hostApiSpecificStreamInfo = NULL;
diff --git a/pjmedia/src/pjmedia/plc_common.c b/pjmedia/src/pjmedia/plc_common.c
index 241a0c2e..2aa849a3 100644
--- a/pjmedia/src/pjmedia/plc_common.c
+++ b/pjmedia/src/pjmedia/plc_common.c
@@ -183,7 +183,7 @@ static void plc_replay_generate(void *plc, pj_int16_t *frame)
 	for (i=0; i<count; ++i)
 	    samp[i] = (pj_int16_t)(samp[i] >> 1);
     } else {
-	pj_memset(frame, 0, o->size);
+	pj_bzero(frame, o->size);
     }
 }
 
diff --git a/pjmedia/src/pjmedia/resample_port.c b/pjmedia/src/pjmedia/resample_port.c
index ca128515..62d29d2b 100644
--- a/pjmedia/src/pjmedia/resample_port.c
+++ b/pjmedia/src/pjmedia/resample_port.c
@@ -171,7 +171,7 @@ static pj_status_t resample_get_frame(pjmedia_port *this_port,
 
     /* Return silence if we don't have downstream port */
     if (rport->dn_port == NULL) {
-	pj_memset(frame->buf, frame->size, 0);
+	pj_bzero(frame->buf, frame->size);
 	return PJ_SUCCESS;
     }
 
diff --git a/pjmedia/src/pjmedia/rtcp.c b/pjmedia/src/pjmedia/rtcp.c
index 11f28831..63f84738 100644
--- a/pjmedia/src/pjmedia/rtcp.c
+++ b/pjmedia/src/pjmedia/rtcp.c
@@ -134,7 +134,7 @@ PJ_DEF(void) pjmedia_rtcp_init(pjmedia_rtcp_session *sess,
     pj_time_val now;
     
     /* Memset everything */
-    pj_memset(sess, 0, sizeof(pjmedia_rtcp_session));
+    pj_bzero(sess, sizeof(pjmedia_rtcp_session));
 
     /* Last RX timestamp in RTP packet */
     sess->rtp_last_ts = (unsigned)-1;
diff --git a/pjmedia/src/pjmedia/rtp.c b/pjmedia/src/pjmedia/rtp.c
index 16d2cf62..c57a7baa 100644
--- a/pjmedia/src/pjmedia/rtp.c
+++ b/pjmedia/src/pjmedia/rtp.c
@@ -60,7 +60,7 @@ PJ_DEF(pj_status_t) pjmedia_rtp_session_init( pjmedia_rtp_session *ses,
     }
 
     /* Initialize session. */
-    pj_memset(ses, 0, sizeof(*ses));
+    pj_bzero(ses, sizeof(*ses));
 
     /* Initial sequence number SHOULD be random, according to RFC 3550. */
     ses->out_extseq = pj_rand();
diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c
index 2b2425e6..5ce44164 100644
--- a/pjmedia/src/pjmedia/sdp_neg.c
+++ b/pjmedia/src/pjmedia/sdp_neg.c
@@ -855,7 +855,7 @@ static pj_status_t create_answer( pj_pool_t *pool,
 
     answer->media_count = 0;
 
-    pj_memset(media_used, 0, sizeof(media_used));
+    pj_bzero(media_used, sizeof(media_used));
 
     /* For each media line, create our answer based on our initial
      * capability.
diff --git a/pjmedia/src/pjmedia/session.c b/pjmedia/src/pjmedia/session.c
index 2bf7a8dd..b629219c 100644
--- a/pjmedia/src/pjmedia/session.c
+++ b/pjmedia/src/pjmedia/session.c
@@ -103,7 +103,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_info_from_sdp(
 
     /* Reset: */
 
-    pj_memset(si, 0, sizeof(*si));
+    pj_bzero(si, sizeof(*si));
 
     /* Media type: */
 
diff --git a/pjmedia/src/pjmedia/sound_port.c b/pjmedia/src/pjmedia/sound_port.c
index 0d82fee2..08f2232a 100644
--- a/pjmedia/src/pjmedia/sound_port.c
+++ b/pjmedia/src/pjmedia/sound_port.c
@@ -117,7 +117,7 @@ no_frame:
 	PJ_LOG(4,(THIS_FILE, "Lost frame generated"));
 #endif
     } else {
-	pj_memset(output, 0, size);
+	pj_bzero(output, size);
     }
 
 
diff --git a/pjmedia/src/pjmedia/transport_udp.c b/pjmedia/src/pjmedia/transport_udp.c
index 99d6d0aa..edfabbb9 100644
--- a/pjmedia/src/pjmedia/transport_udp.c
+++ b/pjmedia/src/pjmedia/transport_udp.c
@@ -150,7 +150,7 @@ PJ_DEF(pj_status_t) pjmedia_transport_udp_create2(pjmedia_endpt *endpt,
     PJ_ASSERT_RETURN(endpt && port && p_tp, PJ_EINVAL);
 
 
-    pj_memset(&si, 0, sizeof(pjmedia_sock_info));
+    pj_bzero(&si, sizeof(pjmedia_sock_info));
     si.rtp_sock = si.rtcp_sock = PJ_INVALID_SOCKET;
 
     /* Create RTP socket */
@@ -240,7 +240,7 @@ PJ_DEF(pj_status_t) pjmedia_transport_udp_attach( pjmedia_endpt *endpt,
 
 
     /* Setup RTP socket with the ioqueue */
-    pj_memset(&rtp_cb, 0, sizeof(rtp_cb));
+    pj_bzero(&rtp_cb, sizeof(rtp_cb));
     rtp_cb.on_read_complete = &on_rx_rtp;
 
     status = pj_ioqueue_register_sock(pool, ioqueue, tp->rtp_sock, tp,
@@ -264,7 +264,7 @@ PJ_DEF(pj_status_t) pjmedia_transport_udp_attach( pjmedia_endpt *endpt,
 
 
     /* Setup RTCP socket with ioqueue */
-    pj_memset(&rtcp_cb, 0, sizeof(rtcp_cb));
+    pj_bzero(&rtcp_cb, sizeof(rtcp_cb));
     rtcp_cb.on_read_complete = &on_rx_rtcp;
 
     status = pj_ioqueue_register_sock(pool, ioqueue, tp->rtcp_sock, tp,
diff --git a/pjmedia/src/pjmedia/wav_player.c b/pjmedia/src/pjmedia/wav_player.c
index 08a4ef2d..526bf9fe 100644
--- a/pjmedia/src/pjmedia/wav_player.c
+++ b/pjmedia/src/pjmedia/wav_player.c
@@ -492,7 +492,7 @@ static pj_status_t file_get_frame(pjmedia_port *this_port,
 	/* Second stage: fill up buffer, and read from the start of buffer. */
 	status = fill_buffer(fport);
 	if (status != PJ_SUCCESS) {
-	    pj_memset(((char*)frame->buf)+endread, 0, frame_size-endread);
+	    pj_bzero(((char*)frame->buf)+endread, frame_size-endread);
 	    return status;
 	}
 
diff --git a/pjmedia/src/pjmedia/wav_writer.c b/pjmedia/src/pjmedia/wav_writer.c
index 0815b804..d1e4eec8 100644
--- a/pjmedia/src/pjmedia/wav_writer.c
+++ b/pjmedia/src/pjmedia/wav_writer.c
@@ -114,7 +114,7 @@ PJ_DEF(pj_status_t) pjmedia_wav_writer_port_create( pj_pool_t *pool,
 	return status;
 
     /* Initialize WAVE header */
-    pj_memset(&wave_hdr, 0, sizeof(pjmedia_wave_hdr));
+    pj_bzero(&wave_hdr, sizeof(pjmedia_wave_hdr));
     wave_hdr.riff_hdr.riff = PJMEDIA_RIFF_TAG;
     wave_hdr.riff_hdr.file_len = 0; /* will be filled later */
     wave_hdr.riff_hdr.wave = PJMEDIA_WAVE_TAG;
diff --git a/pjmedia/src/test/audio_tool.c b/pjmedia/src/test/audio_tool.c
index d4b8ad2f..43e4cb7d 100644
--- a/pjmedia/src/test/audio_tool.c
+++ b/pjmedia/src/test/audio_tool.c
@@ -170,7 +170,7 @@ static pj_status_t record_file (const char *filename)
 	return -1;
 #endif
 
-    pj_memset(&info, 0, sizeof(info));
+    pj_bzero(&info, sizeof(info));
     info.bits_per_sample = 16;
     info.bytes_per_frame = 2;
     info.frames_per_packet = 160;
@@ -217,7 +217,7 @@ static pj_status_t play_file (const char *filename)
     if (!fhnd)
 	return -1;
 
-    pj_memset(&info, 0, sizeof(info));
+    pj_bzero(&info, sizeof(info));
     info.bits_per_sample = 16;
     info.bytes_per_frame = 2;
     info.frames_per_packet = 160;
@@ -263,7 +263,7 @@ static int create_ses_by_remote_sdp(int local_port, char *sdp)
 	return -1;
     }
 
-    pj_memset(&skinfo, 0, sizeof(skinfo));
+    pj_bzero(&skinfo, sizeof(skinfo));
     skinfo.rtp_sock = skinfo.rtcp_sock = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, 0);
     if (skinfo.rtp_sock == PJ_INVALID_SOCKET) {
 	PJ_LOG(1,(THIS_FILE, "Unable to create socket"));
diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c
index 5468d236..85f983e4 100644
--- a/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/pjsip-apps/src/pjsua/pjsua_app.c
@@ -1739,7 +1739,7 @@ void console_app_main(const pj_str_t *uri_to_call)
 		    break;
 		}
 
-		pj_memset(&buddy_cfg, 0, sizeof(pjsua_buddy_config));
+		pj_bzero(&buddy_cfg, sizeof(pjsua_buddy_config));
 
 		buddy_cfg.uri = pj_str(buf);
 		buddy_cfg.subscribe = PJ_TRUE;
diff --git a/pjsip-apps/src/samples/pjsip-perf.c b/pjsip-apps/src/samples/pjsip-perf.c
index 7f41668c..4964a2f9 100644
--- a/pjsip-apps/src/samples/pjsip-perf.c
+++ b/pjsip-apps/src/samples/pjsip-perf.c
@@ -627,7 +627,7 @@ static pj_status_t init_sip()
 	pjsip_host_port addrname;
 	const char *transport_type;
 
-	pj_memset(&addr, 0, sizeof(addr));
+	pj_bzero(&addr, sizeof(addr));
 	addr.sin_family = PJ_AF_INET;
 	addr.sin_addr.s_addr = 0;
 	addr.sin_port = pj_htons((pj_uint16_t)app.local_port);
@@ -696,7 +696,7 @@ static pj_status_t init_sip()
 	pjsip_inv_callback inv_cb;
 
 	/* Init the callback for INVITE session: */
-	pj_memset(&inv_cb, 0, sizeof(inv_cb));
+	pj_bzero(&inv_cb, sizeof(inv_cb));
 	inv_cb.on_state_changed = &call_on_state_changed;
 	inv_cb.on_new_session = &call_on_forked;
 	inv_cb.on_media_update = &call_on_media_update;
diff --git a/pjsip-apps/src/samples/simpleua.c b/pjsip-apps/src/samples/simpleua.c
index c5c74ecb..1f682a6d 100644
--- a/pjsip-apps/src/samples/simpleua.c
+++ b/pjsip-apps/src/samples/simpleua.c
@@ -225,7 +225,7 @@ int main(int argc, char *argv[])
 	pjsip_inv_callback inv_cb;
 
 	/* Init the callback for INVITE session: */
-	pj_memset(&inv_cb, 0, sizeof(inv_cb));
+	pj_bzero(&inv_cb, sizeof(inv_cb));
 	inv_cb.on_state_changed = &call_on_state_changed;
 	inv_cb.on_new_session = &call_on_forked;
 	inv_cb.on_media_update = &call_on_media_update;
diff --git a/pjsip-apps/src/samples/siprtp.c b/pjsip-apps/src/samples/siprtp.c
index 7e8168a2..588350fb 100644
--- a/pjsip-apps/src/samples/siprtp.c
+++ b/pjsip-apps/src/samples/siprtp.c
@@ -302,7 +302,7 @@ static pj_status_t init_sip()
 	pj_sockaddr_in addr;
 	pjsip_host_port addrname;
 
-	pj_memset(&addr, 0, sizeof(addr));
+	pj_bzero(&addr, sizeof(addr));
 	addr.sin_family = PJ_AF_INET;
 	addr.sin_addr.s_addr = 0;
 	addr.sin_port = pj_htons((pj_uint16_t)app.sip_port);
@@ -337,7 +337,7 @@ static pj_status_t init_sip()
 	pjsip_inv_callback inv_cb;
 
 	/* Init the callback for INVITE session: */
-	pj_memset(&inv_cb, 0, sizeof(inv_cb));
+	pj_bzero(&inv_cb, sizeof(inv_cb));
 	inv_cb.on_state_changed = &call_on_state_changed;
 	inv_cb.on_new_session = &call_on_forked;
 	inv_cb.on_media_update = &call_on_media_update;
@@ -1156,7 +1156,7 @@ static void on_tx_rtp( pj_timer_heap_t *timer_heap,
 	pj_memcpy(packet, hdr, hdrlen);
 
 	/* Zero the payload */
-	pj_memset(packet+hdrlen, 0, strm->bytes_per_frame);
+	pj_bzero(packet+hdrlen, strm->bytes_per_frame);
 
 	/* Send RTP packet */
 	size = hdrlen + strm->bytes_per_frame;
diff --git a/pjsip-apps/src/samples/sndtest.c b/pjsip-apps/src/samples/sndtest.c
index c2b75b99..fc05d853 100644
--- a/pjsip-apps/src/samples/sndtest.c
+++ b/pjsip-apps/src/samples/sndtest.c
@@ -153,7 +153,7 @@ static pj_status_t play_cb(void *user_data, pj_uint32_t timestamp,
 
     /* Skip frames when test is not started or test has finished */
     if (!test_data->running) {
-	pj_memset(output, 0, size);
+	pj_bzero(output, size);
 	return PJ_SUCCESS;
     }
 
@@ -193,7 +193,7 @@ static pj_status_t play_cb(void *user_data, pj_uint32_t timestamp,
 
     }
 
-    pj_memset(output, 0, size);
+    pj_bzero(output, size);
     return PJ_SUCCESS;
 }
 
@@ -380,7 +380,7 @@ static int perform_test(const char *title, int dev_id, pjmedia_dir dir,
     /*
      * Init test parameters
      */
-    pj_memset(&test_data, 0, sizeof(test_data));
+    pj_bzero(&test_data, sizeof(test_data));
     test_data.dir = dir;
     test_data.clock_rate = clock_rate;
     test_data.samples_per_frame = samples_per_frame;
diff --git a/pjsip-apps/src/samples/streamutil.c b/pjsip-apps/src/samples/streamutil.c
index 5b46ff54..89b0c93a 100644
--- a/pjsip-apps/src/samples/streamutil.c
+++ b/pjsip-apps/src/samples/streamutil.c
@@ -127,7 +127,7 @@ static pj_status_t create_stream( pj_pool_t *pool,
 
 
     /* Reset stream info. */
-    pj_memset(&info, 0, sizeof(info));
+    pj_bzero(&info, sizeof(info));
 
 
     /* Initialize stream info formats */
@@ -230,7 +230,7 @@ int main(int argc, char *argv[])
     int option_index;
 
 
-    pj_memset(&remote_addr, 0, sizeof(remote_addr));
+    pj_bzero(&remote_addr, sizeof(remote_addr));
 
 
     /* init PJLIB : */
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;