aboutsummaryrefslogtreecommitdiff
path: root/sbin/mdconfig
diff options
context:
space:
mode:
authorJaakko Heinonen <jh@FreeBSD.org>2010-01-22 08:51:58 +0000
committerJaakko Heinonen <jh@FreeBSD.org>2010-01-22 08:51:58 +0000
commita4ca6a4926c8de8c821493d1d095fe4fc49482bb (patch)
treec62daf77b9389a37dd1e913d23aab68a5aa64b3a /sbin/mdconfig
parente48fbf26e8940e6273461aaa13820ead71d7243c (diff)
downloadsrc-a4ca6a4926c8de8c821493d1d095fe4fc49482bb.tar.gz
src-a4ca6a4926c8de8c821493d1d095fe4fc49482bb.zip
Make mdconfig(8) WARNS=6 clean:
- Constify geom_config_get() name argument. - Add void keyword for usage(). - Initialize mdunit to NULL. - Don't call md_prthumanval() at all if length is NULL. Approved by: trasz (mentor)
Notes
Notes: svn path=/head/; revision=202784
Diffstat (limited to 'sbin/mdconfig')
-rw-r--r--sbin/mdconfig/Makefile1
-rw-r--r--sbin/mdconfig/mdconfig.c13
2 files changed, 6 insertions, 8 deletions
diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile
index 11223f228398..f4d8adcfde8d 100644
--- a/sbin/mdconfig/Makefile
+++ b/sbin/mdconfig/Makefile
@@ -4,7 +4,6 @@ PROG= mdconfig
MAN= mdconfig.8
MLINKS= mdconfig.8 vnconfig.8
-WARNS?= 2
DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
LDADD= -lutil -lgeom -lbsdxml -lsbuf
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index ec667c51ad52..a5644848a4d9 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -41,7 +41,7 @@ static void usage(void);
static int md_find(char *, const char *);
static int md_query(char *name);
static int md_list(char *units, int opt);
-static char *geom_config_get(struct gconf *g, char *name);
+static char *geom_config_get(struct gconf *g, const char *name);
static void md_prthumanval(char *length);
#define OPT_VERBOSE 0x01
@@ -52,7 +52,7 @@ static void md_prthumanval(char *length);
#define CLASS_NAME_MD "MD"
static void
-usage()
+usage(void)
{
fprintf(stderr,
"usage: mdconfig -a -t type [-n] [-o [no]option] ... [-f file]\n"
@@ -74,7 +74,7 @@ main(int argc, char **argv)
int ch, fd, i, vflag;
char *p;
int cmdline = 0;
- char *mdunit;
+ char *mdunit = NULL;
bzero(&mdio, sizeof(mdio));
mdio.md_file = malloc(PATH_MAX);
@@ -379,10 +379,9 @@ md_list(char *units, int opt)
if (strcmp(type, "vnode") == 0)
file = geom_config_get(gc, "file");
length = geom_config_get(gc, "length");
- if (length == NULL)
- length = "<a>";
printf("\t%s\t", type);
- md_prthumanval(length);
+ if (length != NULL)
+ md_prthumanval(length);
if (file != NULL) {
printf("\t%s", file);
file = NULL;
@@ -409,7 +408,7 @@ md_list(char *units, int opt)
* Returns value of 'name' from gconfig structure.
*/
static char *
-geom_config_get(struct gconf *g, char *name)
+geom_config_get(struct gconf *g, const char *name)
{
struct gconfig *gce;