svn path=/trunk/; revision=48272

30 files changed, 89 insertions, 9 deletions

diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c
index 2d589afb81..62833393da 100644
--- a/epan/dissectors/packet-9p.c
+++ b/epan/dissectors/packet-9p.c
@@ -37,8 +37,8 @@
 #define NINEPORT 564
 
 /* Forward declarations */
-void proto_register_9p(void);
-void proto_reg_handoff_9p(void);
+void proto_register_9P(void);
+void proto_reg_handoff_9P(void);
 
 /*Message types for 9P */
 /*See man 5 intro on Plan 9 - or;
diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c
index 57b46c3f58..975cde551a 100644
--- a/epan/dissectors/packet-acap.c
+++ b/epan/dissectors/packet-acap.c
@@ -33,8 +33,8 @@
 #include <epan/strutil.h>
 
 /* Forward declarations */
-void proto_register_aacp(void);
-void proto_reg_handoff_aacp(void);
+void proto_register_acap(void);
+void proto_reg_handoff_acap(void);
 
 static int proto_acap = -1;
 static int hf_acap_response = -1;
diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c
index 49f351be94..7de74ef404 100644
--- a/epan/dissectors/packet-agentx.c
+++ b/epan/dissectors/packet-agentx.c
@@ -34,6 +34,7 @@
 
 static guint global_agentx_tcp_port = 705;
 
+void proto_register_agentx(void);
 void proto_reg_handoff_agentx(void);
 
 
diff --git a/epan/dissectors/packet-aim-admin.c b/epan/dissectors/packet-aim-admin.c
index 85d5279f98..5006c009cf 100644
--- a/epan/dissectors/packet-aim-admin.c
+++ b/epan/dissectors/packet-aim-admin.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_admin(void);
+void proto_reg_handoff_aim_admin(void);
+
 #define FAMILY_ADMIN      0x0007
 
 #define CONFIRM_STATUS_EMAIL_SENT 		 0x00
diff --git a/epan/dissectors/packet-aim-adverts.c b/epan/dissectors/packet-aim-adverts.c
index 2fd3c71a8f..b254d93f32 100644
--- a/epan/dissectors/packet-aim-adverts.c
+++ b/epan/dissectors/packet-aim-adverts.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_adverts(void);
+void proto_reg_handoff_aim_adverts(void);
+
 #define FAMILY_ADVERTS    0x0005
 
 static const aim_subtype aim_fnac_family_adverts[] = {
diff --git a/epan/dissectors/packet-aim-bos.c b/epan/dissectors/packet-aim-bos.c
index 66aa3ebd3c..41ef68d952 100644
--- a/epan/dissectors/packet-aim-bos.c
+++ b/epan/dissectors/packet-aim-bos.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_bos(void);
+void proto_reg_handoff_aim_bos(void);
+
 #define FAMILY_BOS        0x0009
 
 /* Family BOS (Misc) */
diff --git a/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c
index b482ea576d..fbb5d36298 100644
--- a/epan/dissectors/packet-aim-buddylist.c
+++ b/epan/dissectors/packet-aim-buddylist.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_buddylist(void);
+void proto_reg_handoff_aim_buddylist(void);
+
 #define FAMILY_BUDDYLIST  0x0003
 
 
diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index dc0914ac7f..cf6801f2eb 100644
--- a/epan/dissectors/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.c
@@ -35,6 +35,9 @@
 #include "packet-tcp.h"
 #include "packet-aim.h"
 
+void proto_register_aim_chat(void);
+void proto_reg_handoff_aim_chat(void);
+
 /* SNAC families */
 #define FAMILY_CHAT       0x000E
 
diff --git a/epan/dissectors/packet-aim-chatnav.c b/epan/dissectors/packet-aim-chatnav.c
index 590e73c193..ef837b56be 100644
--- a/epan/dissectors/packet-aim-chatnav.c
+++ b/epan/dissectors/packet-aim-chatnav.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_chatnav(void);
+void proto_reg_handoff_aim_chatnav(void);
+
 #define FAMILY_CHAT_NAV   0x000D
 
 static const aim_subtype aim_fnac_family_chatnav[] = {
diff --git a/epan/dissectors/packet-aim-directory.c b/epan/dissectors/packet-aim-directory.c
index e168e51cd3..6826e8041e 100644
--- a/epan/dissectors/packet-aim-directory.c
+++ b/epan/dissectors/packet-aim-directory.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_directory(void);
+void proto_reg_handoff_aim_directory(void);
+
 #define FAMILY_DIRECTORY  0x000F
 
 static int proto_aim_directory = -1;
diff --git a/epan/dissectors/packet-aim-email.c b/epan/dissectors/packet-aim-email.c
index 344876436c..bb436564ea 100644
--- a/epan/dissectors/packet-aim-email.c
+++ b/epan/dissectors/packet-aim-email.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_email(void);
+void proto_reg_handoff_aim_email(void);
+
 #define FAMILY_EMAIL    0x0018
 
 static const aim_subtype aim_fnac_family_email[] = {
diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c
index 33a48d9b10..3d1874c24e 100644
--- a/epan/dissectors/packet-aim-generic.c
+++ b/epan/dissectors/packet-aim-generic.c
@@ -31,6 +31,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_generic(void);
+void proto_reg_handoff_aim_generic(void);
+
 #define STRIP_TAGS 1
 
 /* SNAC families */
diff --git a/epan/dissectors/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c
index 5c41a1afb5..f71580c2ea 100644
--- a/epan/dissectors/packet-aim-icq.c
+++ b/epan/dissectors/packet-aim-icq.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_icq(void);
+void proto_reg_handoff_aim_icq(void);
+
 #define FAMILY_ICQ        0x0015
 
 
diff --git a/epan/dissectors/packet-aim-invitation.c b/epan/dissectors/packet-aim-invitation.c
index da63316723..3920cc147c 100644
--- a/epan/dissectors/packet-aim-invitation.c
+++ b/epan/dissectors/packet-aim-invitation.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_invitation(void);
+void proto_reg_handoff_aim_invitation(void);
+
 #define FAMILY_INVITATION 0x0006
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-aim-location.c b/epan/dissectors/packet-aim-location.c
index 0320e3d8fa..227a850551 100644
--- a/epan/dissectors/packet-aim-location.c
+++ b/epan/dissectors/packet-aim-location.c
@@ -33,6 +33,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_location(void);
+void proto_reg_handoff_aim_location(void);
+
 /* SNAC families */
 #define FAMILY_LOCATION   0x0002
 
diff --git a/epan/dissectors/packet-aim-oft.c b/epan/dissectors/packet-aim-oft.c
index d6793bbbfe..25eb364890 100644
--- a/epan/dissectors/packet-aim-oft.c
+++ b/epan/dissectors/packet-aim-oft.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_oft(void);
+void proto_reg_handoff_aim_oft(void);
+
 /* SNAC families */
 #define FAMILY_OFT        0xfffe
 
diff --git a/epan/dissectors/packet-aim-popup.c b/epan/dissectors/packet-aim-popup.c
index 5949c1fa2d..afd4c7058e 100644
--- a/epan/dissectors/packet-aim-popup.c
+++ b/epan/dissectors/packet-aim-popup.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_popup(void);
+void proto_reg_handoff_aim_popup(void);
+
 /* SNAC families */
 #define FAMILY_POPUP      0x0008
 
diff --git a/epan/dissectors/packet-aim-signon.c b/epan/dissectors/packet-aim-signon.c
index 736fa1e6d7..12b989148d 100644
--- a/epan/dissectors/packet-aim-signon.c
+++ b/epan/dissectors/packet-aim-signon.c
@@ -33,6 +33,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_signon(void);
+void proto_reg_handoff_aim_signon(void);
+
 #define FAMILY_SIGNON     0x0017
 
 
diff --git a/epan/dissectors/packet-aim-ssi.c b/epan/dissectors/packet-aim-ssi.c
index 02ad40bce1..437012a2eb 100644
--- a/epan/dissectors/packet-aim-ssi.c
+++ b/epan/dissectors/packet-aim-ssi.c
@@ -33,6 +33,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_ssi(void);
+void proto_reg_handoff_aim_ssi(void);
+
 #define FAMILY_SSI        0x0013
 
 
diff --git a/epan/dissectors/packet-aim-sst.c b/epan/dissectors/packet-aim-sst.c
index de1273f50a..5cfdac7451 100644
--- a/epan/dissectors/packet-aim-sst.c
+++ b/epan/dissectors/packet-aim-sst.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_sst(void);
+void proto_reg_handoff_aim_sst(void);
+
 #define FAMILY_SST    0x0010
 
 
diff --git a/epan/dissectors/packet-aim-stats.c b/epan/dissectors/packet-aim-stats.c
index a9712735d3..4af9946799 100644
--- a/epan/dissectors/packet-aim-stats.c
+++ b/epan/dissectors/packet-aim-stats.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_stats(void);
+void proto_reg_handoff_aim_stats(void);
+
 #define FAMILY_STATS      0x000B
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-aim-translate.c b/epan/dissectors/packet-aim-translate.c
index 4fa2e75757..7956f5b5dd 100644
--- a/epan/dissectors/packet-aim-translate.c
+++ b/epan/dissectors/packet-aim-translate.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_translate(void);
+void proto_reg_handoff_aim_translate(void);
+
 #define FAMILY_TRANSLATE  0x000C
 
 static int proto_aim_translate = -1;
diff --git a/epan/dissectors/packet-aim-userlookup.c b/epan/dissectors/packet-aim-userlookup.c
index c2bf6a1877..f9af86d545 100644
--- a/epan/dissectors/packet-aim-userlookup.c
+++ b/epan/dissectors/packet-aim-userlookup.c
@@ -32,6 +32,9 @@
 
 #include "packet-aim.h"
 
+void proto_register_aim_userlookup(void);
+void proto_reg_handoff_aim_userlookup(void);
+
 #define FAMILY_USERLOOKUP 0x000A
 
 /* Initialize the protocol and registered fields */
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index 0a9037a99b..57b59fb50b 100644
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -41,6 +41,9 @@
 #include "packet-aim.h"
 #include <epan/prefs.h>
 
+void proto_register_aim(void);
+void proto_reg_handoff_aim(void);
+
 #define TCP_PORT_AIM 5190
 
 #define STRIP_TAGS 1
@@ -737,7 +740,7 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset,
 	}
 
 	subtvb = tvb_new_subset_remaining(tvb, offset);
-	aiminfo.tcpinfo = pinfo->private_data;
+	aiminfo.tcpinfo = (struct tcpinfo *)pinfo->private_data;
 	aiminfo.family = family_id;
 	aiminfo.subtype = subtype_id;
 	pd_save = pinfo->private_data;
diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c
index 2006511295..6664807f14 100644
--- a/epan/dissectors/packet-ajp13.c
+++ b/epan/dissectors/packet-ajp13.c
@@ -34,6 +34,8 @@
 #include <epan/conversation.h>
 #include "packet-tcp.h"
 
+void proto_register_ajp13(void);
+void proto_reg_handoff_ajp13(void);
 
 
 /* IMPORTANT IMPLEMENTATION NOTES
diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c
index 32c92adefa..5ce7a9c3dd 100644
--- a/epan/dissectors/packet-alcap.c
+++ b/epan/dissectors/packet-alcap.c
@@ -43,6 +43,9 @@
 #include <epan/dissectors/packet-isup.h>
 #include <epan/expert.h>
 
+void proto_register_alcap(void);
+void proto_reg_handoff_alcap(void);
+
 #define ALCAP_MSG_HEADER_LEN     6
 #define ALCAP_PARM_HEADER_LEN    3
 #define FIELD_NSAP_ADDRESS_LEN  20
diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c
index f6e1aa300f..e60c9bac10 100644
--- a/epan/dissectors/packet-ans.c
+++ b/epan/dissectors/packet-ans.c
@@ -50,6 +50,9 @@
 #include <epan/packet.h>
 #include <etypes.h>
 
+void proto_register_ans(void);
+void proto_reg_handoff_ans(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_ans        = -1;
 
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index edeaf61987..56367b259e 100644
--- a/epan/dissectors/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
@@ -38,6 +38,9 @@
 
 #include "packet-gsm_sms.h"
 
+void proto_register_ansi_637(void);
+void proto_reg_handoff_ansi_637(void);
+
 static const char *ansi_proto_name_tele = "ANSI IS-637-A (SMS) Teleservice Layer";
 static const char *ansi_proto_name_trans = "ANSI IS-637-A (SMS) Transport Layer";
 static const char *ansi_proto_name_short = "IS-637-A";
@@ -2002,7 +2005,7 @@ dissect_ansi_637_trans_param(tvbuff_t *tvb, proto_tree *tree, guint32 *offset)
 	{
             gchar *ansi_637_add_string;
 
-	    ansi_637_add_string = ep_alloc(1024);
+	    ansi_637_add_string = (gchar *)ep_alloc(1024);
 	    ansi_637_add_string[0] = '\0';
 	    (*param_fcn)(tvb, subtree, len, curr_offset, ansi_637_add_string, 1024);
 
diff --git a/epan/dissectors/packet-ansi_801.c b/epan/dissectors/packet-ansi_801.c
index cebd0f011b..b4e696f987 100644
--- a/epan/dissectors/packet-ansi_801.c
+++ b/epan/dissectors/packet-ansi_801.c
@@ -42,6 +42,8 @@
 
 #include <epan/packet.h>
 
+void proto_register_ansi_801(void);
+void proto_reg_handoff_ansi_801(void);
 
 static const char *ansi_proto_name = "ANSI IS-801 (Location Services (PLD))";
 static const char *ansi_proto_name_short = "IS-801";
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index ba654d9c37..9353447b5a 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -50,6 +50,9 @@
 #include "packet-bssap.h"
 #include "packet-ansi_a.h"
 
+void proto_register_ansi_a(void);
+void proto_reg_handoff_ansi_a(void);
+
 /*
  * IOS 4, probably most common
  */
@@ -8318,10 +8321,10 @@ elem_a2p_bearer_format(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
             format_assigned &&
             (first_assigned_found == FALSE))
         {
-            key = (gint *) se_alloc(sizeof(gint));
+            key  = se_new(gint);
             *key = rtp_payload_type;
 
-            encoding_name_and_rate = se_alloc(sizeof(encoding_name_and_rate_t));
+            encoding_name_and_rate = se_new(encoding_name_and_rate_t);
             encoding_name_and_rate->encoding_name = se_strdup(mime_type);
             encoding_name_and_rate->sample_rate = sample_rate;
 
@@ -8338,7 +8341,7 @@ elem_a2p_bearer_format(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree,
             key = (gint *) se_alloc(sizeof(gint));
             *key = rtp_payload_type;
 
-            encoding_name_and_rate = se_alloc(sizeof(encoding_name_and_rate_t));
+            encoding_name_and_rate = se_new(encoding_name_and_rate_t);
             encoding_name_and_rate->encoding_name = se_strdup("telephone-event");
             encoding_name_and_rate->sample_rate = sample_rate;