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, 3 deletions

diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c
index 863c2bc152..2370312cea 100644
--- a/epan/dissectors/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
@@ -331,7 +331,7 @@ int get_netbios_name( tvbuff_t *tvb, int offset, char *name_ret)
 /*
  * Get a string describing the type of a NetBIOS name.
  */
-char *
+const char *
 netbios_name_type_descr(int name_type)
 {
 	return val_to_str(name_type, nb_name_type_vals, "Unknown");
@@ -346,7 +346,7 @@ void netbios_add_name(char* label, tvbuff_t *tvb, int offset,
 	proto_item *tf;
 	char  name_str[(NETBIOS_NAME_LEN - 1)*4 + 1];
 	int   name_type;
-	char  *name_type_str;
+	const char  *name_type_str;
 
 					/* decode the name field */
 	name_type = get_netbios_name( tvb, offset, name_str);
@@ -1090,7 +1090,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	proto_tree		*netb_tree = NULL;
 	proto_item		*ti;
 	guint16			hdr_len, command;
-	char			*command_name;
+	const char		*command_name;
 	char 			name[(NETBIOS_NAME_LEN - 1)*4 + 1];
 	int			name_type;
 	guint16			session_id;