From owner-svn-src-projects@FreeBSD.ORG  Tue Nov  2 14:29:39 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D51831065674;
	Tue,  2 Nov 2010 14:29:39 +0000 (UTC)
	(envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C403B8FC16;
	Tue,  2 Nov 2010 14:29:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA2ETdvx055163;
	Tue, 2 Nov 2010 14:29:39 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA2ETdMb055161;
	Tue, 2 Nov 2010 14:29:39 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201011021429.oA2ETdMb055161@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Tue, 2 Nov 2010 14:29:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214679 - projects/sv/sys/netinet
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Nov 2010 14:29:39 -0000

Author: attilio
Date: Tue Nov  2 14:29:39 2010
New Revision: 214679
URL: http://svn.freebsd.org/changeset/base/214679

Log:
  Remove the reserved use of word "none" for interface name and use a
  flag instead.
  
  Requested by:	rwatson

Modified:
  projects/sv/sys/netinet/netdump_client.c

Modified: projects/sv/sys/netinet/netdump_client.c
==============================================================================
--- projects/sv/sys/netinet/netdump_client.c	Tue Nov  2 14:08:21 2010	(r214678)
+++ projects/sv/sys/netinet/netdump_client.c	Tue Nov  2 14:29:39 2010	(r214679)
@@ -225,14 +225,15 @@ sysctl_nic(SYSCTL_HANDLER_ARGS)
 	char buf[arg2+1];
 	int error;
 	int len;
+	int invalid;
 
+	invalid = 0;
 	if (*(struct ifnet **)arg1) {
 		error = SYSCTL_OUT(req,
 				(*(struct ifnet **)arg1)->if_xname,
 				strlen((*(struct ifnet **)arg1)->if_xname));
-	} else {
-		error = SYSCTL_OUT(req, "none", 5);
-	}
+	} else
+		invalid = 1;
 
 	if (error || !req->newptr)
 		return error;
@@ -241,14 +242,13 @@ sysctl_nic(SYSCTL_HANDLER_ARGS)
 	if (len >= arg2) {
 		error = EINVAL;
 	} else {
-		error = SYSCTL_IN(req, buf, len);
-		buf[len]='\0';
-		if (error)
-			return error;
-
-		if (!strcmp(buf, "none")) {
+		if (invalid != 0)
 			ifp = NULL;
-		} else {
+		else {
+			error = SYSCTL_IN(req, buf, len);
+			buf[len]='\0';
+			if (error)
+				return error;
 			IFNET_RLOCK_NOSLEEP();
 			if ((ifp = TAILQ_FIRST(&V_ifnet)) != NULL) do {
 				if (!strcmp(ifp->if_xname, buf)) break;