Simplify the code a bit.

This commit is contained in:
Pawel Jakub Dawidek 2010-09-14 11:42:07 +00:00
parent d1db39d90e
commit b312136354

View File

@ -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;