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-smpp.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-smpp.c')
| -rw-r--r-- | epan/dissectors/packet-smpp.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index 3f68f04df2..e30f1e02d7 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -1111,8 +1111,7 @@ smpp_handle_string(proto_tree *tree, tvbuff_t *tvb, int field, int *offset) len = tvb_strsize(tvb, *offset); if (len > 1) { - proto_tree_add_string(tree, field, tvb, *offset, len, - (const char *) tvb_get_ptr(tvb, *offset, len)); + proto_tree_add_item(tree, field, tvb, *offset, len, ENC_NA); } (*offset) += len; } @@ -1143,8 +1142,7 @@ smpp_handle_string_z(proto_tree *tree, tvbuff_t *tvb, int field, int *offset, len = tvb_strsize(tvb, *offset); if (len > 1) { - proto_tree_add_string(tree, field, tvb, *offset, len, - (const char *)tvb_get_ptr(tvb, *offset, len)); + proto_tree_add_item(tree, field, tvb, *offset, len, ENC_NA); } else { proto_tree_add_string(tree, field, tvb, *offset, len, null_string); } @@ -1321,9 +1319,9 @@ smpp_handle_tlv(proto_tree *tree, tvbuff_t *tvb, int *offset) proto_item_add_subtree(sub_tree, ett_opt_param); proto_tree_add_uint(sub_tree,hf_smpp_opt_param_tag,tvb,*offset,2,tag); proto_tree_add_uint(sub_tree,hf_smpp_opt_param_len,tvb,*offset+2,2,length); - + *offset += 4; - + switch (tag) { case 0x0005: /* dest_addr_subunit */ smpp_handle_int1(sub_tree, tvb, @@ -3536,6 +3534,6 @@ proto_reg_handoff_smpp(void) /* Tapping setup */ stats_tree_register_with_group("smpp","smpp_commands", "SM_PP Operations", 0, - smpp_stats_tree_per_packet, smpp_stats_tree_init, + smpp_stats_tree_per_packet, smpp_stats_tree_init, NULL, REGISTER_STAT_GROUP_TELEPHONY); } |