Get rid of the private "my_match_strval()" routine in many dissectors;

add a "match_strval_idx()" routine that does the same thing, and have
"match_strval()" call it.

Make those routines, and "val_to_str()", return a "const" pointer. 
Update dissectors as necessary to squelch compiler warnings produced by
that.

Use "val_to_str()" rather than using "match_strval()" and then, if the
result is null, substituting a specific string.  Clean up some other
"match_strval()"/"val_to_str()" usages.

Add a null pointer check in the NDPS dissector's "attribute_value()"
routine, as it's not clear that "global_attribute_name" won't be null at
that point.

Make some global variables in the AFS4INT dissector local.

Make some routines not used outside the module they're in static.

Make some tables "static const".

Clean up white space.

Fix Gerald's address in some files.


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

1 files changed, 3 insertions, 23 deletions

diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index 510b8fa8ac..dd4757a0fd 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -447,26 +447,6 @@ my_dgt_tbcd_unpack(
     return(cnt);
 }
 
-static const gchar *
-my_match_strval(guint32 val, const value_string *vs, gint *idx)
-{
-    gint i = 0;
-
-    while (vs[i].strptr)
-    {
-	if (vs[i].value == val)
-	{
-	    *idx = i;
-	    return(vs[i].strptr);
-	}
-
-	i++;
-    }
-
-    *idx = -1;
-    return(NULL);
-}
-
 /* ELEMENT FUNCTIONS */
 
 #define	EXTRANEOUS_DATA_CHECK(edc_len, edc_max_len) \
@@ -4531,7 +4511,7 @@ elem_ms_info_recs(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gc
 
 	rec_type = tvb_get_guint8(tvb, curr_offset);
 
-	str = my_match_strval((guint32) rec_type, ansi_ms_info_rec_str, &idx);
+	str = match_strval_idx((guint32) rec_type, ansi_ms_info_rec_str, &idx);
 
 	if (str == NULL)
 	{
@@ -7982,7 +7962,7 @@ dissect_bsmap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
      */
     oct = tvb_get_guint8(tvb, offset++);
 
-    msg_str = my_match_strval((guint32) oct, ansi_a_ios401_bsmap_strings, &idx);
+    msg_str = match_strval_idx((guint32) oct, ansi_a_ios401_bsmap_strings, &idx);
 
     /*
      * create the a protocol tree
@@ -8105,7 +8085,7 @@ dissect_dtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     saved_offset = offset;
     oct = tvb_get_guint8(tvb, offset++);
 
-    msg_str = my_match_strval((guint32) oct, ansi_a_ios401_dtap_strings, &idx);
+    msg_str = match_strval_idx((guint32) oct, ansi_a_ios401_dtap_strings, &idx);
 
     /*
      * create the a protocol tree