osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

filter: rename shadow var 

Change-Id: Idc18f2988754fc21b1f8f2dcadfe5e3dd31d5545
Reviewed-on: https://code.wireshark.org/review/16102
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Dario Lombardo 2016-06-23 17:39:43 +02:00 committed by Anders Broman
parent bfb6f62e36
commit 916958ca82
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/filter_expressions.c
View File

@ -57,7 +57,7 @@ filter_expression_new(const gchar *label, const gchar *expr,
while (prev->next != NULL) while (prev->next != NULL)
prev = prev->next; prev = prev->next;
prev->next = expression; prev->next = expression;
expression->index = prev->index + 1; expression->filter_index = prev->filter_index + 1;
} }
return(expression); return(expression);

2
epan/filter_expressions.h
View File

@ -38,7 +38,7 @@ struct filter_expression {
gchar *label; gchar *label;
gchar *expression; gchar *expression;
gint index; gint filter_index;
gboolean enabled; /* Can be set to FALSE by Preferences Dialog */ gboolean enabled; /* Can be set to FALSE by Preferences Dialog */
gboolean deleted; /* Can be set to TRUE by Preferences Dialog (GTK+ only) */ gboolean deleted; /* Can be set to TRUE by Preferences Dialog (GTK+ only) */

4
ui/gtk/filter_expression_save_dlg.c
View File

@ -112,7 +112,7 @@ filter_expression_reinit(int what)
gint maxindx = -1, indx; gint maxindx = -1, indx;
fe = *pfilter_expression_head; fe = *pfilter_expression_head;
while (fe != NULL) { while (fe != NULL) {
maxindx = MAX(maxindx, fe->index); maxindx = MAX(maxindx, fe->filter_index);
fe = fe->next; fe = fe->next;
} }
@ -126,7 +126,7 @@ filter_expression_reinit(int what)
for (indx = 0; indx <= maxindx; indx++) { for (indx = 0; indx <= maxindx; indx++) {
if (prevhead != NULL) { if (prevhead != NULL) {
fe = prevhead; fe = prevhead;
while (fe != NULL && fe->index != indx) while (fe != NULL && fe->filter_index != indx)
fe = fe->next; fe = fe->next;
} }
if (fe == NULL) if (fe == NULL)

6
ui/gtk/prefs_filter_expressions.c
View File

@ -160,7 +160,7 @@ filter_expressions_prefs_show(void) {
fe = *pfilter_expression_head; fe = *pfilter_expression_head;
while (fe != NULL) { while (fe != NULL) {
fe->index = -1; fe->filter_index = -1;
gtk_list_store_insert_with_values(store, &iter, G_MAXINT, gtk_list_store_insert_with_values(store, &iter, G_MAXINT,
ENABLED_COLUMN, fe->enabled, ENABLED_COLUMN, fe->enabled,
LABEL_COLUMN, fe->label, LABEL_COLUMN, fe->label,
@ -342,7 +342,7 @@ filter_expressions_prefs_fetch(GtkWidget *w)
while (items_left) { while (items_left) {
gtk_tree_model_get(model, &iter, DATA_COLUMN, &fe, -1); gtk_tree_model_get(model, &iter, DATA_COLUMN, &fe, -1);
if (fe != NULL) if (fe != NULL)
fe->index = indx++; fe->filter_index = indx++;
items_left = gtk_tree_model_iter_next (model, &iter); items_left = gtk_tree_model_iter_next (model, &iter);
} }
@ -351,7 +351,7 @@ filter_expressions_prefs_fetch(GtkWidget *w)
gtk_list_store_clear(store); gtk_list_store_clear(store);
fe = *pfilter_expression_head; fe = *pfilter_expression_head;
while (fe != NULL) { while (fe != NULL) {
fe->index = -1; fe->filter_index = -1;
gtk_list_store_insert_with_values(store, &iter, G_MAXINT, gtk_list_store_insert_with_values(store, &iter, G_MAXINT,
ENABLED_COLUMN, fe->enabled, ENABLED_COLUMN, fe->enabled,
LABEL_COLUMN, fe->label, LABEL_COLUMN, fe->label,