From owner-svn-src-all@FreeBSD.ORG  Fri Apr 10 09:13:59 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6648C106564A;
	Fri, 10 Apr 2009 09:13:59 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 54BB98FC0A;
	Fri, 10 Apr 2009 09:13:59 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3A9Dxgf037499;
	Fri, 10 Apr 2009 09:13:59 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3A9Dx2j037498;
	Fri, 10 Apr 2009 09:13:59 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200904100913.n3A9Dx2j037498@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Fri, 10 Apr 2009 09:13:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r190882 - head/sbin/gvinum
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 10 Apr 2009 09:13:59 -0000

Author: lulf
Date: Fri Apr 10 09:13:58 2009
New Revision: 190882
URL: http://svn.freebsd.org/changeset/base/190882

Log:
  - Move logic for finding a unique drive name into its own routine for future
    code reuse.

Modified:
  head/sbin/gvinum/gvinum.c

Modified: head/sbin/gvinum/gvinum.c
==============================================================================
--- head/sbin/gvinum/gvinum.c	Fri Apr 10 08:50:14 2009	(r190881)
+++ head/sbin/gvinum/gvinum.c	Fri Apr 10 09:13:58 2009	(r190882)
@@ -82,6 +82,7 @@ void	printconfig(FILE *, char *);
 char	*create_drive(char *);
 void	 create_volume(int, char **, char *);
 char	*find_name(const char *, int, int);
+char	*find_drive(const char *);
 char	*find_pattern(char *, char *);
 
 int
@@ -422,11 +423,7 @@ create_drive(char *device)
 	drives = 1;
 	dname = NULL;
 
-	/* Strip away eventual /dev/ in front. */
-	if (strncmp(device, "/dev/", 5) == 0)
-		device += 5;
-
-	drivename = find_name("gvinumdrive", GV_TYPE_DRIVE, GV_MAXDRIVENAME);
+	drivename = find_drive(device);
 	if (drivename == NULL)
 		return (NULL);
 
@@ -628,6 +625,16 @@ find_name(const char *prefix, int type, 
 	return (NULL);
 }
 
+char *
+find_drive(const char *device)
+{
+
+	/* Strip away eventual /dev/ in front. */
+	if (strncmp(device, "/dev/", 5) == 0)
+		device += 5;
+	return (find_name("gvinumdrive", GV_TYPE_DRIVE, GV_MAXDRIVENAME));
+}
+
 /* Detach a plex or subdisk from its parent. */
 void
 gvinum_detach(int argc, char **argv)