Constify to remove a bunch of warnings. Add some casts to squelch

(presumably-)harmless-but-otherwise-unremovable const-to-nonconst
warnings.

In the TACACS dissector, clean up the variables used in option parsing
to avoid some const-to-nonconst warnings.

Clean up some white space.

svn path=/trunk/; revision=15043

1 files changed, 3 insertions, 3 deletions

diff --git a/epan/dissectors/packet-dcerpc.h b/epan/dissectors/packet-dcerpc.h
index 0410be2b91..b3374cdb3a 100644
--- a/epan/dissectors/packet-dcerpc.h
+++ b/epan/dissectors/packet-dcerpc.h
@@ -245,7 +245,7 @@ typedef struct _dcerpc_sub_dissector {
 
 /* registration function for subdissectors */
 void dcerpc_init_uuid (int proto, int ett, e_uuid_t *uuid, guint16 ver, dcerpc_sub_dissector *procs, int opnum_hf);
-char *dcerpc_get_proto_name(e_uuid_t *uuid, guint16 ver);
+const char *dcerpc_get_proto_name(e_uuid_t *uuid, guint16 ver);
 int dcerpc_get_proto_hf_opnum(e_uuid_t *uuid, guint16 ver);
 dcerpc_sub_dissector *dcerpc_get_proto_sub_dissector(e_uuid_t *uuid, guint16 ver);
 
@@ -254,7 +254,7 @@ dcerpc_sub_dissector *dcerpc_get_proto_sub_dissector(e_uuid_t *uuid, guint16 ver
 value_string *value_string_from_subdissectors(dcerpc_sub_dissector *sd);
 
 /* try to get protocol name registered for this uuid */
-gchar *dcerpc_get_uuid_name(e_uuid_t *uuid, guint16 ver);
+const gchar *dcerpc_get_uuid_name(e_uuid_t *uuid, guint16 ver);
 
 /* Private data passed to subdissectors from the main DCERPC dissector. */
 typedef struct _dcerpc_call_value {
@@ -306,7 +306,7 @@ typedef struct _dcerpc_uuid_value {
     protocol_t *proto;
     int proto_id;
     int ett;
-    gchar *name;
+    const gchar *name;
     dcerpc_sub_dissector *procs;
     int opnum_hf;
 } dcerpc_uuid_value;