diff options
Diffstat (limited to 'color_filters.c')
| -rw-r--r-- | color_filters.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/color_filters.c b/color_filters.c index 869a6e506d..b9a0429333 100644 --- a/color_filters.c +++ b/color_filters.c @@ -76,15 +76,12 @@ color_filter_new(const gchar *name, /* The name of the filter to create { color_filter_t *colorf; - colorf = (color_filter_t *)g_malloc(sizeof (color_filter_t)); + colorf = (color_filter_t *)g_malloc0(sizeof (color_filter_t)); colorf->filter_name = g_strdup(name); colorf->filter_text = g_strdup(filter_string); colorf->bg_color = *bg_color; colorf->fg_color = *fg_color; colorf->disabled = disabled; - colorf->c_colorfilter = NULL; - colorf->color_edit_dlg_info = NULL; - colorf->selected = FALSE; return colorf; } @@ -119,7 +116,6 @@ color_filters_add_tmp(GSList **cfl) BLUE_COMPONENT(cval) ); colorf = color_filter_new(name, NULL, &bg_color, &fg_color, TRUE); colorf->filter_text = g_strdup("frame"); - colorf->c_colorfilter = NULL; *cfl = g_slist_append(*cfl, colorf); g_free(name); @@ -683,7 +679,7 @@ color_filters_read_globals(gpointer user_data) /* read filters from some other filter file (import) */ gboolean -color_filters_import(gchar *path, gpointer user_data) +color_filters_import(const gchar *path, const gpointer user_data) { FILE *f; gboolean ret; @@ -731,7 +727,7 @@ write_filter(gpointer filter_arg, gpointer data_arg) /* save filters in a filter file */ static gboolean -write_filters_file(GSList *cfl, FILE *f, gboolean only_selected) +write_filters_file(const GSList *cfl, FILE *f, gboolean only_selected) { struct write_filter_data data; @@ -739,7 +735,7 @@ write_filters_file(GSList *cfl, FILE *f, gboolean only_selected) data.only_selected = only_selected; fprintf(f,"# DO NOT EDIT THIS FILE! It was created by Wireshark\n"); - g_slist_foreach(cfl, write_filter, &data); + g_slist_foreach((GSList *) cfl, write_filter, &data); return TRUE; } @@ -777,7 +773,7 @@ color_filters_write(GSList *cfl) /* save filters in some other filter file (export) */ gboolean -color_filters_export(gchar *path, GSList *cfl, gboolean only_marked) +color_filters_export(const gchar *path, const GSList *cfl, gboolean only_marked) { FILE *f; |