diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-02-11 02:43:07 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-02-11 02:43:07 +0000 |
| commit | d8659693eff66f7e89c53871776c455cd11b4cae (patch) | |
| tree | add1992656e851b438ee6b2abe2c452a5479b260 /epan/dissectors/packet-dhcpv6.c | |
| parent | 8d03f63e1762609119ce81e55132c0d8c17f3433 (diff) | |
| download | wireshark-d8659693eff66f7e89c53871776c455cd11b4cae.tar.gz | |
Check for places where tvb_bytes_to_str() or tvb_get_bytes_to_str_punct()
should be used (instead of the non-tvb functions with a call to tvb_get_ptr()).
Use those functions in a bunch of places.
svn path=/trunk/; revision=35911
Diffstat (limited to 'epan/dissectors/packet-dhcpv6.c')
| -rw-r--r-- | epan/dissectors/packet-dhcpv6.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index 6e46c03a7c..5cfff0aa68 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -821,7 +821,7 @@ dissect_cablelabs_specific_opts(proto_tree *v_tree, tvbuff_t *tvb, int voff, int opt_len = tlv_len; if (tlv_len == 3) { proto_item_append_text(ti, "%s", - bytes_to_str_punct(tvb_get_ptr(tvb, sub_off, 3), 3, ':')); + tvb_bytes_to_str_punct(tvb, sub_off, 3, ':')); } else if (tlv_len == 6) { proto_item_append_text(ti, "\"%s\"", tvb_format_stringzpad(tvb, sub_off, tlv_len)); } else { @@ -943,8 +943,7 @@ dissect_cablelabs_specific_opts(proto_tree *v_tree, tvbuff_t *tvb, int voff, int } else { /*proto_item_append_text(ti, "CM MAC Address Option = %s", */ - proto_item_append_text(ti, "%s", - bytes_to_str_punct(tvb_get_ptr(tvb, sub_off, opt_len), opt_len, ':')); + proto_item_append_text(ti, "%s", tvb_bytes_to_str_punct(tvb, sub_off, opt_len, ':')); /* tvb_bytes_to_str(tvb, sub_off, opt_len)); */ } sub_off += field_len; |