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/compare_stat.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/compare_stat.c')
-rw-r--r-- | ui/gtk/compare_stat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c index 4a80b5ce2b..62d36c34e7 100644 --- a/ui/gtk/compare_stat.c +++ b/ui/gtk/compare_stat.c @@ -685,7 +685,7 @@ setup_tree_view(GtkWidget *treeview) /* when called, this function will create a new instance of gtk2-comparestat. */ static void -gtk_comparestat_init(const char *optarg, void* userdata _U_) +gtk_comparestat_init(const char *opt_arg, void* userdata _U_) { compstat_t *cs; char *display_name; @@ -702,12 +702,12 @@ gtk_comparestat_init(const char *optarg, void* userdata _U_) const char *filter=NULL; GString *error_string; - if(sscanf(optarg,"compare,%d,%d,%d,%d,%lf%n",&start, &stop, &ttl, &order, &variance, &pos)==5){ + if(sscanf(opt_arg,"compare,%d,%d,%d,%d,%lf%n",&start, &stop, &ttl, &order, &variance, &pos)==5){ if(pos){ - if(*(optarg+pos)==',') - filter=optarg+pos+1; + if(*(opt_arg+pos)==',') + filter=opt_arg+pos+1; else - filter=optarg+pos; + filter=opt_arg+pos; } else { filter=NULL; } |