diff options
author | Guy Harris <guy@alum.mit.edu> | 2015-01-18 13:02:15 -0800 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2015-01-18 21:02:40 +0000 |
commit | 050bc7d100e9846663ac2c14eadde15e9cd9fdb9 (patch) | |
tree | 29b58df68f42d396d1507e89df1e9d8631713368 /epan/dissectors/packet-dcm.c | |
parent | 929d41c6856139168c441a14498210d31574de97 (diff) |
Update some comments to reflect reality.
Get rid of references to ep_ and se_ allocation in code that now uses
wmem allocation instead.
Fix API documentation of conversation_table.h routines to reflect that
as well - some APIs changed to pass wmem scopes.
Also, zbee_sec_key_hash() now takes the output buffer as an argument and
just returns it, and nobody actually uses the return value, so change it
to return void.
Change-Id: Ife1ec675a9322fd0f0be306a9d639ec17aad1c7a
Reviewed-on: https://code.wireshark.org/review/6636
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-dcm.c')
-rw-r--r-- | epan/dissectors/packet-dcm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index fa57050e7e..3b69ed6759 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -36,6 +36,10 @@ * - Read private tags from configuration and parse in capture * - dissect_dcm_heuristic() to return proper data type * + * September 2013 - Pascal Quantin + * + * - Replace all ep_ and se_ allocation with wmem_ allocations + * * February 2013 - Stefan Allers * * - Support for dissection of Extended Negotiation (Query/Retrieve @@ -6099,7 +6103,7 @@ dissect_dcm_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_sequence = FALSE; /* True for Sequence Tags */ gboolean is_item = FALSE; /* True for Sequence Item Tags */ - *tag_description = NULL; /* Reset description. It's ep_ memory, so not really bad*/ + *tag_description = NULL; /* Reset description. It's wmem packet scope memory, so not really bad*/ tag_value = (gchar *)wmem_alloc0(wmem_packet_scope(), MAX_BUF_LEN); @@ -6351,7 +6355,7 @@ dissect_dcm_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean local_end_of_seq_or_item = FALSE; gboolean is_first_desc = TRUE; - const gchar *item_description = NULL; /* Will be allocated as ep_ memory in dissect_dcm_tag() */ + const gchar *item_description = NULL; /* Will be allocated as wmem packet scope memory in dissect_dcm_tag() */ if (vl == 0xFFFFFFFF) { /* Undefined length */ |