diff options
| author | Dario Lombardo <lomato@gmail.com> | 2016-06-23 17:39:43 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-26 06:02:09 +0000 |
| commit | 916958ca828ac55d09e641e0fe81219c96017fe3 (patch) | |
| tree | ba1726154f259ac7a4dced2118a8327d25c19982 /ui | |
| parent | bfb6f62e368825d862d2ceac91662a6e6de06ddd (diff) | |
filter: rename shadow var
Change-Id: Idc18f2988754fc21b1f8f2dcadfe5e3dd31d5545
Reviewed-on: https://code.wireshark.org/review/16102
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/filter_expression_save_dlg.c | 4 | ||||
| -rw-r--r-- | ui/gtk/prefs_filter_expressions.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c index 8ce4c60cde..922fa68ec4 100644 --- a/ui/gtk/filter_expression_save_dlg.c +++ b/ui/gtk/filter_expression_save_dlg.c @@ -112,7 +112,7 @@ filter_expression_reinit(int what) gint maxindx = -1, indx; fe = *pfilter_expression_head; while (fe != NULL) { - maxindx = MAX(maxindx, fe->index); + maxindx = MAX(maxindx, fe->filter_index); fe = fe->next; } @@ -126,7 +126,7 @@ filter_expression_reinit(int what) for (indx = 0; indx <= maxindx; indx++) { if (prevhead != NULL) { fe = prevhead; - while (fe != NULL && fe->index != indx) + while (fe != NULL && fe->filter_index != indx) fe = fe->next; } if (fe == NULL) diff --git a/ui/gtk/prefs_filter_expressions.c b/ui/gtk/prefs_filter_expressions.c index 5770086dcb..f3ae59c93c 100644 --- a/ui/gtk/prefs_filter_expressions.c +++ b/ui/gtk/prefs_filter_expressions.c @@ -160,7 +160,7 @@ filter_expressions_prefs_show(void) { fe = *pfilter_expression_head; while (fe != NULL) { - fe->index = -1; + fe->filter_index = -1; gtk_list_store_insert_with_values(store, &iter, G_MAXINT, ENABLED_COLUMN, fe->enabled, LABEL_COLUMN, fe->label, @@ -342,7 +342,7 @@ filter_expressions_prefs_fetch(GtkWidget *w) while (items_left) { gtk_tree_model_get(model, &iter, DATA_COLUMN, &fe, -1); if (fe != NULL) - fe->index = indx++; + fe->filter_index = indx++; items_left = gtk_tree_model_iter_next (model, &iter); } @@ -351,7 +351,7 @@ filter_expressions_prefs_fetch(GtkWidget *w) gtk_list_store_clear(store); fe = *pfilter_expression_head; while (fe != NULL) { - fe->index = -1; + fe->filter_index = -1; gtk_list_store_insert_with_values(store, &iter, G_MAXINT, ENABLED_COLUMN, fe->enabled, LABEL_COLUMN, fe->label, |