diff options
author | Ulf Lamping <ulf.lamping@web.de> | 2005-03-25 22:52:45 +0000 |
---|---|---|
committer | Ulf Lamping <ulf.lamping@web.de> | 2005-03-25 22:52:45 +0000 |
commit | 008d4b81067862dee3cfe71180688cfc66f81230 (patch) | |
tree | d5a082165e508052d0817ea4685d59c8ea2641a6 /color_filters.c | |
parent | d46de2e0def09ecdb0a41f06f956c22e54d75f97 (diff) |
code cleanup: the term filter_list was used with different meanings throughout the code, and the filter_list of the color_filters is "global".
use appropriate prefixes to avoid confusion and bugs
svn path=/trunk/; revision=13905
Diffstat (limited to 'color_filters.c')
-rw-r--r-- | color_filters.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/color_filters.c b/color_filters.c index f76e4036d1..e7a06b9eb7 100644 --- a/color_filters.c +++ b/color_filters.c @@ -47,7 +47,7 @@ static gboolean read_global_filters(void); /* Variables and routines defined in color.h */ -GSList *filter_list = NULL; +GSList *color_filter_list = NULL; GSList *removed_filter_list = NULL; /* Remove the specified filter from the list of existing color filters, @@ -58,7 +58,7 @@ GSList *removed_filter_list = NULL; void remove_color_filter(color_filter_t *colorf) { /* Remove colorf from the list of color filters */ - filter_list = g_slist_remove(filter_list, colorf); + color_filter_list = g_slist_remove(color_filter_list, colorf); /* Add colorf to the list of removed color filters */ removed_filter_list = g_slist_prepend(removed_filter_list, colorf); } @@ -88,9 +88,9 @@ delete_color_filter_it(gpointer filter_arg, gpointer unused _U_) static void delete_all_color_filters (void) { - g_slist_foreach(filter_list, delete_color_filter_it, NULL); - g_slist_free(filter_list); - filter_list = NULL; + g_slist_foreach(color_filter_list, delete_color_filter_it, NULL); + g_slist_free(color_filter_list); + color_filter_list = NULL; g_slist_foreach(removed_filter_list, delete_color_filter_it, NULL); g_slist_free(removed_filter_list); removed_filter_list = NULL; @@ -122,7 +122,7 @@ new_color_filter(gchar *name, /* The name of the filter to create */ colorf->c_colorfilter = NULL; colorf->edit_dialog = NULL; colorf->marked = FALSE; - filter_list = g_slist_append(filter_list, colorf); + color_filter_list = g_slist_append(color_filter_list, colorf); return colorf; } @@ -137,11 +137,11 @@ prime_edt(gpointer data, gpointer user_data) } /* Prime the epan_dissect_t with all the compiler - * color filters in 'filter_list'. */ + * color filters in 'color_filter_list'. */ void filter_list_prime_edt(epan_dissect_t *edt) { - g_slist_foreach(filter_list, prime_edt, edt); + g_slist_foreach(color_filter_list, prime_edt, edt); } /* read filters from the given file */ @@ -402,7 +402,7 @@ write_filters_file(FILE *f, gboolean only_marked) data.only_marked = only_marked; fprintf(f,"# DO NOT EDIT THIS FILE! It was created by Ethereal\n"); - g_slist_foreach(filter_list, write_filter, &data); + g_slist_foreach(color_filter_list, write_filter, &data); return TRUE; } |