diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-16 20:51:21 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2011-01-16 20:51:21 +0000 |
| commit | 8d32d2066a22a6e3b3970961af9fb9a2a64c2ae6 (patch) | |
| tree | 420d5401a47ed145c8aba98c7891e5f098f86e19 /epan/dissectors/packet-trmac.c | |
| parent | c04dd5fda9af1d2fdac3eb2d16b7e6de757558a9 (diff) | |
There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().
Replace some tvb_get_ptr()s with tvb_get_ephemeral_string() or
tvb_get_const_stringz().
Use tvb_memeql() & tvb_memcmp().
svn path=/trunk/; revision=35558
Diffstat (limited to 'epan/dissectors/packet-trmac.c')
| -rw-r--r-- | epan/dissectors/packet-trmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index 9ad5ca6f6e..a2ccd2cfc3 100644 --- a/epan/dissectors/packet-trmac.c +++ b/epan/dissectors/packet-trmac.c @@ -241,7 +241,7 @@ sv_text(tvbuff_t *tvb, int svoff, proto_tree *tree) break; case 0x2D: /* Isolating Error Counts */ - memcpy(errors, tvb_get_ptr(tvb, svoff+2, 6), 6); + tvb_memcpy(tvb, errors, svoff+2, 6); ti = proto_tree_add_uint(tree, hf_trmac_errors_iso, tvb, svoff+1, sv_length-1, errors[0] + errors[1] + errors[2] + errors[3] + errors[4]); sv_tree = proto_item_add_subtree(ti, ett_tr_ierr_cnt); @@ -255,7 +255,7 @@ sv_text(tvbuff_t *tvb, int svoff, proto_tree *tree) break; case 0x2E: /* Non-Isolating Error Counts */ - memcpy(errors, tvb_get_ptr(tvb, svoff+2, 6), 6); + tvb_memcpy(tvb, errors, svoff+2, 6); ti = proto_tree_add_uint(tree, hf_trmac_errors_noniso, tvb, svoff+1, sv_length-1, errors[0] + errors[1] + errors[2] + errors[3] + errors[4]); sv_tree = proto_item_add_subtree(ti, ett_tr_nerr_cnt); |