From f0ca71273ec5cada05bedea3198c9abcf27d3c2a Mon Sep 17 00:00:00 2001 From: phk Date: Mon, 8 Apr 2002 08:57:21 +0000 Subject: Catch up with const'ification of and quelch warnings. --- lib/libc/gen/disklabel.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/lib/libc/gen/disklabel.c b/lib/libc/gen/disklabel.c index 9e4e395..aa406d4 100644 --- a/lib/libc/gen/disklabel.c +++ b/lib/libc/gen/disklabel.c @@ -50,11 +50,21 @@ __FBSDID("$FreeBSD$"); #include #include -static int gettype(char *, char **); +static int +gettype(char *t, const char **names) +{ + const char **nm; + + for (nm = names; *nm; nm++) + if (strcasecmp(t, *nm) == 0) + return (nm - names); + if (isdigit((unsigned char)*t)) + return (atoi(t)); + return (0); +} struct disklabel * -getdiskbyname(name) - const char *name; +getdiskbyname(const char *name) { static struct disklabel disk; struct disklabel *dp = &disk; @@ -152,18 +162,3 @@ getdiskbyname(name) free(buf); return (dp); } - -static int -gettype(t, names) - char *t; - char **names; -{ - char **nm; - - for (nm = names; *nm; nm++) - if (strcasecmp(t, *nm) == 0) - return (nm - names); - if (isdigit((unsigned char)*t)) - return (atoi(t)); - return (0); -} -- cgit v1.1