const gpointer -> gconstpointer

'const gpointer' is the same as 'void *const'. Replace with gconstpointer
where straightforward (assuming that was the intent) and use gpointer everywhere
else for clarity (that does not change *API* constness contract; it just means
a variable is not declared immutable inside the called funtion).

Change-Id: Iad2ef13205bfb4ff0056b2bce056353b58942267
Reviewed-on: https://code.wireshark.org/review/13945
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

19 files changed, 44 insertions, 44 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;
diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c
index d905a76547..0d9788b36f 100644
--- a/ui/decode_as_utils.c
+++ b/ui/decode_as_utils.c
@@ -183,7 +183,7 @@ load_decode_as_entries(void)
 
 void
 decode_build_reset_list (const gchar *table_name, ftenum_t selector_type,
-                         const gpointer key, gpointer value _U_,
+                         gpointer key, gpointer value _U_,
                          gpointer user_data _U_)
 {
     dissector_delete_item_t *item;
diff --git a/ui/gtk/dfilter_expr_dlg.c b/ui/gtk/dfilter_expr_dlg.c
index bf813f1a2a..713a4b1391 100644
--- a/ui/gtk/dfilter_expr_dlg.c
+++ b/ui/gtk/dfilter_expr_dlg.c
@@ -75,7 +75,7 @@ static void build_enum_values(GtkWidget *value_list_scrolled_win,
                               GtkWidget *value_list,
                               const value_string *values);
 static void add_value_list_item(GtkWidget *value_list, const gchar *string,
-                                const gpointer data);
+                                gconstpointer data);
 static void display_value_fields(header_field_info *hfinfo,
                                  gboolean is_comparison, GtkWidget *value_label,
                                  GtkWidget *value_entry,
@@ -346,7 +346,7 @@ build_boolean_values(GtkWidget *value_list_scrolled_win, GtkWidget *value_list,
      */
     if (values == NULL)
         values = &tfs_true_false;
-    add_value_list_item(value_list, values->true_string, (gpointer) values);
+    add_value_list_item(value_list, values->true_string, values);
     add_value_list_item(value_list, values->false_string, NULL);
 
     /*
@@ -387,7 +387,7 @@ build_enum_values(GtkWidget *value_list_scrolled_win _U_, GtkWidget *value_list,
      * Build the list.
      */
     while (values->strptr != NULL) {
-        add_value_list_item(value_list, values->strptr, (const gpointer) values);
+        add_value_list_item(value_list, values->strptr, values);
         values++;
     }
 
@@ -398,7 +398,7 @@ build_enum_values(GtkWidget *value_list_scrolled_win _U_, GtkWidget *value_list,
 }
 
 static void
-add_value_list_item(GtkWidget *value_list, const gchar *string, const gpointer data)
+add_value_list_item(GtkWidget *value_list, const gchar *string, gconstpointer data)
 {
     GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(value_list)));
     GtkTreeIter       iter;
diff --git a/ui/gtk/gui_utils.c b/ui/gtk/gui_utils.c
index 66127274b0..5ff81a280f 100644
--- a/ui/gtk/gui_utils.c
+++ b/ui/gtk/gui_utils.c
@@ -1601,8 +1601,8 @@ GtkTreeIter
 ws_combo_box_append_text_and_pointer_full(GtkComboBox    *combo_box,
                                           GtkTreeIter    *parent_iter,
                                           const gchar    *text,
-                                          const gpointer  ptr,
-                                          const gboolean  sensitive)
+                                          gconstpointer   ptr,
+                                          gboolean        sensitive)
 {
     GtkTreeIter   iter;
     GtkTreeStore *store;
@@ -1629,7 +1629,7 @@ ws_combo_box_append_text_and_pointer_full(GtkComboBox    *combo_box,
 GtkTreeIter
 ws_combo_box_append_text_and_pointer(GtkComboBox    *combo_box,
                                      const gchar    *text,
-                                     const gpointer  ptr)
+                                     gconstpointer   ptr)
 {
     return ws_combo_box_append_text_and_pointer_full(combo_box, NULL, text, ptr, TRUE);
 }
diff --git a/ui/gtk/gui_utils.h b/ui/gtk/gui_utils.h
index e982752841..0409667411 100644
--- a/ui/gtk/gui_utils.h
+++ b/ui/gtk/gui_utils.h
@@ -474,8 +474,8 @@ GtkTreeIter
 ws_combo_box_append_text_and_pointer_full(GtkComboBox   *combo_box,
                                           GtkTreeIter   *parent_iter,
                                           const gchar   *text,
-                                          const gpointer ptr,
-                                          const gboolean sensitive);
+                                          gconstpointer  ptr,
+                                          gboolean       sensitive);
 
 /**
  * ws_combo_box_append_text_and_pointer:
@@ -491,7 +491,7 @@ ws_combo_box_append_text_and_pointer_full(GtkComboBox   *combo_box,
 GtkTreeIter
 ws_combo_box_append_text_and_pointer(GtkComboBox    *combo_box,
                                      const gchar    *text,
-                                     const gpointer  ptr);
+                                     gconstpointer   ptr);
 
 /**
  * ws_combo_box_get_active_pointer:
diff --git a/ui/gtk/progress_dlg.c b/ui/gtk/progress_dlg.c
index 670662b91f..3e65547345 100644
--- a/ui/gtk/progress_dlg.c
+++ b/ui/gtk/progress_dlg.c
@@ -78,7 +78,7 @@ struct progdlg {
  * be read.
  */
 progdlg_t *
-create_progress_dlg(const gpointer top_level_window _U_, const gchar *task_title, const gchar *item_title,
+create_progress_dlg(gpointer top_level_window _U_, const gchar *task_title, const gchar *item_title,
                     gboolean terminate_is_stop, gboolean *stop_flag)
 {
     progdlg_t *dlg;
@@ -226,7 +226,7 @@ create_progress_dlg(const gpointer top_level_window _U_, const gchar *task_title
 }
 
 progdlg_t *
-delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_title,
+delayed_create_progress_dlg(gpointer top_level_window, const gchar *task_title,
                             const gchar *item_title, gboolean terminate_is_stop,
                             gboolean *stop_flag, const GTimeVal *start_time, gfloat progress)
 {
diff --git a/ui/progress_dlg.h b/ui/progress_dlg.h
index 032fa7b51c..531784679e 100644
--- a/ui/progress_dlg.h
+++ b/ui/progress_dlg.h
@@ -55,7 +55,7 @@ typedef struct progdlg progdlg_t;
  *   set to TRUE if the user hits that button
  * @return The newly created progress dialog
  */
-progdlg_t *create_progress_dlg(const gpointer top_level_window, const gchar *task_title, const gchar *item_title,
+progdlg_t *create_progress_dlg(gpointer top_level_window, const gchar *task_title, const gchar *item_title,
     gboolean terminate_is_stop, gboolean *stop_flag);
 
 /**
@@ -76,8 +76,7 @@ progdlg_t *create_progress_dlg(const gpointer top_level_window, const gchar *tas
  * @param progress The current progress (0..1)
  * @return The newly created progress dialog
  */
-progdlg_t *
-delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_title, const gchar *item_title,
+progdlg_t *delayed_create_progress_dlg(gpointer top_level_window, const gchar *task_title, const gchar *item_title,
     gboolean terminate_is_stop, gboolean *stop_flag,
     const GTimeVal *start_time, gfloat progress);
 
diff --git a/ui/qt/progress_frame.cpp b/ui/qt/progress_frame.cpp
index 1957e7beb7..d7cf65c3a1 100644
--- a/ui/qt/progress_frame.cpp
+++ b/ui/qt/progress_frame.cpp
@@ -40,7 +40,8 @@
 // - Start adding the progress bar to dialogs.
 // - Don't complain so loudly when the user stops a capture.
 
-progdlg_t *create_progress_dlg(const gpointer top_level_window, const gchar *, const gchar *,
+progdlg_t *
+create_progress_dlg(gpointer top_level_window, const gchar *, const gchar *,
                                gboolean terminate_is_stop, gboolean *stop_flag) {
     ProgressFrame *pf;
     QWidget *main_window;
@@ -64,7 +65,7 @@ progdlg_t *create_progress_dlg(const gpointer top_level_window, const gchar *, c
 }
 
 progdlg_t *
-delayed_create_progress_dlg(const gpointer top_level_window, const gchar *task_title, const gchar *item_title,
+delayed_create_progress_dlg(gpointer top_level_window, const gchar *task_title, const gchar *item_title,
                             gboolean terminate_is_stop, gboolean *stop_flag,
                             const GTimeVal *, gfloat progress)
 {