svn path=/trunk/; revision=48440

1 files changed, 17 insertions, 13 deletions

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"