Date: Fri, 10 Apr 2009 09:13:59 +0000 (UTC) From: Ulf Lilleengen <lulf@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r190882 - head/sbin/gvinum Message-ID: <200904100913.n3A9Dx2j037498@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904100913.n3A9Dx2j037498>