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, 6 insertions, 6 deletions

diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 394ed7622f..bcb5cd755a 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -377,7 +377,7 @@ static const value_string dns_types[] = {
 	{0,		NULL}
 };
 
-static char *
+static const char *
 dns_type_name (guint type)
 {
   return val_to_str(type, dns_types, "Unknown (%u)");
@@ -437,7 +437,7 @@ dns_type_description (guint type)
     "Next secured",                     /* future RFC 2535bis */
     "DNS public key"                    /* future RFC 2535bis */
   };
-  char *short_name;
+  const char *short_name;
   const char *long_name;
   static char strbuf[1024+1];
 
@@ -499,7 +499,7 @@ static const value_string dns_classes[] = {
 	{0,NULL}
 };
 
-char *
+const char *
 dns_class_name(int class)
 {
   return val_to_str(class, dns_classes, "Unknown (%u)");
@@ -754,7 +754,7 @@ dissect_dns_query(tvbuff_t *tvb, int offset, int dns_data_offset,
   int name_len;
   int type;
   int class;
-  char *type_name;
+  const char *type_name;
   int data_offset;
   int data_start;
   proto_tree *q_tree;
@@ -934,8 +934,8 @@ dissect_dns_answer(tvbuff_t *tvb, int offset, int dns_data_offset,
   int name_len;
   int type;
   int class;
-  char *class_name;
-  char *type_name;
+  const char *class_name;
+  const char *type_name;
   int data_offset;
   int cur_offset;
   int data_start;