From 136a6b0d3574aa4fc7aea0d11ee7ec76ed3dc175 Mon Sep 17 00:00:00 2001
From: Hinnerk van Bruinehsen <h.v.bruinehsen@fu-berlin.de>
Date: Fri, 12 Sep 2014 15:55:51 +0200
Subject: [PATCH] dist: linux-border_router: reduce scope

---
 dist/tools/linux-border_router/multiplex.c    | 3 +--
 dist/tools/linux-border_router/serial.c       | 3 ++-
 dist/tools/linux-border_router/sixlowdriver.c | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dist/tools/linux-border_router/multiplex.c b/dist/tools/linux-border_router/multiplex.c
index bccfab43b9..9a76447ba7 100644
--- a/dist/tools/linux-border_router/multiplex.c
+++ b/dist/tools/linux-border_router/multiplex.c
@@ -60,12 +60,11 @@ uint8_t serial_read_byte()
 int readpacket(uint8_t *packet_buf, size_t size)
 {
     uint8_t *line_buf_ptr = packet_buf;
-    uint8_t byte = END + 1;
     uint8_t esc = 0;
     uint8_t translate = 1;
 
     while ((line_buf_ptr - packet_buf) < size - 1) {
-        byte = serial_read_byte();
+        uint8_t byte = serial_read_byte();
 
         if (translate && byte == END) {
             break;
diff --git a/dist/tools/linux-border_router/serial.c b/dist/tools/linux-border_router/serial.c
index b8ef526b5a..fb422317b3 100644
--- a/dist/tools/linux-border_router/serial.c
+++ b/dist/tools/linux-border_router/serial.c
@@ -111,7 +111,7 @@ static void report_open_error(const char *filename, int err)
     struct passwd *p;
     struct group *g;
     mode_t perm;
-    int r, perm_ok = 0;
+    int r;
 
     printf("\r\n");
     printf("Unable to open \"%s\"\r\n", filename);
@@ -198,6 +198,7 @@ static void report_open_error(const char *filename, int err)
     else {
         printf("%s is not read/write for everybody, so\r\n", filename);
         printf("  you must match either user or group permission\r\n");
+        int perm_ok = 0;
 
         if ((perm & S_IRUSR) && (perm & S_IWUSR)) {
             printf("%s has read/write permission for user %s\r\n",
diff --git a/dist/tools/linux-border_router/sixlowdriver.c b/dist/tools/linux-border_router/sixlowdriver.c
index d0f1911d0e..8e9e6f8df4 100644
--- a/dist/tools/linux-border_router/sixlowdriver.c
+++ b/dist/tools/linux-border_router/sixlowdriver.c
@@ -101,10 +101,9 @@ int tun_to_serial_packet(uint8_t *serial_packet, uint8_t *tun_packet, size_t pac
 void *tun_reader_f(void *args)
 {
     unsigned char data[BUFFER_SIZE];
-    size_t bytes;
 
     while (1) {
-        bytes = read(tun_fd, (void *)data, BUFFER_SIZE);
+        size_t bytes = read(tun_fd, (void *)data, BUFFER_SIZE);
 
         if (bytes > 0) {
             bytes = tun_to_serial_packet(tun_in_buf, (uint8_t *)data, bytes);