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

22 files changed, 44 insertions, 47 deletions

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