Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 16 Apr 2014 12:29:45 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r264539 - head/sbin/route
Message-ID:  <201404161229.s3GCTjdM010645@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: bz
Date: Wed Apr 16 12:29:45 2014
New Revision: 264539
URL: http://svnweb.freebsd.org/changeset/base/264539

Log:
  When switching variables to flags in r243185 a few cases were missed.
  After r263152 this leaves unused variables if route(8) is compiled
  without INET support.
  Switch the remaining variable accesses to flags and remove now obsolete
  variables.
  
  Reviewed by:	glebius
  MFC after:	1 week

Modified:
  head/sbin/route/route.c

Modified: head/sbin/route/route.c
==============================================================================
--- head/sbin/route/route.c	Wed Apr 16 11:28:38 2014	(r264538)
+++ head/sbin/route/route.c	Wed Apr 16 12:29:45 2014	(r264539)
@@ -90,7 +90,7 @@ static struct keytab {
 static struct sockaddr_storage so[RTAX_MAX];
 static int	pid, rtm_addrs;
 static int	s;
-static int	forcehost, forcenet, nflag, af, qflag, tflag;
+static int	nflag, af, qflag, tflag;
 static int	verbose, aflen;
 static int	locking, lockrest, debugonly;
 static struct rt_metrics rt_metrics;
@@ -1245,7 +1245,7 @@ getaddr(int idx, char *str, struct hoste
 		 */
 		switch (idx) {
 		case RTAX_DST:
-			forcenet++;
+			nrflags |= F_FORCENET;
 			getaddr(RTAX_NETMASK, str, 0, nrflags);
 			break;
 		}
@@ -1308,10 +1308,10 @@ getaddr(int idx, char *str, struct hoste
 		}
 		*q = '/';
 	}
-	if ((idx != RTAX_DST || forcenet == 0) &&
+	if ((idx != RTAX_DST || (nrflags & F_FORCENET) == 0) &&
 	    inet_aton(str, &sin->sin_addr)) {
 		val = sin->sin_addr.s_addr;
-		if (idx != RTAX_DST || forcehost ||
+		if (idx != RTAX_DST || nrflags & F_FORCEHOST ||
 		    inet_lnaof(sin->sin_addr) != INADDR_ANY)
 			return (1);
 		else {
@@ -1319,7 +1319,7 @@ getaddr(int idx, char *str, struct hoste
 			goto netdone;
 		}
 	}
-	if (idx == RTAX_DST && forcehost == 0 &&
+	if (idx == RTAX_DST && (nrflags & F_FORCEHOST) == 0 &&
 	    ((val = inet_network(str)) != INADDR_NONE ||
 	    ((np = getnetbyname(str)) != NULL && (val = np->n_net) != 0))) {
 netdone:

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404161229.s3GCTjdM010645>