Add an exported value string

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

diff --git a/epan/dissectors/packet-gsm_a.c b/epan/dissectors/packet-gsm_a.c
index fccafa980f9a392156ea5574be5e6c85c288213f..669698f4f9403f3c607e531d18afce72e05b1595 100644 (file)
--- a/epan/dissectors/packet-gsm_a.c
+++ b/epan/dissectors/packet-gsm_a.c
@@ -705,7 +705,7 @@ static const value_string bssap_sapi_values[] = {
 /* Mobile Station Classmark  
  * Revision level 
  */
-const value_string MSC_rev_vals[] = {
+const value_string gsm_a_msc_rev_vals[] = {
        { 0,            "Reserved for GSM phase 1"},
        { 1,            "Used by GSM phase 2 mobile stations"},
        { 2,            "Used by mobile stations supporting R99 or later versions of the protocol"},
@@ -16213,7 +16213,6 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     proto_item                 *oct_1_item = NULL;
     proto_tree                 *pd_tree = NULL;
     const gchar                        *msg_str;
-    const gchar                        *str;
     gint                       ett_tree;
     gint                       ti;
     int                                hf_idx;
@@ -16451,7 +16450,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
      */
     proto_tree_add_uint_format(dtap_tree, hf_idx,
        tvb, offset, 1, oct,
-       "Message Type %s",str);
+       "Message Type %s",msg_str);
 
     offset++;
 
@@ -16624,7 +16623,7 @@ proto_register_gsm_a(void)
        },
        { &hf_gsm_a_MSC_rev,
                { "Revision Level","gsm_a.MSC2_rev",
-               FT_UINT8,BASE_DEC,  VALS(MSC_rev_vals), 0x60,          
+               FT_UINT8,BASE_DEC,  VALS(gsm_a_msc_rev_vals), 0x60,          
                "Revision level", HFILL }
        },
        { &hf_gsm_a_ES_IND,

diff --git a/epan/dissectors/packet-gsm_a.h b/epan/dissectors/packet-gsm_a.h
index 6a6d084315f151130d09acb653d2006c988c8b6c..5431b7fd48f66f68973032990f424f115cd192ff 100644 (file)
--- a/epan/dissectors/packet-gsm_a.h
+++ b/epan/dissectors/packet-gsm_a.h
@@ -73,5 +73,5 @@ ETH_VAR_IMPORT const value_string gsm_a_dtap_msg_sms_strings[];
 ETH_VAR_IMPORT const value_string gsm_a_dtap_msg_sm_strings[];
 ETH_VAR_IMPORT const value_string gsm_a_dtap_msg_ss_strings[];
 ETH_VAR_IMPORT const gchar *gsm_a_pd_str[];
-
+ETH_VAR_IMPORT const value_string gsm_a_msc_rev_vals[];
 

diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index 61b05dad725da784c39ac57122596f456665be12..d86ca470934892afaa2a14f0efe0f619ef184dcb 100644 (file)
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -2350,7 +2350,7 @@ proto_register_uma(void)
                },
                { &hf_uma_urr_MSC2_rev,
                        { "Revision Level","uma.urr.MSC2_rev",
-                       FT_UINT8,BASE_DEC,  VALS(MSC_rev_vals), 0x60,          
+                       FT_UINT8,BASE_DEC,  VALS(gsm_a_msc_rev_vals), 0x60,          
                        "Revision level", HFILL }
                },
                { &hf_uma_urr_ES_IND,