diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-01-07 10:11:22 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-01-07 18:16:23 +0000 |
| commit | 64a7bac641d82aafaa0b65555008df647224ce00 (patch) | |
| tree | c1616eb10be7ec2938246773c4296f9ebd31c54e /asn1 | |
| parent | 98d3b1494bdc10d9e9cf3ab59bf5efa2e7c04b68 (diff) | |
tvb_bytes_to_ep_str -> tvb_bytes_to_str
Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4
Reviewed-on: https://code.wireshark.org/review/6371
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/ansi_tcap/ansi_tcap.cnf | 4 | ||||
| -rw-r--r-- | asn1/c1222/packet-c1222-template.c | 2 | ||||
| -rw-r--r-- | asn1/h248/h248.cnf | 2 | ||||
| -rw-r--r-- | asn1/t38/t38.cnf | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/asn1/ansi_tcap/ansi_tcap.cnf b/asn1/ansi_tcap/ansi_tcap.cnf index 8c34bd64b6..4291b60104 100644 --- a/asn1/ansi_tcap/ansi_tcap.cnf +++ b/asn1/ansi_tcap/ansi_tcap.cnf @@ -168,9 +168,9 @@ if(next_tvb) { * in the 8 octets case. */ if (len > 4){ - ansi_tcap_private.TransactionID_str = tvb_bytes_to_ep_str(next_tvb, 4,len-4); + ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(wmem_packet_scope(), next_tvb, 4,len-4); }else{ - ansi_tcap_private.TransactionID_str = tvb_bytes_to_ep_str(next_tvb, 0,len); + ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(wmem_packet_scope(), next_tvb, 0,len); } } switch(len) { diff --git a/asn1/c1222/packet-c1222-template.c b/asn1/c1222/packet-c1222-template.c index 3b7f62edf9..32218e2dad 100644 --- a/asn1/c1222/packet-c1222-template.c +++ b/asn1/c1222/packet-c1222-template.c @@ -441,7 +441,7 @@ parse_c1222_detailed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int cm proto_tree_add_uint(tree, hf_c1222_auth_len, tvb, *offset, 1, auth_len); *offset += 1; if (*length >= auth_len) { - auth_req = tvb_bytes_to_ep_str(tvb, *offset, auth_len); + auth_req = tvb_bytes_to_str(wmem_packet_scope(), tvb, *offset, auth_len); proto_tree_add_item(tree, hf_c1222_auth_data, tvb, *offset, auth_len, ENC_NA); *offset += auth_len; *length -= auth_len + 1; diff --git a/asn1/h248/h248.cnf b/asn1/h248/h248.cnf index 018807d8ce..b69de9f854 100644 --- a/asn1/h248/h248.cnf +++ b/asn1/h248/h248.cnf @@ -406,7 +406,7 @@ AuditReplyV1/auditResult audit_result /* not ascii or NULL character so do string as hex string */ proto_tree_add_text(tree, tvb, offset, len,"%s: 0x%s", (proto_registrar_get_nth(hf_index))->name, - tvb_bytes_to_ep_str(tvb, 0, len)); + tvb_bytes_to_str(wmem_packet_scope(), tvb, 0, len)); return len; }; }; diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index 3a0ab1f7f8..3a769e1aa2 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -158,11 +158,11 @@ VAL_PTR=&Data_Field_field_type_value if (primary_part){ if(value_len < 8){ col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s]", - tvb_bytes_to_ep_str(value_tvb,0,value_len)); + tvb_bytes_to_str(wmem_packet_scope(), value_tvb,0,value_len)); } else { col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s...]", - tvb_bytes_to_ep_str(value_tvb,0,7)); + tvb_bytes_to_str(wmem_packet_scope(), value_tvb,0,7)); } } |