diff options
author | pjd <pjd@FreeBSD.org> | 2010-09-14 11:42:07 +0000 |
---|---|---|
committer | pjd <pjd@FreeBSD.org> | 2010-09-14 11:42:07 +0000 |
commit | 65239d84e5fb0e9cd1fd62e94ba4f044528639e2 (patch) | |
tree | f9e570c105cfc0ce304cd31ae1883749ed22eddd | |
parent | 6ca1075f10acc4f1a39b11c9fa31edac18d8eaad (diff) | |
download | FreeBSD-src-65239d84e5fb0e9cd1fd62e94ba4f044528639e2.zip FreeBSD-src-65239d84e5fb0e9cd1fd62e94ba4f044528639e2.tar.gz |
Simplify the code a bit.
-rw-r--r-- | sys/geom/part/g_part.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index cedc3ac..38f9882 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -297,17 +297,14 @@ g_part_new_provider(struct g_geom *gp, struct g_part_table *table, } static int -g_part_parm_geom(const char *rawname, struct g_geom **v) +g_part_parm_geom(const char *name, struct g_geom **v) { struct g_geom *gp; - const char *pname; - if (strncmp(rawname, _PATH_DEV, strlen(_PATH_DEV)) == 0) - pname = rawname + strlen(_PATH_DEV); - else - pname = rawname; + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); LIST_FOREACH(gp, &g_part_class.geom, geom) { - if (!strcmp(pname, gp->name)) + if (!strcmp(name, gp->name)) break; } if (gp == NULL) @@ -317,14 +314,13 @@ g_part_parm_geom(const char *rawname, struct g_geom **v) } static int -g_part_parm_provider(const char *pname, struct g_provider **v) +g_part_parm_provider(const char *name, struct g_provider **v) { struct g_provider *pp; - if (strncmp(pname, _PATH_DEV, strlen(_PATH_DEV)) == 0) - pp = g_provider_by_name(pname + strlen(_PATH_DEV)); - else - pp = g_provider_by_name(pname); + if (strncmp(name, _PATH_DEV, strlen(_PATH_DEV)) == 0) + name += strlen(_PATH_DEV); + pp = g_provider_by_name(name); if (pp == NULL) return (EINVAL); *v = pp; |