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

20 files changed, 44 insertions, 35 deletions

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++);