aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-aim-buddylist.c
diff options
context:
space:
mode:
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2010-10-07 21:23:36 +0000
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>2010-10-07 21:23:36 +0000
commit8687bf4b347a7e7f3590d6a181874380386e7b19 (patch)
tree45866e49bb715c6c9869ea14e5da0710e1c55215 /epan/dissectors/packet-aim-buddylist.c
parent94556c2afbcb9a3c6a6f8d3e0229c9db887f8a05 (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. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34412 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-aim-buddylist.c')
-rw-r--r--epan/dissectors/packet-aim-buddylist.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c
index eb5f0667c2..86f97cb1c9 100644
--- a/epan/dissectors/packet-aim-buddylist.c
+++ b/epan/dissectors/packet-aim-buddylist.c
@@ -44,7 +44,7 @@
#define AIM_BUDDYLIST_TLV_MAX_WATCHER_ENTRIES 0x0002
#define AIM_BUDDYLIST_TLV_MAX_ONLINE_NOTIFICATIONS 0x0003
-const aim_tlv buddylist_tlvs[] = {
+static const aim_tlv aim_buddylist_tlvs[] = {
{ AIM_BUDDYLIST_TLV_MAX_CONTACT_ENTRIES, "Max number of contact list entries", dissect_aim_tlv_value_uint16 },
{ AIM_BUDDYLIST_TLV_MAX_WATCHER_ENTRIES, "Max number of watcher list entries", dissect_aim_tlv_value_uint16 },
{ AIM_BUDDYLIST_TLV_MAX_ONLINE_NOTIFICATIONS, "Max online notifications", dissect_aim_tlv_value_uint16 },
@@ -70,7 +70,7 @@ static int dissect_aim_buddylist_buddylist(tvbuff_t *tvb, packet_info *pinfo, pr
static int dissect_aim_buddylist_rights_repl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *buddy_tree)
{
- return dissect_aim_tlv_sequence(tvb, pinfo, 0, buddy_tree, buddylist_tlvs);
+ return dissect_aim_tlv_sequence(tvb, pinfo, 0, buddy_tree, aim_buddylist_tlvs);
}
static int dissect_aim_buddylist_reject(tvbuff_t *tvb, packet_info *pinfo, proto_tree *buddy_tree)
@@ -95,7 +95,7 @@ static int dissect_aim_buddylist_oncoming(tvbuff_t *tvb, packet_info *pinfo, pro
2, FALSE);
offset += 2;
- offset = dissect_aim_tlv_list(tvb, pinfo, offset, buddy_tree, onlinebuddy_tlvs);
+ offset = dissect_aim_tlv_list(tvb, pinfo, offset, buddy_tree, aim_onlinebuddy_tlvs);
return offset;
}
@@ -118,7 +118,7 @@ static int dissect_aim_buddylist_offgoing(tvbuff_t *tvb, packet_info *pinfo, pro
2, FALSE);
offset += 2;
- return dissect_aim_tlv_list(tvb, pinfo, offset, buddy_tree, onlinebuddy_tlvs);
+ return dissect_aim_tlv_list(tvb, pinfo, offset, buddy_tree, aim_onlinebuddy_tlvs);
}
static const aim_subtype aim_fnac_family_buddylist[] = {