Rename vals_status & vals_pdu_type to wsp_vals_status & wsp_vals_pdu_type

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

diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 0822c74f72e1261e5f9c43a63b0774b16f6ae9a7..c3aca3142f72228e73ba52b44c91e39bad057195 100644 (file)
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -353,7 +353,7 @@ static dissector_handle_t media_handle;
 /* Handle for WBXML-encoded UAPROF dissector */
 static dissector_handle_t wbxml_uaprof_handle;
 
-const value_string vals_pdu_type[] = {
+const value_string wsp_vals_pdu_type[] = {
        { 0x00, "Reserved" },
        { 0x01, "Connect" },
        { 0x02, "ConnectReply" },
@@ -421,7 +421,7 @@ const value_string vals_pdu_type[] = {
 };
 
 /* The WSP status codes are inherited from the HTTP status codes */
-const value_string vals_status[] = {
+const value_string wsp_vals_status[] = {
        /* 0x00 - 0x0F Reserved */
 
        { 0x10, "100 Continue" },
@@ -2343,7 +2343,7 @@ wkh_allow(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_info *pinfo
                        tvb_ensure_bytes_exist(tvb, hdr_start, offset - hdr_start);
                        ti = proto_tree_add_string(tree, hf_hdr_allow,
                                        tvb, hdr_start, offset - hdr_start,
-                                       val_to_str(val_id & 0x7F, vals_pdu_type,
+                                       val_to_str(val_id & 0x7F, wsp_vals_pdu_type,
                                                "<Unknown WSP method 0x%02X>"));
                        ok = TRUE;
                }
@@ -2370,7 +2370,7 @@ wkh_public(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_info *pinf
                        tvb_ensure_bytes_exist(tvb, hdr_start, offset - hdr_start);
                        ti = proto_tree_add_string(tree, hf_hdr_public,
                                        tvb, hdr_start, offset - hdr_start,
-                                       val_to_str(val_id & 0x7F, vals_pdu_type,
+                                       val_to_str(val_id & 0x7F, wsp_vals_pdu_type,
                                                "<Unknown WSP method 0x%02X>"));
                        ok = TRUE;
                }
@@ -4986,7 +4986,7 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
        if (check_col(pinfo->cinfo, COL_INFO))
        {
                col_append_fstr(pinfo->cinfo, COL_INFO, "WSP %s (0x%02x)",
-                               val_to_str (pdut, vals_pdu_type, "Unknown PDU type (0x%02x)"),
+                               val_to_str (pdut, wsp_vals_pdu_type, "Unknown PDU type (0x%02x)"),
                                pdut);
        };
 
@@ -5010,7 +5010,7 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                                tvb, 0, -1, bo_little_endian);
                wsp_tree = proto_item_add_subtree(proto_ti, ett_wsp);
                proto_item_append_text(proto_ti, ", Method: %s (0x%02x)",
-                               val_to_str (pdut, vals_pdu_type, "Unknown (0x%02x)"),
+                               val_to_str (pdut, wsp_vals_pdu_type, "Unknown (0x%02x)"),
                                pdut);
 
                /* Add common items: only TID and PDU Type */
@@ -5230,7 +5230,7 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                                guint8 reply_status = tvb_get_guint8(tvb, offset);
                                const char *reply_status_str;
 
-                               reply_status_str = val_to_str (reply_status, vals_status, "(Unknown response status)");
+                               reply_status_str = val_to_str (reply_status, wsp_vals_status, "(Unknown response status)");
                                if (tree) {
                                        ti = proto_tree_add_item (wsp_tree, hf_wsp_header_status,
                                                        tvb, offset, 1, bo_little_endian);
@@ -6035,7 +6035,7 @@ proto_register_wsp(void)
                { &hf_wsp_header_pdu_type,
                        {       "PDU Type",
                                "wsp.pdu_type",
-                                FT_UINT8, BASE_HEX, VALS( vals_pdu_type ), 0x00,
+                                FT_UINT8, BASE_HEX, VALS( wsp_vals_pdu_type ), 0x00,
                                NULL, HFILL
                        }
                },
@@ -6105,7 +6105,7 @@ proto_register_wsp(void)
                { &hf_wsp_header_status,
                        {       "Status",
                                "wsp.reply.status",
-                                FT_UINT8, BASE_HEX, VALS( vals_status ), 0x00,
+                                FT_UINT8, BASE_HEX, VALS( wsp_vals_status ), 0x00,
                                "Reply Status", HFILL
                        }
                },

diff --git a/epan/dissectors/packet-wsp.h b/epan/dissectors/packet-wsp.h
index e93cc0741c827a7844eacec23842e3a2c6aa4ba8..4d772f86d124b6860df59d8d8fbf30c3345164fc 100644 (file)
--- a/epan/dissectors/packet-wsp.h
+++ b/epan/dissectors/packet-wsp.h
@@ -37,11 +37,11 @@ extern const value_string vals_wsp_reason_codes[];
 
 /*
  * the following allows TAP code access to the messages
- * without having to duplicate it. With MSVC and a 
+ * without having to duplicate it. With MSVC and a
  * libwireshark.dll, we need a special declaration.
  */
-WS_VAR_IMPORT const value_string vals_pdu_type[];
-WS_VAR_IMPORT const value_string vals_status[];
+WS_VAR_IMPORT const value_string wsp_vals_pdu_type[];
+WS_VAR_IMPORT const value_string wsp_vals_status[];
 /*
  * exported functionality
  */
@@ -54,7 +54,7 @@ guint32 add_content_type (proto_tree *tree, tvbuff_t *tvb,
 /* statistics */
 typedef struct _wsp_info_value_t       /* see README.tapping and tap-wspstat.c */
 {
-       gint status_code;               
+       gint status_code;
        guint8 pdut;
 } wsp_info_value_t;
 #endif /* packet-wsp.h */

diff --git a/epan/libwireshark.def b/epan/libwireshark.def
index 7bd3877a0d618a360878d5fa294cb00fec51b0a1..5ae9783a4e18a05154c124261dbec1fe4e7aed3f 100644 (file)
--- a/epan/libwireshark.def
+++ b/epan/libwireshark.def
@@ -1139,13 +1139,13 @@ val_to_str
 val_to_str_const
 val_to_str_ext
 val_to_str_ext_const
-vals_pdu_type                   DATA
-vals_status                     DATA
 value_is_in_range
 write_prefs
 ws_strdup_escape_underscore
 ws_strdup_unescape_underscore
 wslua_plugin_list               DATA
+wsp_vals_pdu_type               DATA
+wsp_vals_status                 DATA
 wtap_nstime_to_sec
 xml_escape
 xml_get_attrib

diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index d49146ff58c5119e2a1be79308d0a52f40d1247a..447b7982c3057065737482e0234e6887be4adbe6 100644 (file)
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -282,9 +282,9 @@ wsp_init_table(wspstat_t *sp)
                        x=2;
                }
                /* Maybe we should display the hexadecimal value ? */
-               /* g_snprintf(buffer, sizeof(buffer), "%s  (0X%x)", match_strval( index2pdut( i ), vals_pdu_type), index2pdut(i) );*/
+               /* g_snprintf(buffer, sizeof(buffer), "%s  (0X%x)", match_strval( index2pdut( i ), wsp_vals_pdu_type), index2pdut(i) );*/
                add_table_entry( sp,
-                               match_strval(index2pdut(i), vals_pdu_type), /* or buffer, */
+                               match_strval(index2pdut(i), wsp_vals_pdu_type), /* or buffer, */
                                x,
                                pos,
                                0
@@ -326,16 +326,16 @@ gtk_wspstat_init(const char *optarg, void *userdata _U_)
        gtk_window_set_destroy_with_parent (GTK_WINDOW(sp->win), TRUE);
 
        sp->hash = g_hash_table_new( g_int_hash, g_int_equal);
-       for (i=0 ; vals_status[i].strptr ; i++ )
+       for (i=0 ; wsp_vals_status[i].strptr ; i++ )
        {
                gint *key;
                sc=g_malloc( sizeof(wsp_status_code_t) );
                key=g_malloc( sizeof(gint) );
-               sc->name=vals_status[i].strptr;
+               sc->name=wsp_vals_status[i].strptr;
                sc->packets=0;
                sc->widget=NULL;
                sc->sp = sp;
-               *key=vals_status[i].value;
+               *key=wsp_vals_status[i].value;
                g_hash_table_insert(
                                sp->hash,
                                key,

diff --git a/tap-wspstat.c b/tap-wspstat.c
index 49e7e59addb3582ff87de840718becc0459aebfc..ce1b87eabae255745b26164c2213f83daf2595fe 100644 (file)
--- a/tap-wspstat.c
+++ b/tap-wspstat.c
@@ -230,14 +230,14 @@ wspstat_init(const char *optarg, void* userdata _U_)
 
        sp = g_malloc( sizeof(wspstat_t) );
        sp->hash = g_hash_table_new( g_int_hash, g_int_equal);
-       for (i=0 ; vals_status[i].strptr ; i++ )
+       for (i=0 ; wsp_vals_status[i].strptr ; i++ )
        {
                gint *key;
                sc=g_malloc( sizeof(wsp_status_code_t) );
                key=g_malloc( sizeof(gint) );
                sc->packets=0;
-               sc->name=vals_status[i].strptr;
-               *key=vals_status[i].value;
+               sc->name=wsp_vals_status[i].strptr;
+               *key=wsp_vals_status[i].value;
                g_hash_table_insert(
                                sp->hash,
                                key,
@@ -253,7 +253,7 @@ wspstat_init(const char *optarg, void* userdata _U_)
        for (i=0;i<sp->num_pdus; i++)
        {
                sp->pdu_stats[i].packets=0;
-               sp->pdu_stats[i].type = match_strval( index2pdut( i ), vals_pdu_type) ;
+               sp->pdu_stats[i].type = match_strval( index2pdut( i ), wsp_vals_pdu_type) ;
        }
 
        error_string = register_tap_listener(