Warning fixes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@22855 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/asn1/ansi_map/ansi_map.asn b/asn1/ansi_map/ansi_map.asn
index 48b84e2702081e5cc808961591112e2a07ea0829..c28dba7d14a60d59266a0db391f76574ea3bbc85 100644 (file)
--- a/asn1/ansi_map/ansi_map.asn
+++ b/asn1/ansi_map/ansi_map.asn
@@ -6977,10 +6977,10 @@ WINCapability ::= SET {
 WINOperationsCapability ::= OCTET STRING
 --see 6.5.2.kk for encoding
 
-WIN-Trigger ::= SEQUENCE {
-       triggerType                     [279] IMPLICIT TriggerType OPTIONAL,
-       detectionPointType      DetectionPointType
-       }
+--WIN-Trigger ::= SEQUENCE {
+--     triggerType                     [279] IMPLICIT TriggerType OPTIONAL,
+--     detectionPointType      DetectionPointType
+--     }
 
 --6.5.2.dk N.S0013-0 v 1.0,X.S0004-550-E v1.0 2.301
 -- 1 0 0 1 1 1 1 1 (0x9f)

diff --git a/asn1/ansi_map/packet-ansi_map-template.c b/asn1/ansi_map/packet-ansi_map-template.c
index 25ec73df4fed3b353452c40065adb7a5414f8706..012a19e2c33644d91cb734803e1d0fad78989b49 100644 (file)
--- a/asn1/ansi_map/packet-ansi_map-template.c
+++ b/asn1/ansi_map/packet-ansi_map-template.c
@@ -3623,7 +3623,7 @@ dissect_ansi_map_win_trigger_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
 
        int offset = 0;
        int end_offset = 0;
-       int j;
+       int j = 0;
        proto_tree *subtree;
        guint8 octet;
 

diff --git a/asn1/tcap/ansi_tcap.cnf b/asn1/tcap/ansi_tcap.cnf
index 042d46710e278d1c6c19754fb0774e4b827eee40..0c88f693e9ae175fce5880329c66b56fd619faf3 100644 (file)
--- a/asn1/tcap/ansi_tcap.cnf
+++ b/asn1/tcap/ansi_tcap.cnf
@@ -73,7 +73,7 @@ tvbuff_t      *parameter_tvb;
  static const char * oid_str;
 
  %(DEFAULT_BODY)s
-       ansi_tcap_private.objectApplicationId_oid= (void*) cur_oid;
+       ansi_tcap_private.objectApplicationId_oid= (void*) oid_str;
        ansi_tcap_private.oid_is_present=TRUE;
 
 #.FN_HDR PackageType/unidirectional

diff --git a/asn1/tcap/packet-ansi_tcap-template.c b/asn1/tcap/packet-ansi_tcap-template.c
index cf36bf1d5ee0986f66e2fdf3b4c2532c6b0202ed..8fa9c55ce714304b4e4bbecedf0ac5a32653d8e3 100644 (file)
--- a/asn1/tcap/packet-ansi_tcap-template.c
+++ b/asn1/tcap/packet-ansi_tcap-template.c
@@ -95,10 +95,6 @@ static proto_item * tcap_stat_item=NULL;
 static dissector_handle_t data_handle;
 static dissector_handle_t ansi_map_handle;
 
-static dissector_table_t sccp_ssn_table;
-
-static GHashTable* ansi_sub_dissectors = NULL;
-static GHashTable* itu_sub_dissectors = NULL;
 
 struct ansi_tcap_private_t ansi_tcap_private;
 
@@ -110,7 +106,12 @@ static void ansi_tcap_ctx_init(struct ansi_tcap_private_t *a_tcap_ctx) {
 
 static void dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree);
 /*
-extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
+static dissector_table_t sccp_ssn_table;
+
+static GHashTable* ansi_sub_dissectors = NULL;
+static GHashTable* itu_sub_dissectors = NULL;
+
+  extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
     g_hash_table_insert(ansi_sub_dissectors,GUINT_TO_POINTER(ssn),dissector);
     dissector_add("sccp.ssn",ssn,tcap_handle);
 }
@@ -328,10 +329,10 @@ dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 {
     proto_item         *item=NULL;
     proto_tree         *tree=NULL;
+#if 0
     proto_item         *stat_item=NULL;
     proto_tree         *stat_tree=NULL;
        gint                    offset = 0;
-#if 0
     struct tcaphash_context_t * p_tcap_context;
     dissector_handle_t subdissector_handle;
 #endif

diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index 83130605f7c2ff4cd80c830c7160fd440dc90ec7..50456bc5bc3fddf251b5f69e0d84a8664b557ab0 100644 (file)
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -698,7 +698,6 @@ static int hf_ansi_map_triggerListOpt = -1;       /* TriggerList */
 static int hf_ansi_map_wIN_TriggerList = -1;      /* WIN_TriggerList */
 static int hf_ansi_map_triggerCapability = -1;    /* TriggerCapability */
 static int hf_ansi_map_wINOperationsCapability = -1;  /* WINOperationsCapability */
-static int hf_ansi_map_detectionPointType = -1;   /* DetectionPointType */
 static int hf_ansi_map_CallRecoveryIDList_item = -1;  /* CallRecoveryID */
 static int hf_ansi_map_generalizedTime = -1;      /* GeneralizedTime */
 static int hf_ansi_map_geographicPosition = -1;   /* GeographicPosition */
@@ -1111,7 +1110,6 @@ static gint ett_ansi_map_ServiceDataResultList = -1;
 static gint ett_ansi_map_TriggerAddressList = -1;
 static gint ett_ansi_map_TriggerList = -1;
 static gint ett_ansi_map_WINCapability = -1;
-static gint ett_ansi_map_WIN_Trigger = -1;
 static gint ett_ansi_map_CallRecoveryID = -1;
 static gint ett_ansi_map_CallRecoveryIDList = -1;
 static gint ett_ansi_map_PositionInformation = -1;
@@ -14862,21 +14860,6 @@ dissect_ansi_map_DetectionPointType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_
 }
 
 
-static const ber_sequence_t WIN_Trigger_sequence[] = {
-  { &hf_ansi_map_triggerType, BER_CLASS_CON, 279, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_ansi_map_TriggerType },
-  { &hf_ansi_map_detectionPointType, BER_CLASS_UNI, BER_UNI_TAG_ENUMERATED, BER_FLAGS_NOOWNTAG, dissect_ansi_map_DetectionPointType },
-  { NULL, 0, 0, 0, NULL }
-};
-
-static int
-dissect_ansi_map_WIN_Trigger(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-  offset = dissect_ber_sequence(implicit_tag, actx, tree, tvb, offset,
-                                   WIN_Trigger_sequence, hf_index, ett_ansi_map_WIN_Trigger);
-
-  return offset;
-}
-
-
 static const ber_sequence_t InvokeData_sequence[] = {
   { &hf_ansi_map_handoffMeasurementRequest, BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_ansi_map_HandoffMeasurementRequest },
   { &hf_ansi_map_facilitiesDirective, BER_CLASS_PRI, 18, BER_FLAGS_NOOWNTAG, dissect_ansi_map_FacilitiesDirective },
@@ -15073,7 +15056,7 @@ dissect_ansi_map_win_trigger_list(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
 
        int offset = 0;
        int end_offset = 0;
-       int j;
+       int j = 0;
        proto_tree *subtree;
        guint8 octet;
 
@@ -18120,10 +18103,6 @@ void proto_register_ansi_map(void) {
       { "wINOperationsCapability", "ansi_map.wINOperationsCapability",
         FT_BYTES, BASE_HEX, NULL, 0,
         "ansi_map.WINOperationsCapability", HFILL }},
-    { &hf_ansi_map_detectionPointType,
-      { "detectionPointType", "ansi_map.detectionPointType",
-        FT_UINT32, BASE_DEC, VALS(ansi_map_DetectionPointType_vals), 0,
-        "ansi_map.DetectionPointType", HFILL }},
     { &hf_ansi_map_CallRecoveryIDList_item,
       { "Item", "ansi_map.CallRecoveryIDList_item",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -19050,7 +19029,6 @@ void proto_register_ansi_map(void) {
     &ett_ansi_map_TriggerAddressList,
     &ett_ansi_map_TriggerList,
     &ett_ansi_map_WINCapability,
-    &ett_ansi_map_WIN_Trigger,
     &ett_ansi_map_CallRecoveryID,
     &ett_ansi_map_CallRecoveryIDList,
     &ett_ansi_map_PositionInformation,

diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index d5b3059c2b840053bcff30d90d597549e12f74e9..299325e8e5e8d15fbaa072bc401c72c8f33f48a5 100644 (file)
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -186,10 +186,6 @@ static proto_item * tcap_stat_item=NULL;
 static dissector_handle_t data_handle;
 static dissector_handle_t ansi_map_handle;
 
-static dissector_table_t sccp_ssn_table;
-
-static GHashTable* ansi_sub_dissectors = NULL;
-static GHashTable* itu_sub_dissectors = NULL;
 
 struct ansi_tcap_private_t ansi_tcap_private;
 
@@ -201,7 +197,12 @@ static void ansi_tcap_ctx_init(struct ansi_tcap_private_t *a_tcap_ctx) {
 
 static void dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree);
 /*
-extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
+static dissector_table_t sccp_ssn_table;
+
+static GHashTable* ansi_sub_dissectors = NULL;
+static GHashTable* itu_sub_dissectors = NULL;
+
+  extern void add_ansi_tcap_subdissector(guint32 ssn, dissector_handle_t dissector) {
     g_hash_table_insert(ansi_sub_dissectors,GUINT_TO_POINTER(ssn),dissector);
     dissector_add("sccp.ssn",ssn,tcap_handle);
 }
@@ -606,7 +607,7 @@ dissect_ansi_tcap_ObjectIDApplicationContext(gboolean implicit_tag _U_, tvbuff_t
    offset = dissect_ber_tagged_type(implicit_tag, actx, tree, tvb, offset,
                                       hf_index, BER_CLASS_PRI, 28, TRUE, dissect_ansi_tcap_OBJECT_IDENTIFIER);
 
-       ansi_tcap_private.objectApplicationId_oid= (void*) cur_oid;
+       ansi_tcap_private.objectApplicationId_oid= (void*) oid_str;
        ansi_tcap_private.oid_is_present=TRUE;
 
 
@@ -1320,7 +1321,7 @@ dissect_ansi_tcap_PackageType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int
 
 
 /*--- End of included file: packet-ansi_tcap-fn.c ---*/
-#line 322 "packet-ansi_tcap-template.c"
+#line 323 "packet-ansi_tcap-template.c"
 
 
 
@@ -1330,10 +1331,10 @@ dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 {
     proto_item         *item=NULL;
     proto_tree         *tree=NULL;
+#if 0
     proto_item         *stat_item=NULL;
     proto_tree         *stat_tree=NULL;
        gint                    offset = 0;
-#if 0
     struct tcaphash_context_t * p_tcap_context;
     dissector_handle_t subdissector_handle;
 #endif
@@ -1653,7 +1654,7 @@ proto_register_ansi_tcap(void)
         "ansi_tcap.T_paramSet", HFILL }},
 
 /*--- End of included file: packet-ansi_tcap-hfarr.c ---*/
-#line 446 "packet-ansi_tcap-template.c"
+#line 447 "packet-ansi_tcap-template.c"
     };
 
 /* Setup protocol subtree array */
@@ -1690,7 +1691,7 @@ proto_register_ansi_tcap(void)
     &ett_ansi_tcap_T_paramSet,
 
 /*--- End of included file: packet-ansi_tcap-ettarr.c ---*/
-#line 456 "packet-ansi_tcap-template.c"
+#line 457 "packet-ansi_tcap-template.c"
     };
 
     /*static enum_val_t tcap_options[] = {