From: Sami Kerola <kerolasa@iki.fi>
Date: Mon, 22 Aug 2016 21:34:05 +0000 (+0100)
Subject: data types: check with smatch everything is in resonable scope
X-Git-Tag: v0.88~26^2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=757615a92bbd6d251c6743e3ffc4f6f4a204364b;p=thirdparty%2Fmtr.git

data types: check with smatch everything is in resonable scope

Now when extern variables, and functions are known one can start thinking
about how get rid of global variables.
---

diff --git a/net.c b/net.c
index 065b5a9..68ed736 100644
--- a/net.c
+++ b/net.c
@@ -172,45 +172,44 @@ static struct nethost host[MaxHost];
 static struct sequence sequence[MaxSequence];
 static struct timeval reset = { 0, 0 };
 
-int    timestamp;
-int    sendsock4;
-int    sendsock4_icmp;
-int    sendsock4_udp;
-int    recvsock4;
-int    sendsock6;
-int    sendsock6_icmp;
-int    sendsock6_udp;
-int    recvsock6;
-int    sendsock;
-int    recvsock;
+static int    sendsock4;
+static int    sendsock4_icmp;
+static int    sendsock4_udp;
+static int    recvsock4;
+static int    sendsock6;
+static int    sendsock6_icmp;
+static int    sendsock6_udp;
+static int    recvsock6;
+static int    sendsock;
+static int    recvsock;
 ip_t   unspec_addr;
 
 #ifdef ENABLE_IPV6
-struct sockaddr_storage sourcesockaddr_struct;
-struct sockaddr_storage remotesockaddr_struct;
-struct sockaddr_in6 * ssa6 = (struct sockaddr_in6 *) &sourcesockaddr_struct;
-struct sockaddr_in6 * rsa6 = (struct sockaddr_in6 *) &remotesockaddr_struct;
+static struct sockaddr_storage sourcesockaddr_struct;
+static struct sockaddr_storage remotesockaddr_struct;
+static struct sockaddr_in6 * ssa6 = (struct sockaddr_in6 *) &sourcesockaddr_struct;
+static struct sockaddr_in6 * rsa6 = (struct sockaddr_in6 *) &remotesockaddr_struct;
 #else
-struct sockaddr_in sourcesockaddr_struct;
-struct sockaddr_in remotesockaddr_struct;
+static struct sockaddr_in sourcesockaddr_struct;
+static struct sockaddr_in remotesockaddr_struct;
 #endif
 
-struct sockaddr * sourcesockaddr = (struct sockaddr *) &sourcesockaddr_struct;
-struct sockaddr * remotesockaddr = (struct sockaddr *) &remotesockaddr_struct;
-struct sockaddr_in * ssa4 = (struct sockaddr_in *) &sourcesockaddr_struct;
-struct sockaddr_in * rsa4 = (struct sockaddr_in *) &remotesockaddr_struct;
+static struct sockaddr * sourcesockaddr = (struct sockaddr *) &sourcesockaddr_struct;
+static struct sockaddr * remotesockaddr = (struct sockaddr *) &remotesockaddr_struct;
+static struct sockaddr_in * ssa4 = (struct sockaddr_in *) &sourcesockaddr_struct;
+static struct sockaddr_in * rsa4 = (struct sockaddr_in *) &remotesockaddr_struct;
 
-ip_t * sourceaddress;
-ip_t * remoteaddress;
+static ip_t * sourceaddress;
+static ip_t * remoteaddress;
 
 /* XXX How do I code this to be IPV6 compatible??? */
 #ifdef ENABLE_IPV6
-char localaddr[INET6_ADDRSTRLEN];
+static char localaddr[INET6_ADDRSTRLEN];
 #else
 #ifndef INET_ADDRSTRLEN
 #define INET_ADDRSTRLEN 16
 #endif
-char localaddr[INET_ADDRSTRLEN];
+static char localaddr[INET_ADDRSTRLEN];
 #endif
 
 static int batch_at = 0;
@@ -235,7 +234,7 @@ extern int mark;		/* SO_MARK to set for ping packet*/
 
 /* return the number of microseconds to wait before sending the next
    ping */
-int calc_deltatime (float waittime)
+extern int calc_deltatime (float waittime)
 {
   waittime /= numhosts;
   return 1000000 * waittime;
diff --git a/select.c b/select.c
index cbf8e25..41bc801 100644
--- a/select.c
+++ b/select.c
@@ -45,9 +45,9 @@ extern int MaxPing;
 extern int ForceMaxPing;
 extern float WaitTime;
 extern float GraceTime;
-double dnsinterval;
 extern int mtrtype;
 
+static double dnsinterval;
 static struct timeval intervaltime;
 int display_offset = 0;
 
diff --git a/split.c b/split.c
index 9cbb5e5..408c748 100644
--- a/split.c
+++ b/split.c
@@ -60,8 +60,8 @@ extern int af;
 #define MAX_LINE_COUNT 256
 #define MAX_LINE_SIZE  256
 
-char Lines[MAX_LINE_COUNT][MAX_LINE_SIZE];
-int  LineCount;
+static char Lines[MAX_LINE_COUNT][MAX_LINE_SIZE];
+static int  LineCount;
 
 
 #define DEBUG 0