From cced5fb94968f7d07d7c72500da8c861cba219e5 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 17 Mar 2019 12:56:27 -0700 Subject: Constification, to remove some compiler warnings. Change-Id: I24f0bdc72109a6ef3d801dc28cb9b523ff4e5fe7 Reviewed-on: https://code.wireshark.org/review/32458 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- epan/decode_as.c | 4 ++-- epan/decode_as.h | 4 ++-- epan/dissectors/packet-ber.c | 2 +- epan/dissectors/packet-dcerpc.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'epan') diff --git a/epan/decode_as.c b/epan/decode_as.c index 9a7405c74a..b74e99e37a 100644 --- a/epan/decode_as.c +++ b/epan/decode_as.c @@ -147,9 +147,9 @@ gboolean decode_as_default_reset(const gchar *name, gconstpointer pattern) return TRUE; } -gboolean decode_as_default_change(const gchar *name, gconstpointer pattern, gpointer handle, gchar *list_name _U_) +gboolean decode_as_default_change(const gchar *name, gconstpointer pattern, gconstpointer handle, const gchar *list_name _U_) { - dissector_handle_t* dissector = (dissector_handle_t*)handle; + const dissector_handle_t* dissector = (const dissector_handle_t*)handle; if (dissector != NULL) { switch (get_dissector_table_selector_type(name)) { case FT_UINT8: diff --git a/epan/decode_as.h b/epan/decode_as.h index 1642108f1a..050003e6cc 100644 --- a/epan/decode_as.h +++ b/epan/decode_as.h @@ -46,7 +46,7 @@ typedef void (*decode_as_free_func)(gpointer value); /** callback function definition: Clear value from dissector table */ typedef gboolean (*decode_as_reset_func)(const gchar *name, gconstpointer pattern); /** callback function definition: Apply value to dissector table */ -typedef gboolean (*decode_as_change_func)(const gchar *name, gconstpointer pattern, gpointer handle, gchar *list_name); +typedef gboolean (*decode_as_change_func)(const gchar *name, gconstpointer pattern, gconstpointer handle, const gchar *list_name); typedef struct decode_as_value_s { build_label_func label_func; @@ -98,7 +98,7 @@ WS_DLL_PUBLIC void decode_as_default_populate_list(const gchar *table_name, deco /* Clear a FT_UINT32 value from dissector table list */ WS_DLL_PUBLIC gboolean decode_as_default_reset(const gchar *name, gconstpointer pattern); /* Add a FT_UINT32 value to dissector table list */ -WS_DLL_PUBLIC gboolean decode_as_default_change(const gchar *name, gconstpointer pattern, gpointer handle, gchar *list_name); +WS_DLL_PUBLIC gboolean decode_as_default_change(const gchar *name, gconstpointer pattern, gconstpointer handle, const gchar *list_name); /** List of registered decode_as_t structs. * For UI code only. Should not be directly accessed by dissectors. diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 925d4c1c8a..8fbbf9a8d2 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -407,7 +407,7 @@ static gboolean ber_decode_as_reset(const char *name _U_, gconstpointer pattern return FALSE; } -static gboolean ber_decode_as_change(const char *name _U_, gconstpointer pattern _U_, gpointer handle _U_, gchar* list_name) +static gboolean ber_decode_as_change(const char *name _U_, gconstpointer pattern _U_, gconstpointer handle _U_, const gchar* list_name) { ber_decode_as(list_name); return FALSE; diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index e88a04153d..98b10c127e 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -974,11 +974,11 @@ decode_dcerpc_binding_reset(const char *name _U_, gconstpointer pattern) } static gboolean -dcerpc_decode_as_change(const char *name, gconstpointer pattern, gpointer handle, gchar* list_name) +dcerpc_decode_as_change(const char *name, gconstpointer pattern, gconstpointer handle, const gchar* list_name) { const decode_dcerpc_bind_values_t *binding = (const decode_dcerpc_bind_values_t*)pattern; decode_dcerpc_bind_values_t *stored_binding; - guid_key *key = *((guid_key**)handle); + guid_key *key = *((guid_key *const *)handle); /* remove a probably existing old binding */ decode_dcerpc_binding_reset(name, binding); -- cgit v1.2.3