osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Replace more g_malloc with g_new 

Replace g_malloc with g_new to improve
source code readability.
This commit is contained in:
Moshe Kaplan 2020-12-22 14:24:09 -05:00 committed by AndersBroman
parent 1c7edf49f8
commit 180b5e5dc0
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dumpcap.c
View File

@ -2792,7 +2792,7 @@ capture_loop_open_input(capture_options *capture_opts, loop_data *ld,
pcap_src->cap_pipe_state = STATE_EXPECT_REC_HDR;
pcap_src->cap_pipe_err = PIPOK;
#ifdef _WIN32
pcap_src->cap_pipe_read_mtx = g_malloc(sizeof(GMutex));
pcap_src->cap_pipe_read_mtx = g_new(GMutex, 1);
g_mutex_init(pcap_src->cap_pipe_read_mtx);
pcap_src->cap_pipe_pending_q = g_async_queue_new();
pcap_src->cap_pipe_done_q = g_async_queue_new();

4
epan/tvbparse.c
View File

@ -908,7 +908,7 @@ tvbparse_wanted_t* tvbparse_ft(int id,
gint len = ft_lens[ftenum];
if (len >= 0) {
tvbparse_wanted_t* w = g_malloc0(sizeof(tvbparse_wanted_t));
tvbparse_wanted_t* w = g_new0(tvbparse_wanted_t, 1);
w->id = id;
w->condition = cond_ft;
@ -1119,7 +1119,7 @@ tvbparse_wanted_t* tvbparse_ft_numcmp(int id,
int little_endian,
enum ft_cmp_op ft_cmp_op,
... ) {
tvbparse_wanted_t* w = g_malloc0(sizeof(tvbparse_wanted_t));
tvbparse_wanted_t* w = g_new0(tvbparse_wanted_t, 1);
va_list ap;
va_start(ap,ft_cmp_op);

2
tshark.c
View File

@ -2393,7 +2393,7 @@ pipe_input_set_handler(gint source, gpointer user_data, ws_process_id *child_pro
pipe_input.input_cb = input_cb;
#ifdef _WIN32
pipe_input.callback_running = g_malloc(sizeof(GMutex));
pipe_input.callback_running = g_new(GMutex, 1);
g_mutex_init(pipe_input.callback_running);
/* Tricky to use pipes in win9x, as no concept of wait. NT can
do this but that doesn't cover all win32 platforms. GTK can do

22
ui/voip_calls.c
View File

@ -816,7 +816,7 @@ rtp_packet_draw(void *tap_offset_ptr)
/* add the RTP item to the graph if was not there*/
if (rtp_listinfo->start_fd->num<gai->frame_number || !voip_calls_graph_list) {
new_gai = g_malloc0(sizeof(seq_analysis_item_t));
new_gai = g_new0(seq_analysis_item_t, 1);
new_gai->frame_number = rtp_listinfo->start_fd->num;
copy_address(&(new_gai->src_addr),&(rtp_listinfo->src_addr));
copy_address(&(new_gai->dst_addr),&(rtp_listinfo->dst_addr));
@ -1144,7 +1144,7 @@ sip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt ,
callsinfo->start_fd=pinfo->fd;
callsinfo->start_rel_ts=pinfo->rel_ts;
callsinfo->protocol=VOIP_SIP;
callsinfo->prot_info=g_malloc(sizeof(sip_calls_info_t));
callsinfo->prot_info=g_new(sip_calls_info_t, 1);
callsinfo->free_prot_info = free_sip_info;
callsinfo->call_id = g_strdup(pi->tap_call_id);
tmp_sipinfo = (sip_calls_info_t *)callsinfo->prot_info;
@ -1382,7 +1382,7 @@ isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
callsinfo->protocol = VOIP_ISUP;
callsinfo->from_identity = g_strdup(pi->calling_number);
callsinfo->to_identity = g_strdup(pi->called_number);
callsinfo->prot_info = g_malloc(sizeof(isup_calls_info_t));
callsinfo->prot_info = g_new(isup_calls_info_t, 1);
callsinfo->free_prot_info = g_free;
tmp_isupinfo = (isup_calls_info_t *)callsinfo->prot_info;
tmp_isupinfo->opc = tapinfo->mtp3_opc;
@ -1798,7 +1798,7 @@ q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
callsinfo->start_fd=pinfo->fd;
callsinfo->start_rel_ts=pinfo->rel_ts;
callsinfo->protocol=VOIP_AC_ISDN;
callsinfo->prot_info=g_malloc(sizeof(actrace_isdn_calls_info_t));
callsinfo->prot_info=g_new(actrace_isdn_calls_info_t, 1);
callsinfo->free_prot_info = g_free;
tmp_actrace_isdn_info=(actrace_isdn_calls_info_t *)callsinfo->prot_info;
tmp_actrace_isdn_info->crv=tapinfo->q931_crv;
@ -2016,7 +2016,7 @@ h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
callsinfo->start_fd=pinfo->fd;
callsinfo->start_rel_ts=pinfo->rel_ts;
callsinfo->protocol=VOIP_H323;
callsinfo->prot_info=g_malloc(sizeof(h323_calls_info_t));
callsinfo->prot_info=g_new(h323_calls_info_t, 1);
callsinfo->free_prot_info = free_h225_info;
tmp_h323info = (h323_calls_info_t *)callsinfo->prot_info;
@ -2664,7 +2664,7 @@ mgcp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt,
callsinfo->start_fd=pinfo->fd;
callsinfo->start_rel_ts=pinfo->rel_ts;
callsinfo->protocol=VOIP_MGCP;
callsinfo->prot_info=g_malloc(sizeof(mgcp_calls_info_t));
callsinfo->prot_info=g_new(mgcp_calls_info_t, 1);
callsinfo->free_prot_info = g_free;
tmp_mgcpinfo=(mgcp_calls_info_t *)callsinfo->prot_info;
tmp_mgcpinfo->endpointId = g_strdup(pi->endpointId);
@ -2872,7 +2872,7 @@ actrace_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *e
callsinfo->start_fd=pinfo->fd;
callsinfo->start_rel_ts=pinfo->rel_ts;
callsinfo->protocol=VOIP_AC_CAS;
callsinfo->prot_info=g_malloc(sizeof(actrace_cas_calls_info_t));
callsinfo->prot_info=g_new(actrace_cas_calls_info_t, 1);
callsinfo->free_prot_info = g_free;
tmp_actrace_cas_info=(actrace_cas_calls_info_t *)callsinfo->prot_info;
@ -3418,7 +3418,7 @@ unistim_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *e
callsinfo->start_rel_ts=pinfo->rel_ts;
callsinfo->protocol=VOIP_UNISTIM;
callsinfo->prot_info=g_malloc(sizeof(unistim_info_t));
callsinfo->prot_info=g_new(unistim_info_t, 1);
tmp_unistim_info = (unistim_info_t *)callsinfo->prot_info;
@ -3673,7 +3673,7 @@ unistim_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *e
callsinfo->start_rel_ts=pinfo->rel_ts;
callsinfo->protocol=VOIP_UNISTIM;
callsinfo->prot_info=g_malloc(sizeof(unistim_info_t));
callsinfo->prot_info=g_new(unistim_info_t, 1);
tmp_unistim_info = (unistim_info_t *)callsinfo->prot_info;
@ -3899,7 +3899,7 @@ skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed
/* callsinfo->from_identity = g_strdup_printf("%s : %.8x", "Skinny", 1); */
callsinfo->from_identity = g_strdup("");
callsinfo->to_identity = g_strdup("");
callsinfo->prot_info = g_malloc(sizeof(skinny_calls_info_t));
callsinfo->prot_info = g_new(skinny_calls_info_t, 1);
callsinfo->free_prot_info = g_free;
tmp_skinnyinfo = (skinny_calls_info_t *)callsinfo->prot_info;
tmp_skinnyinfo->callId = si->callId ? si->callId : si->passThroughPartyId;
@ -4052,7 +4052,7 @@ iax2_calls_packet( void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt
callsinfo = g_new0(voip_calls_info_t, 1);
callsinfo->call_state = VOIP_NO_STATE;
callsinfo->call_active_state = VOIP_ACTIVE;
callsinfo->prot_info=g_malloc(sizeof(iax2_info_t));
callsinfo->prot_info=g_new(iax2_info_t, 1);
callsinfo->free_prot_info = free_iax2_info;
tmp_iax2info = (iax2_info_t *)callsinfo->prot_info;

2
wiretap/camins.c
View File

@ -429,7 +429,7 @@ wtap_open_return_val camins_open(wtap *wth, int *err, gchar **err_info _U_)
/* wth->priv stores a pointer to the global time counter. we update
it as we go through the file sequentially. */
wth->priv = g_malloc0(sizeof(guint64));
wth->priv = g_new0(guint64, 1);
wth->subtype_read = camins_read;
wth->subtype_seek_read = camins_seek_read;