diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-10-07 21:23:36 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-10-07 21:23:36 +0000 |
| commit | 695aff26f98ad7e0d386b04cfac2177bcdc58e50 (patch) | |
| tree | 45866e49bb715c6c9869ea14e5da0710e1c55215 /epan/dissectors/packet-aim-ssi.c | |
| parent | 54ed1b0bc776a6c9f090749567110592a7fb3082 (diff) | |
(Minor) Rename a few variables in the global namespace to be a bit more unique;
Also: rename additional (static) variables to be consistent with the above renames.
svn path=/trunk/; revision=34412
Diffstat (limited to 'epan/dissectors/packet-aim-ssi.c')
| -rw-r--r-- | epan/dissectors/packet-aim-ssi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-aim-ssi.c b/epan/dissectors/packet-aim-ssi.c index f81e1e65d2..73529e54a7 100644 --- a/epan/dissectors/packet-aim-ssi.c +++ b/epan/dissectors/packet-aim-ssi.c @@ -62,7 +62,7 @@ static const value_string aim_fnac_family_ssi_types[] = { #define SSI_RIGHTSINFO_TLV_MAX_ITEMS 0x0004 -static const aim_tlv ssi_rightsinfo_tlvs[] = { +static const aim_tlv aim_ssi_rightsinfo_tlvs[] = { { SSI_RIGHTSINFO_TLV_MAX_ITEMS, "Maximums For Items", dissect_aim_tlv_value_bytes }, { 0, NULL, NULL }, }; @@ -146,7 +146,7 @@ static int dissect_ssi_item(tvbuff_t *tvb, packet_info *pinfo _U_, int offset, p /* For now, we just dump the TLV contents as-is, since there is not a TLV dissection utility that works based on total chain length */ while(endoffset < offset+tlv_len) { - endoffset = dissect_aim_tlv(tvb, pinfo, endoffset, ssi_entry, client_tlvs); + endoffset = dissect_aim_tlv(tvb, pinfo, endoffset, ssi_entry, aim_client_tlvs); } return endoffset; } @@ -175,7 +175,7 @@ static int dissect_ssi_ssi_items(tvbuff_t *tvb, packet_info *pinfo, proto_tree * static int dissect_aim_ssi_rightsinfo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ssi_tree) { - return dissect_aim_tlv_sequence(tvb, pinfo, 0, ssi_tree, ssi_rightsinfo_tlvs); + return dissect_aim_tlv_sequence(tvb, pinfo, 0, ssi_tree, aim_ssi_rightsinfo_tlvs); } static int dissect_aim_ssi_was_added(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ssi_tree) |