svn path=/trunk/; revision=48440

8 files changed, 62 insertions, 38 deletions

diff --git a/asn1/acp133/packet-acp133-template.c b/asn1/acp133/packet-acp133-template.c
index 18ca3e5a12..67f141ab03 100644
--- a/asn1/acp133/packet-acp133-template.c
+++ b/asn1/acp133/packet-acp133-template.c
@@ -44,6 +44,9 @@
 #define PSNAME "ACP133"
 #define PFNAME "acp133"
 
+void proto_register_acp133(void);
+void proto_reg_handoff_acp133(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_acp133 = -1;
 
diff --git a/asn1/ansi_tcap/packet-ansi_tcap-template.c b/asn1/ansi_tcap/packet-ansi_tcap-template.c
index 2f31674f37..86f07ab0aa 100644
--- a/asn1/ansi_tcap/packet-ansi_tcap-template.c
+++ b/asn1/ansi_tcap/packet-ansi_tcap-template.c
@@ -44,6 +44,8 @@
 #define PSNAME "ANSI_TCAP"
 #define PFNAME "ansi_tcap"
 
+void proto_register_ansi_tcap(void);
+void proto_reg_handoff_ansi_tcap(void);
 
 /* Preferences defaults */
 gint ansi_tcap_response_matching_type = 0;
diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c
index d554320c43..a37ae95e5d 100644
--- a/asn1/cmip/packet-cmip-template.c
+++ b/asn1/cmip/packet-cmip-template.c
@@ -39,6 +39,9 @@
 #define PSNAME "CMIP"
 #define PFNAME "cmip"
 
+void proto_register_cmip(void);
+void proto_reg_handoff_cmip(void);
+
 /* XXX some stuff we need until we can get rid of it */
 #include "packet-ses.h"
 #include "packet-pres.h"
diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c
index 984df58ef3..ca8b6e21c9 100644
--- a/asn1/rrc/packet-rrc-template.c
+++ b/asn1/rrc/packet-rrc-template.c
@@ -85,6 +85,8 @@ enum nas_sys_info_gsm_map {
 static guint32 rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON;
 
 /* Forward declarations */
+void proto_register_rrc(void);
+void proto_reg_handoff_rrc(void);
 static int dissect_UE_RadioAccessCapabilityInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
 static int dissect_SysInfoTypeSB1_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
 static int dissect_SysInfoTypeSB2_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
@@ -164,19 +166,21 @@ static int get_max_counter(int com_context){
 }
 #endif
 /** Utility functions used for various comparisons/cleanups in tree **/
-gint rrc_key_cmp(gconstpointer b_ptr, gconstpointer a_ptr, gpointer ignore _U_){
+static gint rrc_key_cmp(gconstpointer b_ptr, gconstpointer a_ptr, gpointer ignore _U_){
     if( GPOINTER_TO_INT(a_ptr) > GPOINTER_TO_INT(b_ptr) ){
         return  -1;
     }
     return GPOINTER_TO_INT(a_ptr) < GPOINTER_TO_INT(b_ptr);
 }
-void rrc_free_key(gpointer key _U_){
+
+static void rrc_free_key(gpointer key _U_){
             /*Keys should be de allocated elsewhere.*/
 
-    }
-void rrc_free_value(gpointer value ){
+}
+
+static void rrc_free_value(gpointer value ){
             g_free(value);
-    }
+}
 #include "packet-rrc-fn.c"
 
 #include "packet-rrc.h"
@@ -231,7 +235,7 @@ dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
 }
 
-void rrc_init(void){
+static void rrc_init(void){
     /*Cleanup*/
     if(hsdsch_muxed_flows){
         g_tree_destroy(hsdsch_muxed_flows);
diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c
index 22afac3e42..7213bacefe 100644
--- a/epan/dissectors/packet-acp133.c
+++ b/epan/dissectors/packet-acp133.c
@@ -52,6 +52,9 @@
 #define PSNAME "ACP133"
 #define PFNAME "acp133"
 
+void proto_register_acp133(void);
+void proto_reg_handoff_acp133(void);
+
 /* Initialize the protocol and registered fields */
 static int proto_acp133 = -1;
 
@@ -148,7 +151,7 @@ static int hf_acp133_OnSupported_acp127_pn = -1;
 static int hf_acp133_OnSupported_acp127_tn = -1;
 
 /*--- End of included file: packet-acp133-hf.c ---*/
-#line 52 "../../asn1/acp133/packet-acp133-template.c"
+#line 55 "../../asn1/acp133/packet-acp133-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_acp133 = -1;
@@ -177,7 +180,7 @@ static gint ett_acp133_Capability = -1;
 static gint ett_acp133_SET_OF_ExtendedContentType = -1;
 
 /*--- End of included file: packet-acp133-ett.c ---*/
-#line 56 "../../asn1/acp133/packet-acp133-template.c"
+#line 59 "../../asn1/acp133/packet-acp133-template.c"
 
 
 /*--- Included file: packet-acp133-fn.c ---*/
@@ -1170,7 +1173,7 @@ static void dissect_Capability_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
 
 
 /*--- End of included file: packet-acp133-fn.c ---*/
-#line 58 "../../asn1/acp133/packet-acp133-template.c"
+#line 61 "../../asn1/acp133/packet-acp133-template.c"
 
 
 /*--- proto_register_acp133 -------------------------------------------*/
@@ -1528,7 +1531,7 @@ void proto_register_acp133(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-acp133-hfarr.c ---*/
-#line 67 "../../asn1/acp133/packet-acp133-template.c"
+#line 70 "../../asn1/acp133/packet-acp133-template.c"
   };
 
   /* List of subtrees */
@@ -1559,7 +1562,7 @@ void proto_register_acp133(void) {
     &ett_acp133_SET_OF_ExtendedContentType,
 
 /*--- End of included file: packet-acp133-ettarr.c ---*/
-#line 73 "../../asn1/acp133/packet-acp133-template.c"
+#line 76 "../../asn1/acp133/packet-acp133-template.c"
   };
 
   /* Register protocol */
@@ -1631,7 +1634,7 @@ void proto_reg_handoff_acp133(void) {
 
 
 /*--- End of included file: packet-acp133-dis-tab.c ---*/
-#line 89 "../../asn1/acp133/packet-acp133-template.c"
+#line 92 "../../asn1/acp133/packet-acp133-template.c"
 
   /* X.402 Object Classes */
   oid_add_from_string("id-oc-mhs-distribution-list","2.6.5.1.0");
diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index 5ac209beab..df27e8d794 100644
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -52,6 +52,8 @@
 #define PSNAME "ANSI_TCAP"
 #define PFNAME "ansi_tcap"
 
+void proto_register_ansi_tcap(void);
+void proto_reg_handoff_ansi_tcap(void);
 
 /* Preferences defaults */
 gint ansi_tcap_response_matching_type = 0;
@@ -124,7 +126,7 @@ static int hf_ansi_tcap_paramSequence = -1;       /* T_paramSequence */
 static int hf_ansi_tcap_paramSet = -1;            /* T_paramSet */
 
 /*--- End of included file: packet-ansi_tcap-hf.c ---*/
-#line 64 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c"
+#line 66 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_tcap = -1;
@@ -170,7 +172,7 @@ static gint ett_ansi_tcap_T_paramSequence = -1;
 static gint ett_ansi_tcap_T_paramSet = -1;
 
 /*--- End of included file: packet-ansi_tcap-ett.c ---*/
-#line 83 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c"
+#line 85 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c"
 
 #define MAX_SSN 254
 
@@ -1392,7 +1394,7 @@ dissect_ansi_tcap_PackageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 /*--- End of included file: packet-ansi_tcap-fn.c ---*/
-#line 350 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c"
+#line 352 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c"
 
 
 
@@ -1738,7 +1740,7 @@ proto_register_ansi_tcap(void)
         NULL, HFILL }},
 
 /*--- End of included file: packet-ansi_tcap-hfarr.c ---*/
-#line 487 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c"
+#line 489 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c"
     };
 
 /* Setup protocol subtree array */
@@ -1776,7 +1778,7 @@ proto_register_ansi_tcap(void)
     &ett_ansi_tcap_T_paramSet,
 
 /*--- End of included file: packet-ansi_tcap-ettarr.c ---*/
-#line 498 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c"
+#line 500 "../../asn1/ansi_tcap/packet-ansi_tcap-template.c"
     };
 
     static const enum_val_t ansi_tcap_response_matching_type_values[] = {
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index bf851a4223..d7791cd87f 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -47,6 +47,9 @@
 #define PSNAME "CMIP"
 #define PFNAME "cmip"
 
+void proto_register_cmip(void);
+void proto_reg_handoff_cmip(void);
+
 /* XXX some stuff we need until we can get rid of it */
 #include "packet-ses.h"
 #include "packet-pres.h"
@@ -342,7 +345,7 @@ static int hf_cmip_T_daysOfWeek_friday = -1;
 static int hf_cmip_T_daysOfWeek_saturday = -1;
 
 /*--- End of included file: packet-cmip-hf.c ---*/
-#line 57 "../../asn1/cmip/packet-cmip-template.c"
+#line 60 "../../asn1/cmip/packet-cmip-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_cmip = -1;
@@ -472,7 +475,7 @@ static gint ett_cmip_T_modificationList = -1;
 static gint ett_cmip_T_modificationList_item = -1;
 
 /*--- End of included file: packet-cmip-ett.c ---*/
-#line 61 "../../asn1/cmip/packet-cmip-template.c"
+#line 64 "../../asn1/cmip/packet-cmip-template.c"
 
 static guint32 opcode;
 
@@ -531,7 +534,7 @@ static const value_string cmip_error_code_vals[] = {
 
 
 /*--- End of included file: packet-cmip-table.c ---*/
-#line 68 "../../asn1/cmip/packet-cmip-template.c"
+#line 71 "../../asn1/cmip/packet-cmip-template.c"
 
 static int opcode_type;
 #define OPCODE_INVOKE        1
@@ -643,7 +646,7 @@ static const char *objectclass_identifier_id;
 #define noInvokeId                     NULL
 
 /*--- End of included file: packet-cmip-val.h ---*/
-#line 91 "../../asn1/cmip/packet-cmip-template.c"
+#line 94 "../../asn1/cmip/packet-cmip-template.c"
 
 /*--- Included file: packet-cmip-fn.c ---*/
 #line 1 "../../asn1/cmip/packet-cmip-fn.c"
@@ -4378,7 +4381,7 @@ static void dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, prot
 
 
 /*--- End of included file: packet-cmip-fn.c ---*/
-#line 92 "../../asn1/cmip/packet-cmip-template.c"
+#line 95 "../../asn1/cmip/packet-cmip-template.c"
 
 
 
@@ -5577,7 +5580,7 @@ void proto_register_cmip(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-cmip-hfarr.c ---*/
-#line 186 "../../asn1/cmip/packet-cmip-template.c"
+#line 189 "../../asn1/cmip/packet-cmip-template.c"
   };
 
   /* List of subtrees */
@@ -5709,7 +5712,7 @@ void proto_register_cmip(void) {
     &ett_cmip_T_modificationList_item,
 
 /*--- End of included file: packet-cmip-ettarr.c ---*/
-#line 192 "../../asn1/cmip/packet-cmip-template.c"
+#line 195 "../../asn1/cmip/packet-cmip-template.c"
   };
 
   /* Register protocol */
@@ -5794,7 +5797,7 @@ void proto_register_cmip(void) {
 
 
 /*--- End of included file: packet-cmip-dis-tab.c ---*/
-#line 201 "../../asn1/cmip/packet-cmip-template.c"
+#line 204 "../../asn1/cmip/packet-cmip-template.c"
     oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1");
 
   attribute_id_dissector_table = register_dissector_table("cmip.attribute_id", "CMIP Attribute Id", FT_UINT32, BASE_DEC);
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index 64e0585e10..450a67a7d4 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -93,6 +93,8 @@ enum nas_sys_info_gsm_map {
 static guint32 rrc_nas_sys_info_gsm_map_type = RRC_NAS_SYS_INFO_CN_COMMON;
 
 /* Forward declarations */
+void proto_register_rrc(void);
+void proto_reg_handoff_rrc(void);
 static int dissect_UE_RadioAccessCapabilityInfo_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
 static int dissect_SysInfoTypeSB1_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
 static int dissect_SysInfoTypeSB2_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *);
@@ -276,7 +278,7 @@ static int dissect_SysInfoType22_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tr
 #define maxURNTI_Group                 8
 
 /*--- End of included file: packet-rrc-val.h ---*/
-#line 98 "../../asn1/rrc/packet-rrc-template.c"
+#line 100 "../../asn1/rrc/packet-rrc-template.c"
 
 /* Initialize the protocol and registered fields */
 int proto_rrc = -1;
@@ -9812,7 +9814,7 @@ static int hf_rrc_GsmSecurityCapability_a5_2 = -1;
 static int hf_rrc_GsmSecurityCapability_a5_1 = -1;
 
 /*--- End of included file: packet-rrc-hf.c ---*/
-#line 103 "../../asn1/rrc/packet-rrc-template.c"
+#line 105 "../../asn1/rrc/packet-rrc-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_rrc = -1;
@@ -15867,7 +15869,7 @@ static gint ett_rrc_UE_RadioAccessCapability_r6 = -1;
 static gint ett_rrc_UL_RFC3095_Context = -1;
 
 /*--- End of included file: packet-rrc-ett.c ---*/
-#line 108 "../../asn1/rrc/packet-rrc-template.c"
+#line 110 "../../asn1/rrc/packet-rrc-template.c"
 
 static gint ett_rrc_eutraFeatureGroupIndicators = -1;
 static gint ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo = -1;
@@ -15927,19 +15929,21 @@ static int get_max_counter(int com_context){
 }
 #endif
 /** Utility functions used for various comparisons/cleanups in tree **/
-gint rrc_key_cmp(gconstpointer b_ptr, gconstpointer a_ptr, gpointer ignore _U_){
+static gint rrc_key_cmp(gconstpointer b_ptr, gconstpointer a_ptr, gpointer ignore _U_){
     if( GPOINTER_TO_INT(a_ptr) > GPOINTER_TO_INT(b_ptr) ){
         return  -1;
     }
     return GPOINTER_TO_INT(a_ptr) < GPOINTER_TO_INT(b_ptr);
 }
-void rrc_free_key(gpointer key _U_){
+
+static void rrc_free_key(gpointer key _U_){
             /*Keys should be de allocated elsewhere.*/
 
-    }
-void rrc_free_value(gpointer value ){
+}
+
+static void rrc_free_value(gpointer value ){
             g_free(value);
-    }
+}
 
 /*--- Included file: packet-rrc-fn.c ---*/
 #line 1 "../../asn1/rrc/packet-rrc-fn.c"
@@ -141616,7 +141620,7 @@ static int dissect_MeasurementReport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _
 
 
 /*--- End of included file: packet-rrc-fn.c ---*/
-#line 181 "../../asn1/rrc/packet-rrc-template.c"
+#line 185 "../../asn1/rrc/packet-rrc-template.c"
 
 #include "packet-rrc.h"
 
@@ -141670,7 +141674,7 @@ dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
 }
 
-void rrc_init(void){
+static void rrc_init(void){
     /*Cleanup*/
     if(hsdsch_muxed_flows){
         g_tree_destroy(hsdsch_muxed_flows);
@@ -179801,7 +179805,7 @@ void proto_register_rrc(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-rrc-hfarr.c ---*/
-#line 261 "../../asn1/rrc/packet-rrc-template.c"
+#line 265 "../../asn1/rrc/packet-rrc-template.c"
     { &hf_test,
       { "RAB Test", "rrc.RAB.test",
         FT_UINT8, BASE_DEC, NULL, 0,
@@ -185877,7 +185881,7 @@ void proto_register_rrc(void) {
     &ett_rrc_UL_RFC3095_Context,
 
 /*--- End of included file: packet-rrc-ettarr.c ---*/
-#line 287 "../../asn1/rrc/packet-rrc-template.c"
+#line 291 "../../asn1/rrc/packet-rrc-template.c"
     &ett_rrc_eutraFeatureGroupIndicators,
     &ett_rrc_cn_CommonGSM_MAP_NAS_SysInfo,
   };
@@ -185959,7 +185963,7 @@ void proto_register_rrc(void) {
 
 
 /*--- End of included file: packet-rrc-dis-reg.c ---*/
-#line 301 "../../asn1/rrc/packet-rrc-template.c"
+#line 305 "../../asn1/rrc/packet-rrc-template.c"