Warning fixes

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

diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 46db718396f8997b6927753b93eb236ff4f03b66..065f03394b551c49e2bd86a50a9d3b656a8b92a9 100644 (file)
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -1870,7 +1870,7 @@ find_pointer_index(guint32 id)
 int
 dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                    proto_tree *tree, guint8 *drep, dcerpc_dissect_fnct_t *fnct,
-                   int type, char *text, int hf_index, 
+                   int type, const char *text, int hf_index, 
                    dcerpc_callback_fnct_t *callback, void *callback_args)
 {
        dcerpc_info *di;
@@ -2071,7 +2071,7 @@ after_ref_id:
 int
 dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                    proto_tree *tree, guint8 *drep, dcerpc_dissect_fnct_t *fnct,
-                   int type, char *text, int hf_index)
+                   int type, const char *text, int hf_index)
 {
        return dissect_ndr_pointer_cb(
                tvb, offset, pinfo, tree, drep, fnct, type, text, hf_index,
@@ -2902,7 +2902,7 @@ dissect_dcerpc_cn_bind_nak (tvbuff_t *tvb, gint offset, packet_info *pinfo,
 
 #define PFC_FRAG_MASK  0x03
 
-static char *
+static const char *
 fragment_type(guint8 flags)
 {
        flags = flags & PFC_FRAG_MASK;

diff --git a/epan/dissectors/packet-dcerpc.h b/epan/dissectors/packet-dcerpc.h
index b3374cdb3aaa2e700c58a1b6ad41da1b8407f4c0..775690c829a731d2678c72c7222a7a4023c5c854 100644 (file)
--- a/epan/dissectors/packet-dcerpc.h
+++ b/epan/dissectors/packet-dcerpc.h
@@ -183,13 +183,13 @@ typedef void (dcerpc_callback_fnct_t)(packet_info *pinfo, proto_tree *tree, prot
 
 int dissect_ndr_pointer_cb(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                           proto_tree *tree, guint8 *drep,
-                          dcerpc_dissect_fnct_t *fnct, int type, char *text, 
+                          dcerpc_dissect_fnct_t *fnct, int type, const char *text, 
                           int hf_index, dcerpc_callback_fnct_t *callback,
                           void *callback_args);
 
 int dissect_ndr_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        proto_tree *tree, guint8 *drep,
-                       dcerpc_dissect_fnct_t *fnct, int type, char *text, 
+                       dcerpc_dissect_fnct_t *fnct, int type, const char *text, 
                        int hf_index);
 int dissect_deferred_pointers(packet_info *pinfo, tvbuff_t *tvb, int offset, guint8 *drep);
 int dissect_ndr_embedded_pointer(tvbuff_t *tvb, gint offset, packet_info *pinfo,

diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 71b68c603660c201907f010378f61e8fc0df076a..62c3ee08ba8656064cdd39bbce4d35ad05f7485a 100644 (file)
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -321,7 +321,7 @@ call_kerberos_callbacks(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int
 static gboolean krb_decrypt = FALSE;
 
 /* keytab filename */
-static char *keytab_filename = "insert filename here";
+static const char *keytab_filename = "insert filename here";
 
 #endif
 
@@ -330,7 +330,7 @@ static char *keytab_filename = "insert filename here";
 enc_key_t *enc_key_list=NULL;
 
 static void
-add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *keyvalue, char *origin)
+add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *keyvalue, const char *origin)
 {
        enc_key_t *new_key;
 
@@ -354,7 +354,7 @@ printf("added key in %d\n",pinfo->fd->num);
 #ifdef HAVE_MIT_KERBEROS
 
 static void
-read_keytab_file(char *filename, krb5_context *context)
+read_keytab_file(const char *filename, krb5_context *context)
 {
        krb5_keytab keytab;
        krb5_keytab_entry key;
@@ -474,7 +474,7 @@ printf("woohoo decrypted keytype:%d in frame:%d\n", keytype, pinfo->fd->num);
 
 #elif defined(HAVE_HEIMDAL_KERBEROS)
 static void
-read_keytab_file(char *filename, krb5_context *context)
+read_keytab_file(const char *filename, krb5_context *context)
 {
        krb5_keytab keytab;
        krb5_keytab_entry key;
@@ -616,7 +616,7 @@ GSList *service_key_list = NULL;
 
 
 static void
-add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *keyvalue, char *origin)
+add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *keyvalue, const char *origin)
 {
        service_key_t *new_key;
 
@@ -650,7 +650,7 @@ clear_keytab(void) {
 }
 
 static void
-read_keytab_file(char *service_key_file)
+read_keytab_file(const char *service_key_file)
 {
        FILE *skf;
        struct stat st;
@@ -3682,7 +3682,7 @@ dissect_krb5_ERROR(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offs
 
 
 
-static struct { char *set; char *unset; } bitval = { "Set", "Not set" };
+static struct { const char *set; const char *unset; } bitval = { "Set", "Not set" };
 
 static gint dissect_kerberos_udp(tvbuff_t *tvb, packet_info *pinfo,
                                 proto_tree *tree);