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)
This commit is contained in:
parent
e48fbf26e8
commit
a4ca6a4926
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=202784
@ -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
|
||||
|
||||
|
@ -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,9 +379,8 @@ 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);
|
||||
if (length != NULL)
|
||||
md_prthumanval(length);
|
||||
if (file != NULL) {
|
||||
printf("\t%s", file);
|
||||
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user