svn commit: r202784 - head/sbin/mdconfig

Jaakko Heinonen jh at FreeBSD.org
Fri Jan 22 08:51:58 UTC 2010


Author: jh
Date: Fri Jan 22 08:51:58 2010
New Revision: 202784
URL: http://svn.freebsd.org/changeset/base/202784

Log:
  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)

Modified:
  head/sbin/mdconfig/Makefile
  head/sbin/mdconfig/mdconfig.c

Modified: head/sbin/mdconfig/Makefile
==============================================================================
--- head/sbin/mdconfig/Makefile	Fri Jan 22 08:45:12 2010	(r202783)
+++ head/sbin/mdconfig/Makefile	Fri Jan 22 08:51:58 2010	(r202784)
@@ -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
 

Modified: head/sbin/mdconfig/mdconfig.c
==============================================================================
--- head/sbin/mdconfig/mdconfig.c	Fri Jan 22 08:45:12 2010	(r202783)
+++ head/sbin/mdconfig/mdconfig.c	Fri Jan 22 08:51:58 2010	(r202784)
@@ -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;
 


More information about the svn-src-head mailing list