aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/conversations_ipv6.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2012-12-05 15:56:36 +0000
committerBill Meier <wmeier@newsguy.com>2012-12-05 15:56:36 +0000
commit7cd0417af555a78b19c6909a40d1867e0fe9a063 (patch)
treecc09f739029479eee683f26228e098db307fd1aa /ui/gtk/conversations_ipv6.c
parentf8ba6b5a077fa89f1d1e55b5bed4bab0ea6b11cf (diff)
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/conversations_ipv6.c')
-rw-r--r--ui/gtk/conversations_ipv6.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/conversations_ipv6.c b/ui/gtk/conversations_ipv6.c
index 02b44a5d3e..3bc2ee8307 100644
--- a/ui/gtk/conversations_ipv6.c
+++ b/ui/gtk/conversations_ipv6.c
@@ -58,12 +58,12 @@ ipv6_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_,
static void
-ipv6_conversation_init(const char *optarg, void *userdata _U_)
+ipv6_conversation_init(const char *opt_arg, void *userdata _U_)
{
const char *filter=NULL;
- if(!strncmp(optarg, "conv,ipv6,", 10)) {
- filter = optarg + 10;
+ if(!strncmp(opt_arg, "conv,ipv6,", 10)) {
+ filter = opt_arg + 10;
}
else {
filter = NULL;