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-ar_drone.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-ar_drone.c')
| -rw-r--r-- | epan/dissectors/packet-ar_drone.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ar_drone.c b/epan/dissectors/packet-ar_drone.c index 13492b2133..8c788b56d8 100644 --- a/epan/dissectors/packet-ar_drone.c +++ b/epan/dissectors/packet-ar_drone.c @@ -129,7 +129,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data return 0; /* Make sure the packet we're dissecting is a ar_drone packet */ - if(strcmp(tvb_get_ephemeral_string(tvb,0,3),"AT*")) + if(strcmp(tvb_get_string(wmem_packet_scope(),tvb,0,3),"AT*")) return 0; col_set_str(pinfo->cinfo, COL_PROTOCOL, "ar_drone"); @@ -146,9 +146,9 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data if (offset < master_offset) return master_offset; - command = tvb_get_ephemeral_string(tvb, master_offset, offset-master_offset); + command = tvb_get_string(wmem_packet_scope(), tvb, master_offset, offset-master_offset); sub_item = proto_tree_add_string(ar_tree, hf_command, tvb, master_offset, -1, - tvb_get_ephemeral_string(tvb, master_offset+3, offset-master_offset-3)); + tvb_get_string(wmem_packet_scope(), tvb, master_offset+3, offset-master_offset-3)); if(!strncmp(command,"AT*PCMD",7)) { @@ -541,7 +541,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data } ti = proto_tree_add_item(sub_tree, hf_CTRL_mode, tvb, offset, length, ENC_ASCII|ENC_NA); proto_item_append_text(ti, "%s", - str_to_str(tvb_get_ephemeral_string(tvb, offset, length), CTRL_mode_vs, " (Unknown Mode)")); + str_to_str(tvb_get_string(wmem_packet_scope(), tvb, offset, length), CTRL_mode_vs, " (Unknown Mode)")); offset += (length + 1); /* Add File Size */ |