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-adwin-config.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-adwin-config.c')
| -rw-r--r-- | epan/dissectors/packet-adwin-config.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-adwin-config.c b/epan/dissectors/packet-adwin-config.c index 8db659ff55..7309b7cc0b 100644 --- a/epan/dissectors/packet-adwin-config.c +++ b/epan/dissectors/packet-adwin-config.c @@ -218,13 +218,13 @@ dissect_UDPExtStatus(tvbuff_t *tvb, proto_tree *adwin_tree) /* add the processor type raw values to the tree, to allow filtering */ ADWIN_ADD_LE(adwin_tree, processor_type, 64, 2); /* add the processor type as a pretty printed string */ - processor_type = tvb_get_ephemeral_string(tvb, 64, 2); + processor_type = tvb_get_string(wmem_packet_scope(), tvb, 64, 2); processor_type = str_to_str(processor_type, processor_type_mapping, "Unknown (%s)"); proto_tree_add_text(adwin_tree, tvb, 64, 2, "Processor Type: %s", processor_type); /* add system type as raw value and pretty printed string */ ADWIN_ADD_LE(adwin_tree, system_type, 66, 2); - system_type = tvb_get_ephemeral_string(tvb, 66, 2); + system_type = tvb_get_string(wmem_packet_scope(), tvb, 66, 2); system_type = str_to_str(system_type, system_type_mapping, "Unknown (%s)"); proto_tree_add_text(adwin_tree, tvb, 66, 2, "System Type: %s", system_type); @@ -261,13 +261,13 @@ dissect_UDPMessage(tvbuff_t *tvb, proto_tree *adwin_tree) /* add the processor type raw values to the tree, to allow filtering */ ADWIN_ADD_LE(adwin_tree, processor_type, 96, 2); /* add the processor type as a pretty printed string */ - processor_type = tvb_get_ephemeral_string(tvb, 96, 2); + processor_type = tvb_get_string(wmem_packet_scope(), tvb, 96, 2); processor_type = str_to_str(processor_type, processor_type_mapping, "Unknown"); proto_tree_add_text(adwin_tree, tvb, 96, 2, "Processor Type: %s", processor_type); /* add system type as raw value and pretty printed string */ ADWIN_ADD_LE(adwin_tree, system_type, 98, 2); - system_type = tvb_get_ephemeral_string(tvb, 98, 2); + system_type = tvb_get_string(wmem_packet_scope(), tvb, 98, 2); system_type = str_to_str(system_type, system_type_mapping, "Unknown"); proto_tree_add_text(adwin_tree, tvb, 98, 2, "System Type: %s", system_type); } @@ -341,7 +341,7 @@ dissect_TCPFlashUpdate(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *adwin ADWIN_ADD_BE(adwin_tree, stream_length, 0, 4); offset = 4; length = tvb_strnlen(tvb, offset, -1) + 1; - filename = tvb_get_ephemeral_string(tvb, offset, length); + filename = tvb_get_string(wmem_packet_scope(), tvb, offset, length); if (strncmp(filename, "eeprom_on", length) == 0) { proto_tree_add_text(adwin_tree, tvb, offset, length, "Enable EEPROM Support"); |