dht-bootstrap.c | 19 +++++++------------

diff --git a/dht-bootstrap.c b/dht-bootstrap.c
index 28f3fd26e4281a4b5545a6b50f6a5964bb2113b8..eef8b06884657f982a2aa518912bc524d11cef70 100644
--- a/dht-bootstrap.c
+++ b/dht-bootstrap.c
@@ -131,13 +131,13 @@     int tail;
     struct node nodes[CIRCULAR_LIST_SIZE];
 };
 
-struct circular_list v4_new, v6_new, v4_confirmed, v6_confirmed;
+static struct circular_list v4_new, v6_new, v4_confirmed, v6_confirmed;
 
 #define MAX_TOKEN_BUCKET_TOKENS 40
 static time_t token_bucket_time;
 static int token_bucket_tokens;
 
-FILE *dht_debug = NULL;
+static FILE *dht_debug = NULL;
 
 #ifdef __GNUC__
 __attribute__((format(printf, 1, 2)))
@@ -431,13 +431,12 @@
     if (argc < i + 1)
         goto usage;
 
-    const char *port = strdup(argv[i++]);
-
+    const char *ourPort = strdup(argv[i++]);
     if (ipv4addr != NULL) {
-        dht_socket = newSock(ipv4addr, port);
+        dht_socket = newSock(ipv4addr, ourPort);
     }
     if (ipv6addr != NULL) {
-        dht_socket6 = newSock(ipv6addr, port);
+        dht_socket6 = newSock(ipv6addr, ourPort);
     }
 
     arc4random_buf(myid, sizeof myid);
@@ -508,15 +507,13 @@                 list_elements(&v6_confirmed),
                 list_elements(&v4_new),
                 list_elements(&v6_new));
 
-        int rc = poll(fds, 2, tv_sec * 1000 + tv_msec);
-
+        rc = poll(fds, 2, tv_sec * 1000 + tv_msec);
         if (rc < 0) {
             perror("poll");
             sleep(1);
         }
 
         if (rc > 0) {
-            int rc = 0;
             int message;
             unsigned char tid[16], id[20], info_hash[20], target[20];
             unsigned char buf[1536], nodes[256], nodes6[1024], token[128];
@@ -542,7 +539,7 @@                     fprintf(stderr, "error in fds[1]");
                     rc = -1;
                 } else {
                     rc = recvfrom(dht_socket6, buf, 1536, 0, source, &sourcelen);
-                };
+                }
             }
 
             if (rc < 0 || sourcelen > sizeof(struct sockaddr_storage))
@@ -696,8 +693,6 @@             else if (!list_empty(&v6_confirmed))
                 send_request(&v6_confirmed, 0, 0, want);
         }
     }
-
-    return 0;
 
 usage:
     fprintf(stderr, "dht-bootstrap [-q] [-4 ADDR4] [-6 ADDR6] port [node port...]\n");