diff options
author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-08-05 23:58:58 +0000 |
---|---|---|
committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-08-05 23:58:58 +0000 |
commit | fda2349eb97dcdf2f201b4afb6b38b36e2f85eb7 (patch) | |
tree | cb3c54c2b0f0cac5cf1c2e1cb602d09ad46ec3d1 /epan/follow.c | |
parent | 00a37ae5682151028abffad0540a98826b8d1683 (diff) |
replace malloc and alike calls by their GLib pendants -> g_malloc
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15232 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/follow.c')
-rw-r--r-- | epan/follow.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/follow.c b/epan/follow.c index 19e14303b2..429e077338 100644 --- a/epan/follow.c +++ b/epan/follow.c @@ -257,8 +257,8 @@ reassemble_tcp( gulong sequence, gulong length, const char* data, else { /* out of order packet */ if(data_length > 0 && sequence > seq[src_index] ) { - tmp_frag = (tcp_frag *)malloc( sizeof( tcp_frag ) ); - tmp_frag->data = (guchar *)malloc( data_length ); + tmp_frag = (tcp_frag *)g_malloc( sizeof( tcp_frag ) ); + tmp_frag->data = (guchar *)g_malloc( data_length ); tmp_frag->seq = sequence; tmp_frag->len = length; tmp_frag->data_len = data_length; @@ -293,8 +293,8 @@ check_fragments( int index, tcp_stream_chunk *sc ) { } else { frags[index] = current->next; } - free( current->data ); - free( current ); + g_free( current->data ); + g_free( current ); return 1; } prev = current; @@ -319,8 +319,8 @@ reset_tcp_reassembly() { current = frags[i]; while( current ) { next = current->next; - free( current->data ); - free( current ); + g_free( current->data ); + g_free( current ); current = next; } frags[i] = NULL; |