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-mrcpv2.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-mrcpv2.c')
-rw-r--r-- | epan/dissectors/packet-mrcpv2.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/epan/dissectors/packet-mrcpv2.c b/epan/dissectors/packet-mrcpv2.c index 597ee81f16..dfe9f224eb 100644 --- a/epan/dissectors/packet-mrcpv2.c +++ b/epan/dissectors/packet-mrcpv2.c @@ -458,35 +458,35 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sp_end = tvb_find_guint8(tvb, 0, linelen, ' '); if ((sp_end == -1) || (sp_end > tvb_len) || (sp_end > linelen)) return -1; - field1 = tvb_get_ephemeral_string(tvb, 0, sp_end); + field1 = tvb_get_string(wmem_packet_scope(), tvb, 0, sp_end); sp_start = sp_end + 1; /* length */ sp_end = tvb_find_guint8(tvb, sp_start, linelen - sp_start, ' '); if ((sp_end == -1) || (sp_end > tvb_len) || (sp_end > linelen)) return -1; - field2 = tvb_get_ephemeral_string(tvb, sp_start, sp_end - sp_start); + field2 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start); sp_start = sp_end + 1; /* method, request ID or event */ sp_end = tvb_find_guint8(tvb, sp_start, linelen - sp_start, ' '); if ((sp_end == -1) || (sp_end > tvb_len) || (sp_end > linelen)) return -1; - field3 = tvb_get_ephemeral_string(tvb, sp_start, sp_end - sp_start); + field3 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start); sp_start = sp_end + 1; /* request ID or status code */ sp_end = tvb_find_guint8(tvb, sp_start, linelen - sp_start, ' '); if (sp_end == -1) { - field4 = tvb_get_ephemeral_string(tvb, sp_start, linelen - sp_start); + field4 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, linelen - sp_start); line_type = REQUEST_LINE; /* only request line has 4 parameters */ } else { if ((sp_end > tvb_len) || (sp_end > linelen)) return -1; - field4 = tvb_get_ephemeral_string(tvb, sp_start, sp_end - sp_start); + field4 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start); if (isdigit(field3[0])) /* request ID is number, so it has to be response */ line_type = RESPONSE_LINE; @@ -497,7 +497,7 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sp_end = linelen; if ((sp_end > tvb_len) || (sp_end > linelen)) return -1; - field5 = tvb_get_ephemeral_string(tvb, sp_start, sp_end - sp_start); + field5 = tvb_get_string(wmem_packet_scope(), tvb, sp_start, sp_end - sp_start); } /* check pdu size */ @@ -626,10 +626,10 @@ dissect_mrcpv2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(mrcpv2_tree, hf_mrcpv2_Unknown_Header, tvb, offset, linelen, ENC_UTF_8); continue; } - header_name = tvb_get_ephemeral_string(tvb, offset, colon_offset - offset); + header_name = tvb_get_string(wmem_packet_scope(), tvb, offset, colon_offset - offset); ascii_strdown_inplace(header_name); value_offset = tvb_skip_wsp(tvb, colon_offset + 1, offset + linelen - (colon_offset + 1)); - header_value = tvb_get_ephemeral_string(tvb, value_offset, offset + linelen - value_offset); + header_value = tvb_get_string(wmem_packet_scope(), tvb, value_offset, offset + linelen - value_offset); /* find out header type */ header_type = UNKNOWN; @@ -949,9 +949,9 @@ get_mrcpv2_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) /* second string is message length */ len_end = tvb_find_guint8(tvb, len_start, MRCPV2_MIN_PDU_LEN - len_start, ' '); if (len_end == -1) - msg_len = tvb_get_ephemeral_string(tvb, len_start, MRCPV2_MIN_PDU_LEN - len_start); + msg_len = tvb_get_string(wmem_packet_scope(), tvb, len_start, MRCPV2_MIN_PDU_LEN - len_start); else - msg_len = tvb_get_ephemeral_string(tvb, len_start, len_end - len_start); + msg_len = tvb_get_string(wmem_packet_scope(), tvb, len_start, len_end - len_start); num_msg_len = atoi(msg_len); return num_msg_len; @@ -984,7 +984,7 @@ dissect_mrcpv2_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da slash_offset = tvb_find_guint8(tvb, 0, MRCPV2_MIN_LENGTH, '/'); if (slash_offset != 4) return 0; - version = tvb_get_ephemeral_string(tvb, 0, slash_offset); + version = tvb_get_string(wmem_packet_scope(), tvb, 0, slash_offset); if (strcmp(version, "MRCP") != 0) return 0; @@ -995,7 +995,7 @@ dissect_mrcpv2_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da value_size = dot_offset - slash_offset - 1; if ((value_size != 1) && (value_size != 2)) return 0; - major = tvb_get_ephemeral_string(tvb, slash_offset + 1, dot_offset - 1); + major = tvb_get_string(wmem_packet_scope(), tvb, slash_offset + 1, dot_offset - 1); value = atoi(major); if (value != 2) return 0; @@ -1004,12 +1004,12 @@ dissect_mrcpv2_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da sp_offset = tvb_find_guint8(tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - dot_offset - 1, ' '); if (sp_offset == -1) { - minor = tvb_get_ephemeral_string(tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - dot_offset - 1); + minor = tvb_get_string(wmem_packet_scope(), tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - dot_offset - 1); len = MRCPV2_MIN_LENGTH; } else { - minor = tvb_get_ephemeral_string(tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - sp_offset - 1); + minor = tvb_get_string(wmem_packet_scope(), tvb, dot_offset + 1, MRCPV2_MIN_LENGTH - sp_offset - 1); len = sp_offset; } value = atoi(minor); |