From owner-svn-src-head@freebsd.org  Mon May 22 20:11:42 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27237D79776;
 Mon, 22 May 2017 20:11:42 +0000 (UTC)
 (envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id ED4B91A62;
 Mon, 22 May 2017 20:11:41 +0000 (UTC)
 (envelope-from oshogbo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4MKBf3g087345;
 Mon, 22 May 2017 20:11:41 GMT (envelope-from oshogbo@FreeBSD.org)
Received: (from oshogbo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4MKBf4v087344;
 Mon, 22 May 2017 20:11:41 GMT (envelope-from oshogbo@FreeBSD.org)
Message-Id: <201705222011.v4MKBf4v087344@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to
 oshogbo@FreeBSD.org using -f
From: Mariusz Zaborski <oshogbo@FreeBSD.org>
Date: Mon, 22 May 2017 20:11:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r318678 - head/sys/boot/common
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 May 2017 20:11:42 -0000

Author: oshogbo
Date: Mon May 22 20:11:40 2017
New Revision: 318678
URL: https://svnweb.freebsd.org/changeset/base/318678

Log:
  Replacing iterating over rootpath by strsep(3).
  
  Submitted by:	kczekirda
  Reviewed by:	tsoome, bapt, jhb, oshogbo
  MFC after:	3 weeks
  Sponsored by:	Oktawave
  Differential Revision:	https://reviews.freebsd.org/D10726

Modified:
  head/sys/boot/common/dev_net.c

Modified: head/sys/boot/common/dev_net.c
==============================================================================
--- head/sys/boot/common/dev_net.c	Mon May 22 20:00:01 2017	(r318677)
+++ head/sys/boot/common/dev_net.c	Mon May 22 20:11:40 2017	(r318678)
@@ -387,16 +387,14 @@ net_print(int verbose)
 uint32_t
 net_parse_rootpath()
 {
-	int i;
 	n_long addr = INADDR_NONE;
+	char *ptr;
 
-	for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++)
-		if (rootpath[i] == ':')
-			break;
-	if (i && i != FNAME_SIZE && rootpath[i] == ':') {
-		rootpath[i++] = '\0';
-		addr = inet_addr(&rootpath[0]);
-		bcopy(&rootpath[i], rootpath, strlen(&rootpath[i])+1);
+	ptr = rootpath;
+	(void)strsep(&ptr, ":");
+	if (ptr != NULL) {
+		addr = inet_addr(rootpath);
+		bcopy(ptr, rootpath, strlen(ptr) + 1);
 	}
 
 	return (addr);