diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/circuit.c | 6 | ||||
| -rw-r--r-- | epan/conversation.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-camel.c | 4 | ||||
| -rw-r--r-- | epan/h225-persistentdata.c | 6 | ||||
| -rw-r--r-- | epan/stream.c | 14 |
5 files changed, 18 insertions, 18 deletions
diff --git a/epan/circuit.c b/epan/circuit.c index 0991c8ea98..80b73f791c 100644 --- a/epan/circuit.c +++ b/epan/circuit.c @@ -113,11 +113,11 @@ circuit_new(circuit_type ctype, guint32 circuit_id, guint32 first_frame) circuit_t *circuit, *old_circuit; circuit_key *new_key; - new_key = se_new(struct circuit_key); + new_key = wmem_new(wmem_file_scope(), struct circuit_key); new_key->ctype = ctype; new_key->circuit_id = circuit_id; - circuit = se_new(circuit_t); + circuit = wmem_new(wmem_file_scope(), circuit_t); circuit->next = NULL; circuit->first_frame = first_frame; circuit->last_frame = 0; /* not known yet */ @@ -225,7 +225,7 @@ p_compare(gconstpointer a, gconstpointer b) void circuit_add_proto_data(circuit_t *conv, int proto, void *proto_data) { - circuit_proto_data *p1 = se_new(circuit_proto_data); + circuit_proto_data *p1 = wmem_new(wmem_file_scope(), circuit_proto_data); p1->proto = proto; p1->proto_data = proto_data; diff --git a/epan/conversation.c b/epan/conversation.c index 89df1cea63..d7f1b80015 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -695,7 +695,7 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address } } - new_key = se_new(struct conversation_key); + new_key = wmem_new(wmem_file_scope(), struct conversation_key); new_key->next = conversation_keys; conversation_keys = new_key; SE_COPY_ADDRESS(&new_key->addr1, addr1); @@ -704,7 +704,7 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address new_key->port1 = port1; new_key->port2 = port2; - conversation = se_new(conversation_t); + conversation = wmem_new(wmem_file_scope(), conversation_t); memset(conversation, 0, sizeof(conversation_t)); conversation->index = new_index; @@ -1229,7 +1229,7 @@ p_compare(gconstpointer a, gconstpointer b) void conversation_add_proto_data(conversation_t *conv, const int proto, void *proto_data) { - conv_proto_data *p1 = se_new(conv_proto_data); + conv_proto_data *p1 = wmem_new(wmem_file_scope(), conv_proto_data); p1->proto = proto; p1->proto_data = proto_data; diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c index 7add7c4e76..21442f257f 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -7319,9 +7319,9 @@ new_camelsrt_call(struct camelsrt_call_info_key_t *p_camelsrt_call_key) with the tcap transaction Id as main Key Once created, this entry will be updated later */ - p_new_camelsrt_call_key = se_new(struct camelsrt_call_info_key_t); + p_new_camelsrt_call_key = wmem_new(wmem_file_scope(), struct camelsrt_call_info_key_t); p_new_camelsrt_call_key->SessionIdKey = p_camelsrt_call_key->SessionIdKey; - p_new_camelsrt_call = se_new(struct camelsrt_call_t); + p_new_camelsrt_call = wmem_new(wmem_file_scope(), struct camelsrt_call_t); raz_camelsrt_call(p_new_camelsrt_call); p_new_camelsrt_call->session_id = camelsrt_global_SessionId++; #ifdef DEBUG_CAMELSRT diff --git a/epan/h225-persistentdata.c b/epan/h225-persistentdata.c index 590c041614..f08fabdb20 100644 --- a/epan/h225-persistentdata.c +++ b/epan/h225-persistentdata.c @@ -81,10 +81,10 @@ h225ras_call_t * new_h225ras_call(h225ras_call_info_key *h225ras_call_key, packe frame numbers are 1-origin, so we use 0 to mean "we don't yet know in which frame the reply for this call appears". */ - new_h225ras_call_key = se_new(h225ras_call_info_key); + new_h225ras_call_key = wmem_new(wmem_file_scope(), h225ras_call_info_key); new_h225ras_call_key->reqSeqNum = h225ras_call_key->reqSeqNum; new_h225ras_call_key->conversation = h225ras_call_key->conversation; - h225ras_call = se_new(h225ras_call_t); + h225ras_call = wmem_new(wmem_file_scope(), h225ras_call_t); h225ras_call->req_num = pinfo->fd->num; h225ras_call->rsp_num = 0; h225ras_call->requestSeqNum = h225ras_call_key->reqSeqNum; @@ -107,7 +107,7 @@ h225ras_call_t * append_h225ras_call(h225ras_call_t *prev_call, packet_info *pin frame numbers are 1-origin, so we use 0 to mean "we don't yet know in which frame the reply for this call appears". */ - h225ras_call = se_new(h225ras_call_t); + h225ras_call = wmem_new(wmem_file_scope(), h225ras_call_t); h225ras_call->req_num = pinfo->fd->num; h225ras_call->rsp_num = 0; h225ras_call->requestSeqNum = prev_call->requestSeqNum; diff --git a/epan/stream.c b/epan/stream.c index 7bf3e3fb48..eca4f917d1 100644 --- a/epan/stream.c +++ b/epan/stream.c @@ -155,7 +155,7 @@ static stream_t *new_stream( stream_key_t *key ) { stream_t *val; - val = se_new(stream_t); + val = wmem_new(wmem_file_scope(), stream_t); val -> key = key; val -> pdu_counter = 0; val -> current_pdu = NULL; @@ -172,7 +172,7 @@ static stream_t *stream_hash_insert_circ( const struct circuit *circuit, int p2p { stream_key_t *key; - key = se_new(stream_key_t); + key = wmem_new(wmem_file_scope(), stream_key_t); key->is_circuit = TRUE; key->circ.circuit = circuit; key->p2p_dir = p2p_dir; @@ -184,7 +184,7 @@ static stream_t *stream_hash_insert_conv( const struct conversation *conv, int p { stream_key_t *key; - key = se_new(stream_key_t); + key = wmem_new(wmem_file_scope(), stream_key_t); key->is_circuit = FALSE; key->circ.conv = conv; key->p2p_dir = p2p_dir; @@ -215,7 +215,7 @@ static void stream_init_pdu_data(void) static stream_pdu_t *stream_new_pdu(stream_t *stream) { stream_pdu_t *pdu; - pdu = se_new(stream_pdu_t); + pdu = wmem_new(wmem_file_scope(), stream_pdu_t); pdu -> fd_head = NULL; pdu -> pdu_number = stream -> pdu_counter++; pdu -> id = pdu_counter++; @@ -295,12 +295,12 @@ static stream_pdu_fragment_t *fragment_hash_insert( const stream_t *stream, guin fragment_key_t *key; stream_pdu_fragment_t *val; - key = se_new(fragment_key_t); + key = wmem_new(wmem_file_scope(), fragment_key_t); key->stream = stream; key->framenum = framenum; key->offset = offset; - val = se_new(stream_pdu_fragment_t); + val = wmem_new(wmem_file_scope(), stream_pdu_fragment_t); val->len = length; val->pdu = NULL; val->final_fragment = FALSE; @@ -360,7 +360,7 @@ stream_t *find_stream_conv ( const struct conversation *conv, int p2p_dir ) /* cleanup the stream routines */ /* Note: stream_cleanup must only be called when seasonal memory * is also freed since the hash tables countain pointers to - * se_alloc'd memory. + * wmem_file_scoped memory. */ void stream_cleanup( void ) { |