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

1 files changed, 4 insertions, 4 deletions

diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c
index ec4f2cb8ff..639dbb0847 100644
--- a/ui/gtk/camel_srt.c
+++ b/ui/gtk/camel_srt.c
@@ -66,7 +66,7 @@ static int camelsrt_packet(void *phs,
 
 static void camelsrt_draw(void *phs);
 static void win_destroy_cb(GtkWindow *win _U_, gpointer data);
-static void gtk_camelsrt_init(const char *optarg, void *userdata _U_);
+static void gtk_camelsrt_init(const char *opt_arg, void *userdata _U_);
 void register_tap_listener_gtk_camelsrt(void);
 
 /*
@@ -131,7 +131,7 @@ static void win_destroy_cb(GtkWindow *win _U_, gpointer data)
   g_free(hs);
 }
 
-static void gtk_camelsrt_init(const char *optarg, void *userdata _U_)
+static void gtk_camelsrt_init(const char *opt_arg, void *userdata _U_)
 {
   struct camelsrt_t * p_camelsrt;
   const char *filter=NULL;
@@ -146,8 +146,8 @@ static void gtk_camelsrt_init(const char *optarg, void *userdata _U_)
   GtkWidget *close_bt;
   int i;
 
-  if(strncmp(optarg,"camel,srt,",10) == 0){
-    filter=optarg+10;
+  if(strncmp(opt_arg,"camel,srt,",10) == 0){
+    filter=opt_arg+10;
   } else {
     filter=NULL;
   }