(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

15 files changed, 60 insertions, 58 deletions

diff --git a/epan/dissectors/packet-aim-admin.c b/epan/dissectors/packet-aim-admin.c
index 0b5b225532..85d5668446 100644
--- a/epan/dissectors/packet-aim-admin.c
+++ b/epan/dissectors/packet-aim-admin.c
@@ -70,19 +70,19 @@ static int dissect_aim_admin_accnt_info_repl(tvbuff_t *tvb, packet_info *pinfo,
 {
 	int offset = 0;
 	proto_tree_add_uint(admin_tree, hf_admin_acctinfo_permissions, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2;
-	return dissect_aim_tlv_list(tvb, pinfo, offset, admin_tree, client_tlvs);
+	return dissect_aim_tlv_list(tvb, pinfo, offset, admin_tree, aim_client_tlvs);
 }
 
 static int dissect_aim_admin_info_change_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *admin_tree)
 {
-	return dissect_aim_tlv_sequence(tvb, pinfo, 0, admin_tree, client_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, 0, admin_tree, aim_client_tlvs);
 }
 
 static int dissect_aim_admin_cfrm_repl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *admin_tree)
 {
 	int offset = 0;
 	proto_tree_add_uint(admin_tree, hf_admin_confirm_status, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); offset+=2;
-	return dissect_aim_tlv_sequence(tvb, pinfo, offset, admin_tree, client_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, offset, admin_tree, aim_client_tlvs);
 }
 
 static const aim_subtype aim_fnac_family_admin[] = {
diff --git a/epan/dissectors/packet-aim-bos.c b/epan/dissectors/packet-aim-bos.c
index 82c9ba6b0e..418b76fdc0 100644
--- a/epan/dissectors/packet-aim-bos.c
+++ b/epan/dissectors/packet-aim-bos.c
@@ -57,7 +57,7 @@
 #define AIM_PRIVACY_TLV_MAX_VISIB_LIST_SIZE		0x001
 #define AIM_PRIVACY_TLV_MAX_INVISIB_LIST_SIZE	0x002
 
-static const aim_tlv privacy_tlvs[] = {
+static const aim_tlv aim_privacy_tlvs[] = {
 	{ AIM_PRIVACY_TLV_MAX_VISIB_LIST_SIZE, "Max visible list size", dissect_aim_tlv_value_uint16 },
 	{ AIM_PRIVACY_TLV_MAX_INVISIB_LIST_SIZE, "Max invisible list size", dissect_aim_tlv_value_uint16 },
 	{ 0, NULL, NULL },
@@ -81,7 +81,7 @@ static int dissect_aim_bos_set_group_perm(tvbuff_t *tvb, packet_info *pinfo _U_,
 
 static int dissect_aim_bos_rights(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bos_tree) 
 {
-	return dissect_aim_tlv_sequence(tvb, pinfo, 0, bos_tree, privacy_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, 0, bos_tree, aim_privacy_tlvs);
 }
 
 static int dissect_aim_bos_buddyname(tvbuff_t *tvb, packet_info *pinfo, proto_tree *bos_tree) 
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[] = {
diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index 446cf2640c..c64c5b683b 100644
--- a/epan/dissectors/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.c
@@ -53,7 +53,8 @@
 #define AIM_CHAT_TLV_CONTAINS_USER_CLASS	0x066
 #define AIM_CHAT_TLV_CONTAINS_USER_ARRAY	0x067
 
-static const aim_tlv chat_tlvs[] _U_ = {
+#if 0
+static const aim_tlv aim_chat_tlvs[] _U_ = {
 	{ AIM_CHAT_TLV_BROWSABLE_TREE, "Browsable tree", dissect_aim_tlv_value_bytes },
 	{ AIM_CHAT_TLV_CLASS_EXCLUSIVE, "Exclusively for class", dissect_aim_tlv_value_userclass },
 	{ AIM_CHAT_TLV_MAX_CONCURRENT_ROOMS, "Max. number of concurrent rooms", dissect_aim_tlv_value_uint8 },
@@ -65,6 +66,7 @@ static const aim_tlv chat_tlvs[] _U_ = {
 	{ AIM_CHAT_TLV_CONTAINS_USER_ARRAY, "Contains User Array", dissect_aim_tlv_value_bytes },
 	{ 0, NULL, NULL }
 };
+#endif
 
 /* Initialize the protocol and registered fields */
 static int proto_aim_chat = -1;
diff --git a/epan/dissectors/packet-aim-directory.c b/epan/dissectors/packet-aim-directory.c
index ce453600d3..0e88ffe01d 100644
--- a/epan/dissectors/packet-aim-directory.c
+++ b/epan/dissectors/packet-aim-directory.c
@@ -46,7 +46,7 @@ static int dissect_aim_directory_user_repl(tvbuff_t *tvb, packet_info *pinfo, pr
 {
 	int offset = 0;
 	while (tvb_length_remaining(tvb, offset) > 0) {
-		offset = dissect_aim_tlv(tvb, pinfo, offset, tree, client_tlvs);
+		offset = dissect_aim_tlv(tvb, pinfo, offset, tree, aim_client_tlvs);
 	}
 	return offset;
 }
diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c
index 94fc20e776..29cbcb8db1 100644
--- a/epan/dissectors/packet-aim-generic.c
+++ b/epan/dissectors/packet-aim-generic.c
@@ -270,7 +270,7 @@ static int dissect_aim_generic_service_req(tvbuff_t *tvb, packet_info *pinfo _U_
 
 static int dissect_aim_generic_redirect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gen_tree)
 {
-	return dissect_aim_tlv_sequence(tvb, pinfo, 0, gen_tree, client_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, 0, gen_tree, aim_client_tlvs);
 }
 
 static int dissect_aim_generic_capabilities(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gen_tree)
@@ -309,7 +309,7 @@ static int dissect_aim_generic_motd(tvbuff_t *tvb, packet_info *pinfo, proto_tre
 	proto_tree_add_item(gen_tree, hf_generic_motd_motdtype, tvb, offset, 
 						2, tvb_get_ntohs(tvb, offset));
 	offset+=2;
-	return dissect_aim_tlv_sequence(tvb, pinfo, offset, gen_tree, motd_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, offset, gen_tree, aim_motd_tlvs);
 }
 
 static int dissect_aim_generic_rateinfoack(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gen_tree)
@@ -362,7 +362,7 @@ static int dissect_aim_generic_migration_req(tvbuff_t *tvb, packet_info *pinfo,
 		offset += 2;
 	}
 
-	return dissect_aim_tlv_sequence(tvb, pinfo, offset, gen_tree, client_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, offset, gen_tree, aim_client_tlvs);
 }
 
 static int dissect_aim_generic_setprivflags(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gen_tree)
@@ -382,7 +382,7 @@ static int dissect_aim_generic_selfinfo_repl(tvbuff_t *tvb, packet_info *pinfo,
 	int offset = dissect_aim_buddyname(tvb, pinfo, 0, gen_tree);
 	proto_tree_add_item(gen_tree, hf_generic_selfinfo_warninglevel, tvb, offset, 2, FALSE);
 	offset += 2;
-	return dissect_aim_tlv_list(tvb, pinfo, offset, gen_tree, onlinebuddy_tlvs);
+	return dissect_aim_tlv_list(tvb, pinfo, offset, gen_tree, aim_onlinebuddy_tlvs);
 }
 
 static int dissect_aim_generic_evil(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gen_tree)
@@ -403,7 +403,7 @@ static int dissect_aim_generic_setidle(tvbuff_t *tvb, packet_info *pinfo _U_, pr
 
 static int dissect_aim_generic_ext_status_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *gen_tree)
 {
-	return dissect_aim_tlv_sequence(tvb, pinfo, 0, gen_tree, onlinebuddy_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, 0, gen_tree, aim_onlinebuddy_tlvs);
 }
 
 static int dissect_aim_generic_clientver_req(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *gen_tree)
diff --git a/epan/dissectors/packet-aim-invitation.c b/epan/dissectors/packet-aim-invitation.c
index 58463537c4..1481053677 100644
--- a/epan/dissectors/packet-aim-invitation.c
+++ b/epan/dissectors/packet-aim-invitation.c
@@ -46,7 +46,7 @@ static int ett_aim_invitation = -1;
 
 static int dissect_aim_invitation_req(tvbuff_t *tvb, packet_info *pinfo, proto_tree *invite_tree)
 {
-	return dissect_aim_tlv_sequence(tvb, pinfo, 0, invite_tree, onlinebuddy_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, 0, invite_tree, aim_onlinebuddy_tlvs);
 }
 
 static const aim_subtype aim_fnac_family_invitation[] = {
diff --git a/epan/dissectors/packet-aim-location.c b/epan/dissectors/packet-aim-location.c
index c22b298188..d3e1ed4e2f 100644
--- a/epan/dissectors/packet-aim-location.c
+++ b/epan/dissectors/packet-aim-location.c
@@ -44,7 +44,7 @@
 #define AIM_LOCATION_RIGHTS_TLV_MAX_PROFILE_LENGTH 	0x0001
 #define AIM_LOCATION_RIGHTS_TLV_MAX_CAPABILITIES 	0x0002
 
-static const aim_tlv location_rights_tlvs[] = {
+static const aim_tlv aim_location_rights_tlvs[] = {
   { AIM_LOCATION_RIGHTS_TLV_MAX_PROFILE_LENGTH, "Max Profile Length", dissect_aim_tlv_value_uint16 },
   { AIM_LOCATION_RIGHTS_TLV_MAX_CAPABILITIES, "Max capabilities", dissect_aim_tlv_value_uint16 },
   { 0, NULL, NULL }
@@ -61,7 +61,7 @@ static const aim_tlv location_rights_tlvs[] = {
 #define AIM_LOCATE_TAG_TLV_HTML_INFO_TYPE		0x000D
 #define AIM_LOCATE_TAG_TLV_HTML_INFO_DATA		0x000E
 
-static const aim_tlv locate_tags_tlvs[] = {
+static const aim_tlv aim_locate_tags_tlvs[] = {
 	{ AIM_LOCATE_TAG_TLV_SIG_TYPE, "Signature MIME Type", dissect_aim_tlv_value_string },
 	{ AIM_LOCATE_TAG_TLV_SIG_DATA, "Signature Data", dissect_aim_tlv_value_string },
 	{ AIM_LOCATE_TAG_TLV_UNAVAILABLE_TYPE, "Away Message MIME Type", dissect_aim_tlv_value_string },
@@ -98,12 +98,12 @@ static gint ett_aim_location    = -1;
 
 static int dissect_aim_location_rightsinfo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *loc_tree)
 {
-	return dissect_aim_tlv_sequence(tvb, pinfo, 0, loc_tree, location_rights_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, 0, loc_tree, aim_location_rights_tlvs);
 }
 
 static int dissect_aim_location_setuserinfo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *loc_tree)
 {
-	return dissect_aim_tlv_sequence(tvb, pinfo, 0, loc_tree, locate_tags_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, 0, loc_tree, aim_locate_tags_tlvs);
 }
 
 static int dissect_aim_location_watcher_notification(tvbuff_t *tvb, packet_info *pinfo, proto_tree *loc_tree)
@@ -164,9 +164,9 @@ static int dissect_aim_snac_location_user_information(tvbuff_t *tvb,
 	proto_tree_add_item(tree, hf_aim_userinfo_warninglevel, tvb, offset, 2, FALSE);
 	offset += 2;
 
-	offset = dissect_aim_tlv_list(tvb, pinfo, offset, tree, onlinebuddy_tlvs);
+	offset = dissect_aim_tlv_list(tvb, pinfo, offset, tree, aim_onlinebuddy_tlvs);
 
-	return dissect_aim_tlv_sequence(tvb, pinfo, offset, tree, locate_tags_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, offset, tree, aim_locate_tags_tlvs);
 }
 
 static const aim_subtype aim_fnac_family_location[] = {
diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c
index 8de4815bb5..b7b293e934 100644
--- a/epan/dissectors/packet-aim-messaging.c
+++ b/epan/dissectors/packet-aim-messaging.c
@@ -51,7 +51,7 @@
 #define INCOMING_CH1_BUDDY_REQ         0x0009
 #define INCOMING_CH1_TYPING            0x000b
 
-static const aim_tlv messaging_incoming_ch1_tlvs[] = {
+static const aim_tlv aim_messaging_incoming_ch1_tlvs[] = {
   { INCOMING_CH1_MESSAGE_BLOCK, "Message Block", dissect_aim_tlv_value_messageblock },
   { INCOMING_CH1_SERVER_ACK_REQ, "Server Ack Requested", dissect_aim_tlv_value_bytes },
   { INCOMING_CH1_MESSAGE_AUTH_RESP, "Message is Auto Response", dissect_aim_tlv_value_bytes },
@@ -77,7 +77,7 @@ static const value_string icbm_channel_types[] = {
 #define INCOMING_CH2_SERVER_ACK_REQ    	   0x0003
 #define INCOMING_CH2_RENDEZVOUS_DATA       0x0005
 
-static const aim_tlv messaging_incoming_ch2_tlvs[] = {
+static const aim_tlv aim_messaging_incoming_ch2_tlvs[] = {
   { INCOMING_CH2_SERVER_ACK_REQ, "Server Ack Requested", dissect_aim_tlv_value_bytes },
   { INCOMING_CH2_RENDEZVOUS_DATA, "Rendez Vous Data", dissect_aim_tlv_value_rendezvous },
   { 0, NULL, NULL },
@@ -110,7 +110,7 @@ static const aim_tlv messaging_incoming_ch2_tlvs[] = {
 #define RENDEZVOUS_TLV_EXTENDED_DATA			0x2711
 #define RENDEZVOUS_TLV_ICHAT_INVITEES_DATA		0x277E
 
-static const aim_tlv rendezvous_tlvs[] = {
+static const aim_tlv aim_rendezvous_tlvs[] = {
 	{ RENDEZVOUS_TLV_CHANNEL, "Rendezvous ICBM Channel", dissect_aim_tlv_value_uint16 },
 	{ RENDEZVOUS_TLV_IP_ADDR, "Rendezvous IP", dissect_aim_tlv_value_ipv4 },
 	{ RENDEZVOUS_TLV_INT_IP, "Internal IP", dissect_aim_tlv_value_ipv4 },
@@ -312,14 +312,14 @@ dissect_aim_tlv_value_rendezvous(proto_item *ti, guint16 valueid _U_, tvbuff_t *
 	offset = dissect_aim_capability(entry, tvb, offset);
 
 	return dissect_aim_tlv_sequence(tvb, pinfo, offset, entry,
-							rendezvous_tlvs);
+							aim_rendezvous_tlvs);
 }
 
 static int
 dissect_aim_msg_outgoing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree)
 {
 	int offset = 0;
-	const aim_tlv *ch_tlvs = NULL;
+	const aim_tlv *aim_ch_tlvs = NULL;
 	guint16 channel_id;
 	guchar buddyname[MAX_BUDDYNAME_LENGTH+1];
 	int buddyname_length;
@@ -343,12 +343,12 @@ dissect_aim_msg_outgoing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree
 	offset = dissect_aim_buddyname(tvb, pinfo, offset, msg_tree);
 
 	switch(channel_id) {
-	case ICBM_CHANNEL_IM: ch_tlvs = messaging_incoming_ch1_tlvs; break;
-	case ICBM_CHANNEL_RENDEZVOUS: ch_tlvs = messaging_incoming_ch2_tlvs; break;
+	case ICBM_CHANNEL_IM: aim_ch_tlvs = aim_messaging_incoming_ch1_tlvs; break;
+	case ICBM_CHANNEL_RENDEZVOUS: aim_ch_tlvs = aim_messaging_incoming_ch2_tlvs; break;
 	default: return offset;
 	}
 
-	return dissect_aim_tlv_sequence(tvb, pinfo, offset, msg_tree, ch_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, offset, msg_tree, aim_ch_tlvs);
 }
 
 
@@ -356,7 +356,7 @@ static int
 dissect_aim_msg_incoming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree)
 {
 	int offset = 0;
-	const aim_tlv *ch_tlvs;
+	const aim_tlv *aim_ch_tlvs;
 	guint16 channel_id;
 
 	/* ICBM Cookie */
@@ -372,12 +372,12 @@ dissect_aim_msg_incoming(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree
 	offset = dissect_aim_userinfo(tvb, pinfo, offset, msg_tree);
 
 	switch(channel_id) {
-	case ICBM_CHANNEL_IM: ch_tlvs = messaging_incoming_ch1_tlvs; break;
-	case ICBM_CHANNEL_RENDEZVOUS: ch_tlvs = messaging_incoming_ch2_tlvs; break;
+	case ICBM_CHANNEL_IM: aim_ch_tlvs = aim_messaging_incoming_ch1_tlvs; break;
+	case ICBM_CHANNEL_RENDEZVOUS: aim_ch_tlvs = aim_messaging_incoming_ch2_tlvs; break;
 	default: return offset;
 	}
 
-	return dissect_aim_tlv_sequence(tvb, pinfo, offset, msg_tree, ch_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, offset, msg_tree, aim_ch_tlvs);
 }
 
 static int
diff --git a/epan/dissectors/packet-aim-popup.c b/epan/dissectors/packet-aim-popup.c
index 38acf2b891..d00fc677b7 100644
--- a/epan/dissectors/packet-aim-popup.c
+++ b/epan/dissectors/packet-aim-popup.c
@@ -47,7 +47,7 @@
 #define AIM_POPUP_TLV_WINDOW_HEIGHT		0x004
 #define AIM_POPUP_TLV_AUTOHIDE_DELAY	0x005
 
-const aim_tlv popup_tlvs[] = {
+static const aim_tlv aim_popup_tlvs[] = {
 	{ AIM_POPUP_TLV_MESSAGE_TEXT, "Message text (html)", dissect_aim_tlv_value_string },
 	{ AIM_POPUP_TLV_URL_STRING, "URL string", dissect_aim_tlv_value_string },
 	{ AIM_POPUP_TLV_WINDOW_WIDTH, "Window Width (pixels)", dissect_aim_tlv_value_uint16 },
@@ -64,7 +64,7 @@ static gint ett_aim_popup    = -1;
 
 static int dissect_aim_popup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *popup_tree)
 {
-	return dissect_aim_tlv(tvb, pinfo, 0, popup_tree, popup_tlvs);
+	return dissect_aim_tlv(tvb, pinfo, 0, popup_tree, aim_popup_tlvs);
 }
 
 static const aim_subtype aim_fnac_family_popup[] = {
diff --git a/epan/dissectors/packet-aim-signon.c b/epan/dissectors/packet-aim-signon.c
index 9d4b0f324d..f15139101b 100644
--- a/epan/dissectors/packet-aim-signon.c
+++ b/epan/dissectors/packet-aim-signon.c
@@ -56,7 +56,7 @@ static int dissect_aim_snac_signon_logon(tvbuff_t *tvb, packet_info *pinfo,
 {
 	int offset = 0;
 	while (tvb_length_remaining(tvb, offset) > 0) {
-		offset = dissect_aim_tlv(tvb, pinfo, offset, tree, client_tlvs);
+		offset = dissect_aim_tlv(tvb, pinfo, offset, tree, aim_client_tlvs);
 	}
 	return offset;
 }
@@ -67,7 +67,7 @@ static int dissect_aim_snac_signon_logon_reply(tvbuff_t *tvb,
 {
 	int offset = 0;
 	while (tvb_length_remaining(tvb, offset) > 0) {
-		offset = dissect_aim_tlv(tvb, pinfo, offset, tree, client_tlvs);
+		offset = dissect_aim_tlv(tvb, pinfo, offset, tree, aim_client_tlvs);
 	}
 	return offset;
 }
@@ -125,14 +125,14 @@ static int dissect_aim_tlv_value_registration(proto_item *ti _U_, guint16 value_
 
 #define REG_TLV_REGISTRATION_INFO 	0x0001
 
-static const aim_tlv registration_tlvs[] = {
+static const aim_tlv aim_registration_tlvs[] = {
 	{ REG_TLV_REGISTRATION_INFO, "Registration Info", dissect_aim_tlv_value_registration },
 	{ 0, NULL, NULL },
 };
 
 static int dissect_aim_snac_register (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	return dissect_aim_tlv(tvb, pinfo, 0, tree, registration_tlvs);
+	return dissect_aim_tlv(tvb, pinfo, 0, tree, aim_registration_tlvs);
 }
 
 static const aim_subtype aim_fnac_family_signon[] = {
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)
diff --git a/epan/dissectors/packet-aim-userlookup.c b/epan/dissectors/packet-aim-userlookup.c
index 0230231a73..0466b3b1d5 100644
--- a/epan/dissectors/packet-aim-userlookup.c
+++ b/epan/dissectors/packet-aim-userlookup.c
@@ -55,7 +55,7 @@ static int dissect_aim_userlookup_search(tvbuff_t *tvb, packet_info *pinfo _U_,
 
 static int dissect_aim_userlookup_result(tvbuff_t *tvb, packet_info *pinfo, proto_tree *lookup_tree)
 {
-	return dissect_aim_tlv_sequence(tvb, pinfo, 0, lookup_tree, client_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, 0, lookup_tree, aim_client_tlvs);
 }
 
 static const aim_subtype aim_fnac_family_userlookup[] = {
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index 715db6ae20..90140b4d0f 100644
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -171,7 +171,7 @@ static const value_string aim_snac_errors[] = {
 #define AIM_CLIENT_TLV_LOCAL_PERSONAL_SOUND    0x013e
 #define AIM_CLIENT_TLV_FIRST_MESSAGE_SENT      0x0145
 
-const aim_tlv client_tlvs[] = {
+const aim_tlv aim_client_tlvs[] = {
 	{ AIM_CLIENT_TLV_SCREEN_NAME, "Screen name", dissect_aim_tlv_value_string },
 	{ AIM_CLIENT_TLV_NEW_ROASTED_PASSWORD, "Roasted password array", dissect_aim_tlv_value_bytes  },
 	{ AIM_CLIENT_TLV_OLD_ROASTED_PASSWORD, "Old roasted password array", dissect_aim_tlv_value_bytes  },
@@ -252,7 +252,7 @@ static int dissect_aim_tlv_value_client_short_capabilities(proto_item *ti, guint
 #define AIM_ONLINEBUDDY_AWAYTIME       0x0027
 #define AIM_ONLINEBUDDY_GEOCOUNTRY     0x002a
 
-const aim_tlv onlinebuddy_tlvs[] = {
+const aim_tlv aim_onlinebuddy_tlvs[] = {
 	{ AIM_ONLINEBUDDY_USERCLASS, "User class", dissect_aim_tlv_value_userclass },
 	{ AIM_ONLINEBUDDY_ONSINCE, "Online since", dissect_aim_tlv_value_uint32 },
 	{ AIM_ONLINEBUDDY_IDLETIME, "Idle time (sec)", dissect_aim_tlv_value_uint16 },
@@ -311,7 +311,7 @@ static GList *families = NULL;
 
 #define AIM_MOTD_TLV_MOTD					   0x000B
 
-const aim_tlv motd_tlvs[] = {
+const aim_tlv aim_motd_tlvs[] = {
 	{ AIM_MOTD_TLV_MOTD, "Message of the day message", dissect_aim_tlv_value_string },
 	{ 0, NULL, NULL }
 };
@@ -342,7 +342,7 @@ const aim_tlv motd_tlvs[] = {
 
 #define FNAC_TLV_FAMILY_VERSION  0x0001
 
-static const aim_tlv fnac_tlvs[] = {
+static const aim_tlv aim_fnac_tlvs[] = {
 	{ FNAC_TLV_FAMILY_VERSION, "SNAC Family Version", dissect_aim_tlv_value_uint16 },
 	{ 0, NULL, NULL }
 };
@@ -613,7 +613,7 @@ dissect_aim_newconn(tvbuff_t *tvb, packet_info *pinfo, int offset,
 	if (tvb_length_remaining(tvb, offset) > 0) {
 		proto_tree_add_item(tree, hf_aim_version, tvb, offset, 4, FALSE);
 		offset+=4;
-		offset = dissect_aim_tlv_sequence(tvb, pinfo, offset, tree, client_tlvs);
+		offset = dissect_aim_tlv_sequence(tvb, pinfo, offset, tree, aim_client_tlvs);
 	}
 
 	if (tvb_length_remaining(tvb, offset) > 0)
@@ -632,7 +632,7 @@ dissect_aim_snac_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aim_tree)
 
 	proto_tree_add_item (aim_tree, hf_aim_snac_error, tvb, 0, 2, FALSE);
 
-	return dissect_aim_tlv_sequence(tvb, pinfo, 2, aim_tree, client_tlvs);
+	return dissect_aim_tlv_sequence(tvb, pinfo, 2, aim_tree, aim_client_tlvs);
 }
 
 int
@@ -658,7 +658,7 @@ dissect_aim_userinfo(tvbuff_t *tvb, packet_info *pinfo,
 	proto_tree_add_item(tree, hf_aim_userinfo_warninglevel, tvb, offset, 2, FALSE);
 	offset += 2;
 
-	return dissect_aim_tlv_list(tvb, pinfo, offset, tree, onlinebuddy_tlvs);
+	return dissect_aim_tlv_list(tvb, pinfo, offset, tree, aim_onlinebuddy_tlvs);
 }
 
 static int
@@ -741,7 +741,7 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset,
 		oldoffset = offset;
 
 		while(offset < oldoffset + len) {
-			offset = dissect_aim_tlv(tvb, pinfo, offset, aim_tree, fnac_tlvs);
+			offset = dissect_aim_tlv(tvb, pinfo, offset, aim_tree, aim_fnac_tlvs);
 		}
 	}
 
@@ -814,7 +814,7 @@ dissect_aim_close_conn(tvbuff_t *tvb, packet_info *pinfo, int offset,
 {
 	col_set_str(pinfo->cinfo, COL_INFO, "Close Connection");
 
-	offset = dissect_aim_tlv_sequence(tvb, pinfo, offset, tree, client_tlvs);
+	offset = dissect_aim_tlv_sequence(tvb, pinfo, offset, tree, aim_client_tlvs);
 }
 
 static void
diff --git a/epan/dissectors/packet-aim.h b/epan/dissectors/packet-aim.h
index 2872cad493..acbda6a7fa 100644
--- a/epan/dissectors/packet-aim.h
+++ b/epan/dissectors/packet-aim.h
@@ -1,4 +1,4 @@
-/* packet-tcp.h
+/* packet-aim.h
  * Copyright 2004, Jelmer Vernooij <jelmer@samba.org>
  *
  * $Id$
@@ -89,8 +89,8 @@ int dissect_aim_userclass(tvbuff_t *tvb, int offset, int len, proto_item *ti, gu
 int dissect_aim_tlv_value_userclass(proto_item *ti, guint16, tvbuff_t *, packet_info *);
 int dissect_aim_tlv_value_messageblock (proto_item *ti, guint16 valueid _U_, tvbuff_t *tvb, packet_info *);
 
-extern const aim_tlv client_tlvs[];
-extern const aim_tlv onlinebuddy_tlvs[];
-extern const aim_tlv motd_tlvs[];
+extern const aim_tlv aim_client_tlvs[];
+extern const aim_tlv aim_onlinebuddy_tlvs[];
+extern const aim_tlv aim_motd_tlvs[];
 
 #endif