diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-22 15:50:55 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-09-22 15:50:55 +0000 |
| commit | a0c53ffaa1bb46d8c9db2ec739401aa411c9790e (patch) | |
| tree | 56a11c9e0910032ad43476462dd2c95ed65e5cc1 /epan/dissectors/packet-dec-dnart.c | |
| parent | c4a608a94071f4a23eaf16fd3ab9545e26309f76 (diff) | |
emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly
svn path=/trunk/; revision=52172
Diffstat (limited to 'epan/dissectors/packet-dec-dnart.c')
| -rw-r--r-- | epan/dissectors/packet-dec-dnart.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index a793019ce8..3e4ef23a30 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -462,7 +462,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 3; ti = proto_tree_add_item(rt_tree, hf_dec_rt_dst_addr, tvb, offset, 6, ENC_NA); - addr = dnet_ntoa((const guint8 *)ep_tvb_memdup(tvb, offset, 6)); + addr = dnet_ntoa((const guint8 *)tvb_memdup(wmem_packet_scope(), tvb, offset, 6)); if (addr != NULL) { proto_item_append_text(ti, " (%s)", addr); } @@ -473,7 +473,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset += 8; ti = proto_tree_add_item(rt_tree, hf_dec_rt_src_addr, tvb, offset, 6, ENC_NA); - addr = dnet_ntoa((const guint8 *)ep_tvb_memdup(tvb, offset, 6)); + addr = dnet_ntoa((const guint8 *)tvb_memdup(wmem_packet_scope(), tvb, offset, 6)); if (addr != NULL) { proto_item_append_text(ti, " (%s)", addr); } @@ -720,7 +720,7 @@ do_hello_msg( my_offset +=3; ti = proto_tree_add_item(tree, hf_dec_rt_id, tvb, my_offset, 6, ENC_NA); - addr = dnet_ntoa((const guint8 *)ep_tvb_memdup(tvb, my_offset, 6)); + addr = dnet_ntoa((const guint8 *)tvb_memdup(wmem_packet_scope(), tvb, my_offset, 6)); if (addr != NULL) { proto_item_append_text(ti, " (%s)", addr); } @@ -764,7 +764,7 @@ do_hello_msg( my_offset += 8; ti = proto_tree_add_item(tree, hf_dec_rt_neighbor, tvb, my_offset, 6, ENC_NA); - addr = dnet_ntoa((const guint8 *)ep_tvb_memdup(tvb, my_offset, 6)); + addr = dnet_ntoa((const guint8 *)tvb_memdup(wmem_packet_scope(), tvb, my_offset, 6)); if (addr != NULL) { proto_item_append_text(ti, " (%s)", addr); } @@ -813,7 +813,7 @@ do_hello_msg( ti_localb = proto_tree_add_item(list_ether, hf_dec_rt_router_id, tvb, my_offset, 6, ENC_NA); - addr = dnet_ntoa((const guint8 *)ep_tvb_memdup(tvb, my_offset, 6)); + addr = dnet_ntoa((const guint8 *)tvb_memdup(wmem_packet_scope(), tvb, my_offset, 6)); if (addr != NULL) { proto_item_append_text(ti_localb, " (%s)", addr); } |