Fix some variable shadowing (no bugs).

misc/find_program.h

@@ -84,16 +84,16 @@ static char * badvpn_find_program (const char *name)
     const char *dirs[] = {"/usr/sbin", "/usr/bin", "/sbin", "/bin", NULL};
     
     for (size_t i = 0; dirs[i]; i++) {
-        char *path = concat_strings(3, dirs[i], "/", name);
-        if (!path) {
+        char *try_path = concat_strings(3, dirs[i], "/", name);
+        if (!try_path) {
             goto fail;
         }
         
-        if (access(path, X_OK) == 0) {
-            return path;
+        if (access(try_path, X_OK) == 0) {
+            return try_path;
         }
         
-        free(path);
+        free(try_path);
     }
     
 fail:

ncd/NCDBuildProgram.c

@@ -183,6 +183,7 @@ static char * make_include_path (const char *file_path, const char *dir_path, co
 static int process_file (struct build_state *st, int depth, const char *file_path, NCDProgram *out_program, int *out_guarded)
 {
     int ret_val = 0;
+    int res;
     
     if (depth > MAX_INCLUDE_DEPTH) {
         BLog(BLOG_ERROR, "file '%s': maximum include depth (%d) exceeded (include cycle?)", file_path, (int)MAX_INCLUDE_DEPTH);
@@ -202,7 +203,7 @@ static int process_file (struct build_state *st, int depth, const char *file_pat
     }
     
     NCDProgram program;
-    int res = NCDConfigParser_Parse((char *)data, len, &program);
+    res = NCDConfigParser_Parse((char *)data, len, &program);
     free(data);
     if (!res) {
         BLog(BLOG_ERROR, "file '%s': failed to parse", file_path);
@@ -263,7 +264,7 @@ static int process_file (struct build_state *st, int depth, const char *file_pat
         
         NCDProgram included_program;
         int included_guarded;
-        int res = process_file(st, depth + 1, real_target, &included_program, &included_guarded);
+        res = process_file(st, depth + 1, real_target, &included_program, &included_guarded);
         free(real_target);
         if (!res) {
             goto fail2;

ncd/modules/event_template.c

@@ -81,8 +81,8 @@ void event_template_new (event_template *o, NCDModuleInst *i, int blog_channel,
     // init events lists
     LinkedList1_Init(&o->events_list);
     LinkedList1_Init(&o->free_list);
-    for (int i = 0; i < maxevents; i++) {
-        LinkedList1_Append(&o->free_list, &o->events[i].events_list_node);
+    for (int j = 0; j < maxevents; j++) {
+        LinkedList1_Append(&o->free_list, &o->events[j].events_list_node);
     }
     
     // set not enabled

tun2socks/tun2socks.c

@@ -187,7 +187,7 @@ BPending lwip_init_job;
 
 // lwip netif
 int have_netif;
-struct netif netif;
+struct netif the_netif;
 
 // lwip TCP listener
 struct tcp_pcb *listener;
@@ -424,7 +424,7 @@ int main (int argc, char **argv)
     
     // free netif
     if (have_netif) {
-        netif_remove(&netif);
+        netif_remove(&the_netif);
     }
     
     BReactor_RemoveTimer(&ss, &tcp_timer);
@@ -872,25 +872,25 @@ void lwip_init_job_hadler (void *unused)
     ip_addr_set_any(&gw);
     
     // init netif
-    if (!netif_add(&netif, &addr, &netmask, &gw, NULL, netif_init_func, netif_input_func)) {
+    if (!netif_add(&the_netif, &addr, &netmask, &gw, NULL, netif_init_func, netif_input_func)) {
         BLog(BLOG_ERROR, "netif_add failed");
         goto fail;
     }
     have_netif = 1;
     
     // set netif up
-    netif_set_up(&netif);
+    netif_set_up(&the_netif);
     
     // set netif pretend TCP
-    netif_set_pretend_tcp(&netif, 1);
+    netif_set_pretend_tcp(&the_netif, 1);
     
     // set netif default
-    netif_set_default(&netif);
+    netif_set_default(&the_netif);
     
     if (options.netif_ip6addr) {
         // add IPv6 address
-        memcpy(netif_ip6_addr(&netif, 0), netif_ip6addr.bytes, sizeof(netif_ip6addr.bytes));
-        netif_ip6_addr_set_state(&netif, 0, IP6_ADDR_VALID);
+        memcpy(netif_ip6_addr(&the_netif, 0), netif_ip6addr.bytes, sizeof(netif_ip6addr.bytes));
+        netif_ip6_addr_set_state(&the_netif, 0, IP6_ADDR_VALID);
     }
     
     // init listener
@@ -1001,7 +1001,7 @@ void device_read_handler_send (void *unused, uint8_t *data, int data_len)
     ASSERT_FORCE(pbuf_take(p, data, data_len) == ERR_OK)
     
     // pass pbuf to input
-    if (netif.input(p, &netif) != ERR_OK) {
+    if (the_netif.input(p, &the_netif) != ERR_OK) {
         BLog(BLOG_WARNING, "device read: input failed");
         pbuf_free(p);
     }

tunctl/tunctl.c

@@ -247,9 +247,9 @@ static int make_tuntap (const char *ifname, int is_tun, const char *user, const
         }
         
         struct passwd pwd;
-        struct passwd *res;
-        getpwnam_r(user, &pwd, buf, bufsize, &res);
-        if (!res) {
+        struct passwd *pwd_res;
+        getpwnam_r(user, &pwd, buf, bufsize, &pwd_res);
+        if (!pwd_res) {
             fprintf(stderr, "Error: getpwnam_r failed\n");
             free(buf);
             goto fail1;
@@ -272,9 +272,9 @@ static int make_tuntap (const char *ifname, int is_tun, const char *user, const
         }
         
         struct group grp;
-        struct group *res;
-        getgrnam_r(group, &grp, buf, bufsize, &res);
-        if (!res) {
+        struct group *grp_res;
+        getgrnam_r(group, &grp, buf, bufsize, &grp_res);
+        if (!grp_res) {
             fprintf(stderr, "Error: getgrnam_r failed\n");
             free(buf);
             goto fail1;