Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor WARNS=2 stuff

Browse Source
This commit is contained in:
lukem 2001-10-19 01:16:37 +00:00
parent a596720367
commit 8064490359
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sbin/disklabel/disklabel.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disklabel.c,v 1.98 2001/06/15 18:49:37 nonaka Exp $ */
/* $NetBSD: disklabel.c,v 1.99 2001/10/19 01:16:37 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 1993\n\
static char sccsid[] = "@(#)disklabel.c 8.4 (Berkeley) 5/4/95";
/* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */
#else
__RCSID("$NetBSD: disklabel.c,v 1.98 2001/06/15 18:49:37 nonaka Exp $");
__RCSID("$NetBSD: disklabel.c,v 1.99 2001/10/19 01:16:37 lukem Exp $");
#endif
#endif /* not lint */
@ -847,7 +847,7 @@ readlabel(int f)
struct disklabel *lp;
if (rflag || Iflag) {
char *msg;
const char *msg;
off_t sectoffset;
msg = NULL;
@ -1212,7 +1212,7 @@ static int
editit(void)
{
int pid, xpid;
int stat;
int status;
sigset_t sigset, osigset;
sigemptyset(&sigset);
@ -1247,11 +1247,11 @@ editit(void)
perror(ed);
exit(retval);
}
while ((xpid = wait(&stat)) >= 0)
while ((xpid = wait(&status)) >= 0)
if (xpid == pid)
break;
sigprocmask(SIG_SETMASK, &osigset, (sigset_t *)0);
return (!stat);
return (!status);
}
static char *
@ -1291,8 +1291,7 @@ getasciilabel(FILE *f, struct disklabel *lp)
{
const char *const *cpp, *s;
struct partition *pp;
char *cp;
char *tp, line[BUFSIZ];
char *cp, *tp, line[BUFSIZ], tbuf[15];
int v, lineno, errors;
lineno = 0;
@ -1314,8 +1313,10 @@ getasciilabel(FILE *f, struct disklabel *lp)
}
*tp++ = '\0', tp = skip(tp);
if (!strcmp(cp, "type")) {
if (tp == NULL)
tp = "unknown";
if (tp == NULL) {
strlcpy(tbuf, "unknown", sizeof(tbuf));
tp = tbuf;
}
cpp = dktypenames;
for (; cpp < &dktypenames[DKMAXTYPES]; cpp++)
if ((s = *cpp) && !strcasecmp(s, tp)) {
@ -1365,8 +1366,10 @@ getasciilabel(FILE *f, struct disklabel *lp)
lp->d_npartitions = v;
continue;
}
if (tp == NULL)
tp = "";
if (tp == NULL) {
tbuf[0] = '\0';
tp = tbuf;
}
if (!strcmp(cp, "disk")) {
strncpy(lp->d_typename, tp, sizeof(lp->d_typename));
continue;
@ -1774,8 +1777,8 @@ static void
usage(void)
{
static const struct {
char *name;
char *expn;
const char *name;
const char *expn;
} usages[] = {
{ "[-rt] [-C] disk",
"(to read label)" },

6
sbin/disklabel/interact.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: interact.c,v 1.18 2001/05/26 19:48:32 christos Exp $ */
/* $NetBSD: interact.c,v 1.19 2001/10/19 01:16:38 lukem Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: interact.c,v 1.18 2001/05/26 19:48:32 christos Exp $");
__RCSID("$NetBSD: interact.c,v 1.19 2001/10/19 01:16:38 lukem Exp $");
#endif /* lint */
#include <sys/param.h>
@ -622,7 +622,7 @@ dumpnames(const char *prompt, const char * const *olist, size_t numentries)
printf("%s%s", i == 0 ? "" : ", ", list[i]);
puts("");
#endif
(void)qsort((void *)list, numentries, sizeof(char *), alphacmp);
(void)qsort(list, numentries, sizeof(char *), alphacmp);
width++; /* want two spaces between items */
width = (width + 8) &~ 7;

8
sbin/disklabel/printlabel.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: printlabel.c,v 1.2 2001/05/26 19:48:32 christos Exp $ */
/* $NetBSD: printlabel.c,v 1.3 2001/10/19 01:16:38 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: printlabel.c,v 1.2 2001/05/26 19:48:32 christos Exp $");
__RCSID("$NetBSD: printlabel.c,v 1.3 2001/10/19 01:16:38 lukem Exp $");
#endif /* not lint */
#include <sys/param.h>
@ -53,11 +53,11 @@ __RCSID("$NetBSD: printlabel.c,v 1.2 2001/05/26 19:48:32 christos Exp $");
void
showinfo(FILE *f, struct disklabel *lp, const char *specname)
showinfo(FILE *f, struct disklabel *lp, const char *specialname)
{
int i, j;
(void)fprintf(f, "# %s:\n", specname);
(void)fprintf(f, "# %s:\n", specialname);
if ((unsigned) lp->d_type < DKMAXTYPES)
(void)fprintf(f, "type: %s\n", dktypenames[lp->d_type]);
else