From: Guus Sliepen <guus@tinc-vpn.org>
Date: Mon, 1 Nov 2004 17:02:19 +0000 (+0000)
Subject: static
X-Git-Tag: release-1.0.3~20
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=1f00810da336f3b7132df17b7fe4625748ff4b63;p=tinc

static
---

diff --git a/src/cygwin/device.c b/src/cygwin/device.c
index 2818cd25..e96ef1d9 100644
--- a/src/cygwin/device.c
+++ b/src/cygwin/device.c
@@ -40,11 +40,11 @@ char *device = NULL;
 char *iface = NULL;
 char *device_info = NULL;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
-pid_t reader_pid;
-int sp[2];
+static pid_t reader_pid;
+static int sp[2];
 
 bool setup_device(void)
 {
diff --git a/src/darwin/device.c b/src/darwin/device.c
index c3f3c0b8..691a4084 100644
--- a/src/darwin/device.c
+++ b/src/darwin/device.c
@@ -39,8 +39,8 @@ int device_fd = -1;
 char *device;
 char *iface;
 char *device_info;
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 static device_type_t device_type = DEVICE_TYPE_TUN;
 
 bool setup_device(void)
diff --git a/src/freebsd/device.c b/src/freebsd/device.c
index 43dbb920..2d9a0eb2 100644
--- a/src/freebsd/device.c
+++ b/src/freebsd/device.c
@@ -33,8 +33,8 @@ int device_fd = -1;
 char *device;
 char *iface;
 char *device_info;
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
 bool setup_device(void)
 {
diff --git a/src/linux/device.c b/src/linux/device.c
index 74e39473..4299a934 100644
--- a/src/linux/device.c
+++ b/src/linux/device.c
@@ -46,14 +46,14 @@ typedef enum device_type_t {
 } device_type_t;
 
 int device_fd = -1;
-device_type_t device_type;
+static device_type_t device_type;
 char *device;
 char *iface;
 char ifrname[IFNAMSIZ];
 char *device_info;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
 bool setup_device(void)
 {
diff --git a/src/mingw/device.c b/src/mingw/device.c
index 2d2b9250..02063268 100644
--- a/src/mingw/device.c
+++ b/src/mingw/device.c
@@ -35,13 +35,13 @@
 #include "mingw/common.h"
 
 int device_fd = 0;
-HANDLE device_handle = INVALID_HANDLE_VALUE;
+static HANDLE device_handle = INVALID_HANDLE_VALUE;
 char *device = NULL;
 char *iface = NULL;
 char *device_info = NULL;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
 extern char *myport;
 
diff --git a/src/netbsd/device.c b/src/netbsd/device.c
index 43628e7f..53198e4c 100644
--- a/src/netbsd/device.c
+++ b/src/netbsd/device.c
@@ -37,8 +37,8 @@ char *device;
 char *iface;
 char *device_info;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
 bool setup_device(void)
 {
diff --git a/src/openbsd/device.c b/src/openbsd/device.c
index aa0150a9..92c3c030 100644
--- a/src/openbsd/device.c
+++ b/src/openbsd/device.c
@@ -30,16 +30,13 @@
 
 #define DEFAULT_DEVICE "/dev/tun0"
 
-#define DEVICE_TYPE_ETHERTAP 0
-#define DEVICE_TYPE_TUNTAP 1
-
 int device_fd = -1;
 char *device;
 char *iface;
 char *device_info;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
 bool setup_device(void)
 {
diff --git a/src/raw_socket/device.c b/src/raw_socket/device.c
index 0de3fd67..188cb2ec 100644
--- a/src/raw_socket/device.c
+++ b/src/raw_socket/device.c
@@ -48,8 +48,8 @@ char *interface;
 char ifrname[IFNAMSIZ];
 char *device_info;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
 bool setup_device(void)
 {
diff --git a/src/solaris/device.c b/src/solaris/device.c
index 89b5f797..4bd88d73 100644
--- a/src/solaris/device.c
+++ b/src/solaris/device.c
@@ -37,11 +37,10 @@
 int device_fd = -1;
 char *device = NULL;
 char *iface = NULL;
-char ifrname[IFNAMSIZ];
 char *device_info = NULL;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
 bool setup_device(void)
 {
diff --git a/src/uml_socket/device.c b/src/uml_socket/device.c
index 528a66f0..9d8bb490 100644
--- a/src/uml_socket/device.c
+++ b/src/uml_socket/device.c
@@ -43,8 +43,8 @@ char *device_info;
 extern char *identname;
 extern bool running;
 
-int device_total_in = 0;
-int device_total_out = 0;
+static int device_total_in = 0;
+static int device_total_out = 0;
 
 enum request_type { REQ_NEW_CONTROL };