diff options
| -rw-r--r-- | gtk/about_dlg.c | 22 | ||||
| -rw-r--r-- | gtk/about_dlg.h | 4 | ||||
| -rw-r--r-- | gtk/export_object.c | 2 | ||||
| -rw-r--r-- | gtk/export_object.h | 4 | ||||
| -rw-r--r-- | gtk/gui_utils.c | 2 | ||||
| -rw-r--r-- | gtk/hostlist_table.c | 10 | ||||
| -rw-r--r-- | gtk/hostlist_table.h | 2 | ||||
| -rw-r--r-- | gtk/main.c | 4 | ||||
| -rw-r--r-- | gtk/summary_dlg.c | 2 | ||||
| -rw-r--r-- | register.h | 2 | ||||
| -rw-r--r-- | statusbar.h | 4 | ||||
| -rw-r--r-- | ui_util.h | 2 |
12 files changed, 30 insertions, 30 deletions
diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c index 8f3b3dc44b..4f30ab16d2 100644 --- a/gtk/about_dlg.c +++ b/gtk/about_dlg.c @@ -81,7 +81,7 @@ about_wireshark(GtkWidget *parent, GtkWidget *main_vb, const char *title) } static void -splash_update_label(GtkWidget *win, char *message) +splash_update_label(GtkWidget *win, const char *message) { GtkWidget *main_lb; @@ -96,7 +96,7 @@ splash_update_label(GtkWidget *win, char *message) } GtkWidget* -splash_new(char *message) +splash_new(const char *message) { GtkWidget *win; GtkWidget *main_lb; @@ -153,16 +153,16 @@ splash_new(char *message) #define REGISTER_FREQ 100 /* Milliseconds */ void -splash_update(register_action_e action, char *message, gpointer client_data) +splash_update(register_action_e action, const char *message, gpointer client_data) { - GtkWidget *win; - GtkWidget *main_lb; - GtkWidget *prog_bar; - GtkWidget *percentage_lb; - gfloat percentage; - gulong ul_percentage; - gchar tmp[100]; - char *action_msg; + GtkWidget *win; + GtkWidget *main_lb; + GtkWidget *prog_bar; + GtkWidget *percentage_lb; + gfloat percentage; + gulong ul_percentage; + gchar tmp[100]; + const char *action_msg; static gulong ul_sofar = 0; static gulong ul_count = 0; diff --git a/gtk/about_dlg.h b/gtk/about_dlg.h index d80a658893..180ca01702 100644 --- a/gtk/about_dlg.h +++ b/gtk/about_dlg.h @@ -35,7 +35,7 @@ * @param message the new message to be displayed * @return the newly created window handle */ -extern GtkWidget *splash_new(char *message); +extern GtkWidget *splash_new(const char *message); /** Update the splash screen message when loading dissectors and handoffs * @@ -43,7 +43,7 @@ extern GtkWidget *splash_new(char *message); * @param message additional information * @param client_data the window handle from splash_new() */ -extern void splash_update(register_action_e action, char *message, void *call_data); +extern void splash_update(register_action_e action, const char *message, void *call_data); /** Destroy the splash screen. * diff --git a/gtk/export_object.c b/gtk/export_object.c index 191ca443f9..3e72e1a986 100644 --- a/gtk/export_object.c +++ b/gtk/export_object.c @@ -253,7 +253,7 @@ eo_draw(void *tapdata) } void -export_object_window(gchar *tapname, gchar *name, tap_packet_cb tap_packet) +export_object_window(const gchar *tapname, const gchar *name, tap_packet_cb tap_packet) { GtkWidget *sw; GtkCellRenderer *renderer; diff --git a/gtk/export_object.h b/gtk/export_object.h index 919a0f6463..35987a8584 100644 --- a/gtk/export_object.h +++ b/gtk/export_object.h @@ -46,8 +46,8 @@ typedef struct _export_object_entry_t { guint8 *payload_data; } export_object_entry_t; -void export_object_window(gchar *tapname, gchar *name, tap_packet_cb - tap_packet); +void export_object_window(const gchar *tapname, const gchar *name, + tap_packet_cb tap_packet); /* Protocol specific */ void eo_http_cb(GtkWidget *widget _U_, gpointer data _U_); diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c index 9dcd52b897..11645a6fe3 100644 --- a/gtk/gui_utils.c +++ b/gtk/gui_utils.c @@ -581,7 +581,7 @@ GtkWidget *xpm_to_widget(const char ** xpm) { /* Set the name of the top-level window and its icon to the specified string. */ void -set_main_window_name(gchar *window_name) +set_main_window_name(const gchar *window_name) { gchar *old_window_name; diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index ef6e1c337d..99d1f3c867 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -811,7 +811,7 @@ hostlist_win_destroy_notebook_cb(GtkWindow *win _U_, gpointer data) static hostlist_table * -init_hostlist_notebook_page_cb(gboolean hide_ports, char *table_name, char *tap_name, char *filter, tap_packet_cb packet_func) +init_hostlist_notebook_page_cb(gboolean hide_ports, const char *table_name, const char *tap_name, const char *filter, tap_packet_cb packet_func) { gboolean ret; GtkWidget *page_vbox; @@ -837,9 +837,9 @@ init_hostlist_notebook_page_cb(gboolean hide_ports, char *table_name, char *tap_ typedef struct { gboolean hide_ports; /* hide TCP / UDP port columns */ - char *table_name; /* GUI output name */ - char *tap_name; /* internal name */ - char *filter; /* display filter string (unused) */ + const char *table_name; /* GUI output name */ + const char *tap_name; /* internal name */ + const char *filter; /* display filter string (unused) */ tap_packet_cb packet_func; /* function to be called for new incoming packets */ } register_hostlist_t; @@ -847,7 +847,7 @@ typedef struct { static GSList *registered_hostlist_tables = NULL; void -register_hostlist_table(gboolean hide_ports, char *table_name, char *tap_name, char *filter, tap_packet_cb packet_func) +register_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap_name, const char *filter, tap_packet_cb packet_func) { register_hostlist_t *table; diff --git a/gtk/hostlist_table.h b/gtk/hostlist_table.h index bd7794017c..523f042f03 100644 --- a/gtk/hostlist_table.h +++ b/gtk/hostlist_table.h @@ -66,7 +66,7 @@ typedef struct _hostlist_table { * @param filter the optional filter name or NULL * @param packet_func the function to be called for each incoming packet */ -extern void register_hostlist_table(gboolean hide_ports, char *table_name, char *tap_name, char *filter, tap_packet_cb packet_func); +extern void register_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap_name, const char *filter, tap_packet_cb packet_func); /** Init the hostlist table for the single hostlist window. * diff --git a/gtk/main.c b/gtk/main.c index 3052828bcb..8b18cf7b1e 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -926,7 +926,7 @@ void resolve_name_cb(GtkWidget *widget _U_, gpointer data _U_) { * Push a message referring to file access onto the statusbar. */ void -statusbar_push_file_msg(gchar *msg) +statusbar_push_file_msg(const gchar *msg) { /*g_warning("statusbar_push: %s", msg);*/ gtk_statusbar_push(GTK_STATUSBAR(info_bar), file_ctx, msg); @@ -950,7 +950,7 @@ statusbar_pop_file_msg(void) * Push a message referring to the currently-selected field onto the statusbar. */ void -statusbar_push_field_msg(gchar *msg) +statusbar_push_field_msg(const gchar *msg) { gtk_statusbar_push(GTK_STATUSBAR(info_bar), help_ctx, msg); } diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index d286f2740e..84ebfa3782 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -51,7 +51,7 @@ static void -add_string_to_table_sensitive(GtkWidget *list, guint *row, gchar *title, gchar *value, gboolean sensitive) +add_string_to_table_sensitive(GtkWidget *list, guint *row, const gchar *title, const gchar *value, gboolean sensitive) { GtkWidget *label; gchar *indent; diff --git a/register.h b/register.h index b11420a717..ea54a83adb 100644 --- a/register.h +++ b/register.h @@ -39,7 +39,7 @@ typedef enum { RA_CONFIGURATION /* configuration files */ } register_action_e; -typedef void (*register_cb)(register_action_e action, char *message, gpointer client_data); +typedef void (*register_cb)(register_action_e action, const char *message, gpointer client_data); extern void register_all_protocols(register_cb cb, gpointer client_data); extern void register_all_protocol_handoffs(register_cb cb, gpointer client_data); diff --git a/statusbar.h b/statusbar.h index 728de7aee0..303ddf372c 100644 --- a/statusbar.h +++ b/statusbar.h @@ -32,7 +32,7 @@ extern "C" { /* * Push a message referring to file access onto the statusbar. */ -void statusbar_push_file_msg(gchar *msg); +void statusbar_push_file_msg(const gchar *msg); /* * Pop a message referring to file access off the statusbar. @@ -42,7 +42,7 @@ void statusbar_pop_file_msg(void); /* * Push a message referring to the currently-selected field onto the statusbar. */ -void statusbar_push_field_msg(gchar *msg); +void statusbar_push_field_msg(const gchar *msg); /* * Pop a message referring to the currently-selected field off the statusbar. @@ -34,7 +34,7 @@ extern "C" { /* gui_utils.c */ /* Set the name of the top-level window and its icon. */ -void set_main_window_name(gchar *); +void set_main_window_name(const gchar *); /* Update the name of the main window if the user-specified decoration changed. */ void update_main_window_name(void); |