aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
Diffstat (limited to 'epan')
-rw-r--r--epan/color_filters.c2
-rw-r--r--epan/color_filters.h2
-rw-r--r--epan/decode_as.c4
-rw-r--r--epan/decode_as.h8
-rw-r--r--epan/dissectors/packet-ber.c4
-rw-r--r--epan/dissectors/packet-dcerpc.c6
-rw-r--r--epan/dissectors/packet-dvbci.c4
-rw-r--r--epan/dissectors/packet-hdcp2.c2
-rw-r--r--epan/dissectors/packet-zvt.c2
-rw-r--r--epan/packet.c12
-rw-r--r--epan/packet.h2
-rw-r--r--epan/proto.c4
12 files changed, 26 insertions, 26 deletions
diff --git a/epan/color_filters.c b/epan/color_filters.c
index 6c8ed2e617..1fa82c51e8 100644
--- a/epan/color_filters.c
+++ b/epan/color_filters.c
@@ -733,7 +733,7 @@ color_filters_read_globals(gpointer user_data, gchar** err_msg, color_filter_add
/* read filters from some other filter file (import) */
gboolean
-color_filters_import(const gchar *path, const gpointer user_data, gchar** err_msg, color_filter_add_cb_func add_cb)
+color_filters_import(const gchar *path, gpointer user_data, gchar **err_msg, color_filter_add_cb_func add_cb)
{
FILE *f;
int ret;
diff --git a/epan/color_filters.h b/epan/color_filters.h
index a777e96632..8618b150da 100644
--- a/epan/color_filters.h
+++ b/epan/color_filters.h
@@ -143,7 +143,7 @@ WS_DLL_PUBLIC void color_filters_clone(gpointer user_data, color_filter_add_cb_f
* @param add_cb the callback function to add color filter
* @return TRUE, if read succeeded
*/
-WS_DLL_PUBLIC gboolean color_filters_import(const gchar *path, const gpointer user_data, gchar** err_msg, color_filter_add_cb_func add_cb);
+WS_DLL_PUBLIC gboolean color_filters_import(const gchar *path, gpointer user_data, gchar **err_msg, color_filter_add_cb_func add_cb);
/** Read filters from the global filter file (not the users file).
*
diff --git a/epan/decode_as.c b/epan/decode_as.c
index 3f9c63d129..7257711e1f 100644
--- a/epan/decode_as.c
+++ b/epan/decode_as.c
@@ -99,7 +99,7 @@ void decode_as_default_populate_list(const gchar *table_name, decode_as_add_to_l
dissector_table_foreach_handle(table_name, decode_proto_add_to_list, &populate);
}
-gboolean decode_as_default_reset(const char *name, const gpointer pattern)
+gboolean decode_as_default_reset(const gchar *name, gconstpointer pattern)
{
switch (get_dissector_table_selector_type(name)) {
case FT_UINT8:
@@ -121,7 +121,7 @@ gboolean decode_as_default_reset(const char *name, const gpointer pattern)
return TRUE;
}
-gboolean decode_as_default_change(const char *name, const gpointer pattern, gpointer handle, gchar* list_name _U_)
+gboolean decode_as_default_change(const gchar *name, gconstpointer pattern, gpointer handle, gchar *list_name _U_)
{
dissector_handle_t* dissector = (dissector_handle_t*)handle;
if (dissector != NULL) {
diff --git a/epan/decode_as.h b/epan/decode_as.h
index c6d89cb96a..69648fd90d 100644
--- a/epan/decode_as.h
+++ b/epan/decode_as.h
@@ -56,9 +56,9 @@ typedef void (*decode_as_populate_list_func)(const gchar *table_name, decode_as_
typedef void (*decode_as_free_func)(gpointer value);
/** callback function definition: Clear value from dissector table */
-typedef gboolean (*decode_as_reset_func)(const char *name, const gpointer pattern);
+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 char *name, const gpointer pattern, gpointer handle, gchar* list_name);
+typedef gboolean (*decode_as_change_func)(const gchar *name, gconstpointer pattern, gpointer handle, gchar *list_name);
typedef struct decode_as_value_s {
build_label_func label_func;
@@ -88,9 +88,9 @@ WS_DLL_PUBLIC void register_decode_as(decode_as_t* reg);
/* Walk though the dissector table and provide dissector_handle_t for each item in the table */
WS_DLL_PUBLIC void decode_as_default_populate_list(const gchar *table_name, decode_as_add_to_list_func add_to_list, gpointer ui_element);
/* Clear a FT_UINT32 value from dissector table list */
-WS_DLL_PUBLIC gboolean decode_as_default_reset(const char *name, const gpointer pattern);
+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 char *name, const gpointer pattern, gpointer handle, gchar* list_name);
+WS_DLL_PUBLIC gboolean decode_as_default_change(const gchar *name, gconstpointer pattern, gpointer handle, 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 a1edde616c..0e83cccc22 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -406,13 +406,13 @@ static void ber_populate_list(const gchar *table_name _U_, decode_as_add_to_list
ber_decode_as_foreach(decode_ber_add_to_list, &populate);
}
-static gboolean ber_decode_as_reset(const char *name _U_, const gpointer pattern _U_)
+static gboolean ber_decode_as_reset(const char *name _U_, gconstpointer pattern _U_)
{
ber_decode_as(NULL);
return FALSE;
}
-static gboolean ber_decode_as_change(const char *name _U_, const gpointer pattern _U_, gpointer handle _U_, gchar* list_name)
+static gboolean ber_decode_as_change(const char *name _U_, gconstpointer pattern _U_, gpointer handle _U_, 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 d251507412..d36c344a0c 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -945,9 +945,9 @@ decode_dcerpc_binding_cmp(gconstpointer a, gconstpointer b)
/* remove a binding (looking the same way as the given one) */
static gboolean
-decode_dcerpc_binding_reset(const char *name _U_, const gpointer pattern)
+decode_dcerpc_binding_reset(const char *name _U_, gconstpointer pattern)
{
- decode_dcerpc_bind_values_t *binding = (decode_dcerpc_bind_values_t*)pattern;
+ const decode_dcerpc_bind_values_t *binding = (const decode_dcerpc_bind_values_t *)pattern;
GSList *le;
decode_dcerpc_bind_values_t *old_binding;
@@ -970,7 +970,7 @@ decode_dcerpc_binding_reset(const char *name _U_, const gpointer pattern)
}
static gboolean
-dcerpc_decode_as_change(const char *name, const gpointer pattern, gpointer handle, gchar* list_name)
+dcerpc_decode_as_change(const char *name, gconstpointer pattern, gpointer handle, gchar* list_name)
{
decode_dcerpc_bind_values_t *binding = (decode_dcerpc_bind_values_t*)pattern;
decode_dcerpc_bind_values_t *stored_binding;
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index 310d50f9b8..17aec9ea85 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -6303,14 +6303,14 @@ proto_register_dvbci(void)
for(i=0; i<array_length(spdu_info); i++) {
g_hash_table_insert(spdu_table,
GUINT_TO_POINTER((guint)spdu_info[i].tag),
- (const gpointer)(&spdu_info[i]));
+ (gpointer)(&spdu_info[i]));
}
apdu_table = g_hash_table_new(g_direct_hash, g_direct_equal);
for(i=0; i<array_length(apdu_info); i++) {
g_hash_table_insert(apdu_table,
GUINT_TO_POINTER((guint)apdu_info[i].tag),
- (const gpointer)(&apdu_info[i]));
+ (gpointer)(&apdu_info[i]));
}
proto_dvbci = proto_register_protocol("DVB Common Interface", "DVB-CI", "dvb-ci");
diff --git a/epan/dissectors/packet-hdcp2.c b/epan/dissectors/packet-hdcp2.c
index a5af74e725..cc9ff70785 100644
--- a/epan/dissectors/packet-hdcp2.c
+++ b/epan/dissectors/packet-hdcp2.c
@@ -290,7 +290,7 @@ proto_register_hdcp2(void)
for(i=0; i<array_length(msg_info); i++) {
g_hash_table_insert(msg_table,
GUINT_TO_POINTER((guint)msg_info[i].id),
- (const gpointer)(&msg_info[i]));
+ (gpointer)(&msg_info[i]));
}
proto_hdcp2 = proto_register_protocol(
diff --git a/epan/dissectors/packet-zvt.c b/epan/dissectors/packet-zvt.c
index 76f9228666..540c7a17b9 100644
--- a/epan/dissectors/packet-zvt.c
+++ b/epan/dissectors/packet-zvt.c
@@ -877,7 +877,7 @@ proto_register_zvt(void)
for(i=0; i<array_length(apdu_info); i++) {
g_hash_table_insert(apdu_table,
GUINT_TO_POINTER((guint)apdu_info[i].ctrl),
- (const gpointer)(&apdu_info[i]));
+ (gpointer)(&apdu_info[i]));
}
proto_zvt = proto_register_protocol(
diff --git a/epan/packet.c b/epan/packet.c
index 90f417006a..343eb3040d 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -1980,14 +1980,14 @@ typedef struct dissector_foreach_table_info {
* This is used if we directly process the hash table.
*/
static void
-dissector_all_tables_foreach_table_func (gpointer key, const gpointer value, const gpointer user_data)
+dissector_all_tables_foreach_table_func (gpointer key, gpointer value, gpointer user_data)
{
dissector_table_t table;
dissector_foreach_table_info_t *info;
table = (dissector_table_t)value;
info = (dissector_foreach_table_info_t *)user_data;
- (*info->caller_func)((gchar*)key, table->ui_name, info->caller_data);
+ (*info->caller_func)((gchar *)key, table->ui_name, info->caller_data);
}
/*
@@ -2415,12 +2415,12 @@ typedef struct heur_dissector_foreach_table_info {
* This is used if we directly process the hash table.
*/
static void
-dissector_all_heur_tables_foreach_table_func (gpointer key, const gpointer value, const gpointer user_data)
+dissector_all_heur_tables_foreach_table_func (gpointer key, gpointer value, gpointer user_data)
{
heur_dissector_foreach_table_info_t *info;
info = (heur_dissector_foreach_table_info_t *)user_data;
- (*info->caller_func)((gchar*)key, (struct heur_dissector_list *)value, info->caller_data);
+ (*info->caller_func)((gchar *)key, (struct heur_dissector_list *)value, info->caller_data);
}
/*
@@ -2478,7 +2478,7 @@ display_heur_dissector_table_entries(const char *table_name,
}
static void
-dissector_dump_heur_decodes_display(const gchar *table_name, struct heur_dissector_list *listptr _U_, const gpointer user_data _U_)
+dissector_dump_heur_decodes_display(const gchar *table_name, struct heur_dissector_list *listptr _U_, gpointer user_data _U_)
{
heur_dissector_table_foreach(table_name, display_heur_dissector_table_entries, NULL);
}
@@ -2774,7 +2774,7 @@ void call_heur_dissector_direct(heur_dtbl_entry_t *heur_dtbl_entry, tvbuff_t *tv
static void
dissector_dump_decodes_display(const gchar *table_name,
- ftenum_t selector_type _U_, const gpointer key, const gpointer value,
+ ftenum_t selector_type _U_, gpointer key, gpointer value,
gpointer user_data _U_)
{
guint32 selector = GPOINTER_TO_UINT (key);
diff --git a/epan/packet.h b/epan/packet.h
index f8e9ae9db0..f1f0862d7a 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -109,7 +109,7 @@ typedef enum {
} dissector_table_allow_e;
typedef void (*DATFunc) (const gchar *table_name, ftenum_t selector_type,
- const gpointer key, gpointer value, gpointer user_data);
+ gpointer key, gpointer value, gpointer user_data);
typedef void (*DATFunc_handle) (const gchar *table_name, gpointer value,
gpointer user_data);
typedef void (*DATFunc_table) (const gchar *table_name, const gchar *ui_name,
diff --git a/epan/proto.c b/epan/proto.c
index 5c66291985..696831f7c0 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -8037,7 +8037,7 @@ typedef struct {
} offset_search_t;
static gboolean
-check_for_offset(proto_node *node, const gpointer data)
+check_for_offset(proto_node *node, gpointer data)
{
field_info *fi = PNODE_FINFO(node);
offset_search_t *offsearch = (offset_search_t *)data;
@@ -8078,7 +8078,7 @@ proto_find_field_from_offset(proto_tree *tree, guint offset, tvbuff_t *tvb)
static gboolean
-check_for_undecoded(proto_node *node, const gpointer data)
+check_for_undecoded(proto_node *node, gpointer data)
{
field_info *fi = PNODE_FINFO(node);
gchar* decoded = (gchar*)data;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 01:25:59 +0000