diff options
| author | Bill Meier <wmeier@newsguy.com> | 2012-12-05 15:56:36 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2012-12-05 15:56:36 +0000 |
| commit | 7cd0417af555a78b19c6909a40d1867e0fe9a063 (patch) | |
| tree | cc09f739029479eee683f26228e098db307fd1aa /ui/gtk/dlg_utils.c | |
| parent | f8ba6b5a077fa89f1d1e55b5bed4bab0ea6b11cf (diff) | |
| download | wireshark-7cd0417af555a78b19c6909a40d1867e0fe9a063.tar.gz | |
Fix numerous instances of a variable/parameter name "shadowing" a library function name;
(At least some (gcc ?) compilers give a "shadow" warning for these).
svn path=/trunk/; revision=46402
Diffstat (limited to 'ui/gtk/dlg_utils.c')
| -rw-r--r-- | ui/gtk/dlg_utils.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ui/gtk/dlg_utils.c b/ui/gtk/dlg_utils.c index c1c32f2bd3..4855f436df 100644 --- a/ui/gtk/dlg_utils.c +++ b/ui/gtk/dlg_utils.c @@ -115,7 +115,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...) const gchar *cap_details = NULL; #endif const gchar *clear = NULL; - const gchar *close = NULL; + const gchar *closex = NULL; const gchar *copy = NULL; const gchar *create_stat = NULL; const gchar *delete = NULL; @@ -165,7 +165,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...) } else if (strcmp(stock_id, GTK_STOCK_CANCEL) == 0) { cancel = stock_id; } else if (strcmp(stock_id, GTK_STOCK_CLOSE) == 0) { - close = stock_id; + closex = stock_id; } else if (strcmp(stock_id, GTK_STOCK_CLEAR) == 0) { clear = stock_id; } else if (strcmp(stock_id, GTK_STOCK_REFRESH) == 0) { @@ -337,8 +337,8 @@ dlg_button_row_new(const gchar *stock_id_first, ...) dlg_button_new(hbox, button_hbox, ok); return hbox; } - if (save && close) { - dlg_button_new(hbox, button_hbox, close); + if (save && closex) { + dlg_button_new(hbox, button_hbox, closex); dlg_button_new(hbox, button_hbox, save); return hbox; } @@ -364,9 +364,9 @@ dlg_button_row_new(const gchar *stock_id_first, ...) } } if (buttons == 3) { - if (ok && save && close) { + if (ok && save && closex) { dlg_button_new(hbox, button_hbox, save); - dlg_button_new(hbox, button_hbox, close); + dlg_button_new(hbox, button_hbox, closex); dlg_button_new(hbox, button_hbox, ok); return hbox; } @@ -376,9 +376,9 @@ dlg_button_row_new(const gchar *stock_id_first, ...) dlg_button_new(hbox, button_hbox, ok); return hbox; } - if (apply && save && close) { + if (apply && save && closex) { dlg_button_new(hbox, button_hbox, save); - dlg_button_new(hbox, button_hbox, close); + dlg_button_new(hbox, button_hbox, closex); dlg_button_new(hbox, button_hbox, apply); return hbox; } @@ -403,10 +403,10 @@ dlg_button_row_new(const gchar *stock_id_first, ...) dlg_button_new(hbox, button_hbox, ok); return hbox; } - if (ok && apply && save && close) { + if (ok && apply && save && closex) { dlg_button_new(hbox, button_hbox, save); dlg_button_new(hbox, button_hbox, apply); - dlg_button_new(hbox, button_hbox, close); + dlg_button_new(hbox, button_hbox, closex); dlg_button_new(hbox, button_hbox, ok); return hbox; } @@ -439,7 +439,7 @@ dlg_button_row_new(const gchar *stock_id_first, ...) if (follow_stream != NULL) dlg_button_new(hbox, button_hbox, follow_stream); if (graph_a_b != NULL) dlg_button_new(hbox, button_hbox, graph_a_b); if (graph_b_a != NULL) dlg_button_new(hbox, button_hbox, graph_b_a); - if (close != NULL) dlg_button_new(hbox, button_hbox, close); + if (closex != NULL) dlg_button_new(hbox, button_hbox, closex); if (cancel != NULL) dlg_button_new(hbox, button_hbox, cancel); return hbox; |