d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

route(1): Pull static variable out of the function and into function scope.

Browse Source 
This will make it easier to link as a library.

Submitted by:	Sebastian Huber <sebastian.huber@embedded-brains.de> (older version)
Discussed on:	-hackers
This commit is contained in:
Eitan Adler 2013-12-04 20:07:34 +00:00
parent b9f2ea4a57
commit 2fc0b58544
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=258937
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/route/route.c
View File

@ -95,6 +95,7 @@ static int defaultfib;
static int numfibs;
static char domain[MAXHOSTNAMELEN + 1];
static bool domain_initialized;
static int rtm_seq;
static int atalk_aton(const char *, struct at_addr *);
static char *atalk_ntoa(struct at_addr, char [ATALK_BUF_SIZE]);
@ -1490,7 +1491,6 @@ static struct {
static int
rtmsg(int cmd, int flags, int fib)
{
static int seq;
int rlen;
char *cp = m_rtmsg.m_space;
int l;
@ -1526,7 +1526,7 @@ rtmsg(int cmd, int flags, int fib)
rtm.rtm_type = cmd;
rtm.rtm_flags = flags;
rtm.rtm_version = RTM_VERSION;
rtm.rtm_seq = ++seq;
rtm.rtm_seq = ++rtm_seq;
rtm.rtm_addrs = rtm_addrs;
rtm.rtm_rmx = rt_metrics;
rtm.rtm_inits = rtm_inits;
@ -1551,7 +1551,7 @@ rtmsg(int cmd, int flags, int fib)
if (cmd == RTM_GET) {
do {
l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg));
} while (l > 0 && (rtm.rtm_seq != seq || rtm.rtm_pid != pid));
} while (l > 0 && (rtm.rtm_seq != rtm_seq || rtm.rtm_pid != pid));
if (l < 0)
warn("read from routing socket");
else