d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get us to WARNS=2 with a bit of constification and some printf fiddling.

Browse Source 
Pick up the c-partitions magicness from sys/disklabel.h instead
of defining our own magicness for it, remove trivial comment.

Sponsored by: DARPA and NAI Labs.
This commit is contained in:
Poul-Henning Kamp 2002-04-07 10:57:00 +00:00
parent 05172ec004
commit 6b0ff5f596
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=94065
4 changed files with 38 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/bsdlabel/Makefile
View File

@ -8,6 +8,6 @@ MAN= disklabel.5 disklabel.8
.if ${MACHINE} == "pc98" .if ${MACHINE} == "pc98"
CFLAGS+= -DPC98 CFLAGS+= -DPC98
.endif .endif
WARNS= 0 WARNS= 2
.include <bsd.prog.mk> .include <bsd.prog.mk>

43
sbin/bsdlabel/bsdlabel.c
View File

@ -134,8 +134,6 @@ char namebuf[BBSIZE], *np = namebuf;
struct disklabel lab; struct disklabel lab;
char bootarea[BBSIZE]; char bootarea[BBSIZE];
/* partition 'c' is the full disk and is special */
#define FULL_DISK_PART 2
#define MAX_PART ('z') #define MAX_PART ('z')
#define MAX_NUM_PARTS (1 + MAX_PART - 'a') #define MAX_NUM_PARTS (1 + MAX_PART - 'a')
char part_size_type[MAX_NUM_PARTS]; char part_size_type[MAX_NUM_PARTS];
@ -930,10 +928,11 @@ word(char *cp)
int int
getasciilabel(FILE *f, struct disklabel *lp) getasciilabel(FILE *f, struct disklabel *lp)
{ {
char **cpp, *cp; char *cp;
const char **cpp;
struct partition *pp; struct partition *pp;
unsigned int part; unsigned int part;
char *tp, *s, line[BUFSIZ]; char *tp, line[BUFSIZ];
int v, lineno = 0, errors = 0; int v, lineno = 0, errors = 0;
int i; int i;
@ -958,7 +957,7 @@ getasciilabel(FILE *f, struct disklabel *lp)
tp = "unknown"; tp = "unknown";
cpp = dktypenames; cpp = dktypenames;
for (; cpp < &dktypenames[DKMAXTYPES]; cpp++) for (; cpp < &dktypenames[DKMAXTYPES]; cpp++)
if ((s = *cpp) && streq(s, tp)) { if (*cpp && streq(*cpp, tp)) {
lp->d_type = cpp - dktypenames; lp->d_type = cpp - dktypenames;
goto next; goto next;
} }
@ -1201,7 +1200,7 @@ getasciilabel(FILE *f, struct disklabel *lp)
cp = tp, tp = word(cp); cp = tp, tp = word(cp);
cpp = fstypenames; cpp = fstypenames;
for (; cpp < &fstypenames[FSMAXTYPES]; cpp++) for (; cpp < &fstypenames[FSMAXTYPES]; cpp++)
if ((s = *cpp) && streq(s, cp)) { if (*cpp && streq(*cpp, cp)) {
pp->p_fstype = cpp - pp->p_fstype = cpp -
fstypenames; fstypenames;
goto gottype; goto gottype;
@ -1351,8 +1350,7 @@ checklabel(struct disklabel *lp)
pp = &lp->d_partitions[i]; pp = &lp->d_partitions[i];
if (part_set[i]) { if (part_set[i]) {
if (part_size_type[i] == '*') { if (part_size_type[i] == '*') {
/* partition 2 ('c') is special */ if (i == RAW_PART) {
if (i == FULL_DISK_PART) {
pp->p_size = lp->d_secperunit; pp->p_size = lp->d_secperunit;
} else { } else {
if (hog_part != -1) if (hog_part != -1)
@ -1401,8 +1399,7 @@ checklabel(struct disklabel *lp)
pp->p_size = size; pp->p_size = size;
} }
/* else already in sectors */ /* else already in sectors */
/* partition 2 ('c') is special */ if (i != RAW_PART)
if (i != FULL_DISK_PART)
total_size += size; total_size += size;
} }
} }
@ -1412,7 +1409,7 @@ checklabel(struct disklabel *lp)
if (total_percent != 0) { if (total_percent != 0) {
long free_space = lp->d_secperunit - total_size; long free_space = lp->d_secperunit - total_size;
if (total_percent > 100) { if (total_percent > 100) {
fprintf(stderr,"total percentage %d is greater than 100\n", fprintf(stderr,"total percentage %lu is greater than 100\n",
total_percent); total_percent);
errors++; errors++;
} }
@ -1431,7 +1428,7 @@ checklabel(struct disklabel *lp)
} }
} else { } else {
fprintf(stderr, fprintf(stderr,
"%ld sectors available to give to '*' and '%' partitions\n", "%ld sectors available to give to '*' and '%%' partitions\n",
free_space); free_space);
errors++; errors++;
/* fix? set all % partitions to size 0? */ /* fix? set all % partitions to size 0? */
@ -1451,8 +1448,7 @@ checklabel(struct disklabel *lp)
pp = &lp->d_partitions[i]; pp = &lp->d_partitions[i];
if (part_set[i]) { if (part_set[i]) {
if (part_offset_type[i] == '*') { if (part_offset_type[i] == '*') {
/* partition 2 ('c') is special */ if (i == RAW_PART) {
if (i == FULL_DISK_PART) {
pp->p_offset = 0; pp->p_offset = 0;
} else { } else {
pp->p_offset = current_offset; pp->p_offset = current_offset;
@ -1460,28 +1456,26 @@ checklabel(struct disklabel *lp)
} }
} else { } else {
/* allow them to be out of order for old-style tables */ /* allow them to be out of order for old-style tables */
/* partition 2 ('c') is special */
if (pp->p_offset < current_offset && if (pp->p_offset < current_offset &&
seen_default_offset && i != FULL_DISK_PART) { seen_default_offset && i != RAW_PART) {
fprintf(stderr, fprintf(stderr,
"Offset %ld for partition %c overlaps previous partition which ends at %ld\n", "Offset %ld for partition %c overlaps previous partition which ends at %lu\n",
pp->p_offset,i+'a',current_offset); (long)pp->p_offset,i+'a',current_offset);
fprintf(stderr, fprintf(stderr,
"Labels with any *'s for offset must be in ascending order by sector\n"); "Labels with any *'s for offset must be in ascending order by sector\n");
errors++; errors++;
} else if (pp->p_offset != current_offset && } else if (pp->p_offset != current_offset &&
i != FULL_DISK_PART && seen_default_offset) { i != RAW_PART && seen_default_offset) {
/* /*
* this may give unneeded warnings if * this may give unneeded warnings if
* partitions are out-of-order * partitions are out-of-order
*/ */
Warning( Warning(
"Offset %ld for partition %c doesn't match expected value %ld", "Offset %ld for partition %c doesn't match expected value %ld",
pp->p_offset, i + 'a', current_offset); (long)pp->p_offset, i + 'a', current_offset);
} }
} }
/* partition 2 ('c') is special */ if (i != RAW_PART)
if (i != FULL_DISK_PART)
current_offset = pp->p_offset + pp->p_size; current_offset = pp->p_offset + pp->p_size;
} }
} }
@ -1519,7 +1513,7 @@ checklabel(struct disklabel *lp)
part); part);
errors++; errors++;
} }
if (i == FULL_DISK_PART) if (i == RAW_PART)
{ {
if (pp->p_fstype != FS_UNUSED) if (pp->p_fstype != FS_UNUSED)
Warning("partition %c is not marked as unused!",part); Warning("partition %c is not marked as unused!",part);
@ -1538,8 +1532,7 @@ checklabel(struct disklabel *lp)
/* check for overlaps */ /* check for overlaps */
/* this will check for all possible overlaps once and only once */ /* this will check for all possible overlaps once and only once */
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
/* partition 2 ('c') is special */ if (j != RAW_PART && i != RAW_PART &&
if (j != FULL_DISK_PART && i != FULL_DISK_PART &&
part_set[i] && part_set[j]) { part_set[i] && part_set[j]) {
pp2 = &lp->d_partitions[j]; pp2 = &lp->d_partitions[j];
if (pp2->p_offset < pp->p_offset + pp->p_size && if (pp2->p_offset < pp->p_offset + pp->p_size &&

2
sbin/disklabel/Makefile
View File

@ -8,6 +8,6 @@ MAN= disklabel.5 disklabel.8
.if ${MACHINE} == "pc98" .if ${MACHINE} == "pc98"
CFLAGS+= -DPC98 CFLAGS+= -DPC98
.endif .endif
WARNS= 0 WARNS= 2
.include <bsd.prog.mk> .include <bsd.prog.mk>

43
sbin/disklabel/disklabel.c
View File

@ -134,8 +134,6 @@ char namebuf[BBSIZE], *np = namebuf;
struct disklabel lab; struct disklabel lab;
char bootarea[BBSIZE]; char bootarea[BBSIZE];
/* partition 'c' is the full disk and is special */
#define FULL_DISK_PART 2
#define MAX_PART ('z') #define MAX_PART ('z')
#define MAX_NUM_PARTS (1 + MAX_PART - 'a') #define MAX_NUM_PARTS (1 + MAX_PART - 'a')
char part_size_type[MAX_NUM_PARTS]; char part_size_type[MAX_NUM_PARTS];
@ -930,10 +928,11 @@ word(char *cp)
int int
getasciilabel(FILE *f, struct disklabel *lp) getasciilabel(FILE *f, struct disklabel *lp)
{ {
char **cpp, *cp; char *cp;
const char **cpp;
struct partition *pp; struct partition *pp;
unsigned int part; unsigned int part;
char *tp, *s, line[BUFSIZ]; char *tp, line[BUFSIZ];
int v, lineno = 0, errors = 0; int v, lineno = 0, errors = 0;
int i; int i;
@ -958,7 +957,7 @@ getasciilabel(FILE *f, struct disklabel *lp)
tp = "unknown"; tp = "unknown";
cpp = dktypenames; cpp = dktypenames;
for (; cpp < &dktypenames[DKMAXTYPES]; cpp++) for (; cpp < &dktypenames[DKMAXTYPES]; cpp++)
if ((s = *cpp) && streq(s, tp)) { if (*cpp && streq(*cpp, tp)) {
lp->d_type = cpp - dktypenames; lp->d_type = cpp - dktypenames;
goto next; goto next;
} }
@ -1201,7 +1200,7 @@ getasciilabel(FILE *f, struct disklabel *lp)
cp = tp, tp = word(cp); cp = tp, tp = word(cp);
cpp = fstypenames; cpp = fstypenames;
for (; cpp < &fstypenames[FSMAXTYPES]; cpp++) for (; cpp < &fstypenames[FSMAXTYPES]; cpp++)
if ((s = *cpp) && streq(s, cp)) { if (*cpp && streq(*cpp, cp)) {
pp->p_fstype = cpp - pp->p_fstype = cpp -
fstypenames; fstypenames;
goto gottype; goto gottype;
@ -1351,8 +1350,7 @@ checklabel(struct disklabel *lp)
pp = &lp->d_partitions[i]; pp = &lp->d_partitions[i];
if (part_set[i]) { if (part_set[i]) {
if (part_size_type[i] == '*') { if (part_size_type[i] == '*') {
/* partition 2 ('c') is special */ if (i == RAW_PART) {
if (i == FULL_DISK_PART) {
pp->p_size = lp->d_secperunit; pp->p_size = lp->d_secperunit;
} else { } else {
if (hog_part != -1) if (hog_part != -1)
@ -1401,8 +1399,7 @@ checklabel(struct disklabel *lp)
pp->p_size = size; pp->p_size = size;
} }
/* else already in sectors */ /* else already in sectors */
/* partition 2 ('c') is special */ if (i != RAW_PART)
if (i != FULL_DISK_PART)
total_size += size; total_size += size;
} }
} }
@ -1412,7 +1409,7 @@ checklabel(struct disklabel *lp)
if (total_percent != 0) { if (total_percent != 0) {
long free_space = lp->d_secperunit - total_size; long free_space = lp->d_secperunit - total_size;
if (total_percent > 100) { if (total_percent > 100) {
fprintf(stderr,"total percentage %d is greater than 100\n", fprintf(stderr,"total percentage %lu is greater than 100\n",
total_percent); total_percent);
errors++; errors++;
} }
@ -1431,7 +1428,7 @@ checklabel(struct disklabel *lp)
} }
} else { } else {
fprintf(stderr, fprintf(stderr,
"%ld sectors available to give to '*' and '%' partitions\n", "%ld sectors available to give to '*' and '%%' partitions\n",
free_space); free_space);
errors++; errors++;
/* fix? set all % partitions to size 0? */ /* fix? set all % partitions to size 0? */
@ -1451,8 +1448,7 @@ checklabel(struct disklabel *lp)
pp = &lp->d_partitions[i]; pp = &lp->d_partitions[i];
if (part_set[i]) { if (part_set[i]) {
if (part_offset_type[i] == '*') { if (part_offset_type[i] == '*') {
/* partition 2 ('c') is special */ if (i == RAW_PART) {
if (i == FULL_DISK_PART) {
pp->p_offset = 0; pp->p_offset = 0;
} else { } else {
pp->p_offset = current_offset; pp->p_offset = current_offset;
@ -1460,28 +1456,26 @@ checklabel(struct disklabel *lp)
} }
} else { } else {
/* allow them to be out of order for old-style tables */ /* allow them to be out of order for old-style tables */
/* partition 2 ('c') is special */
if (pp->p_offset < current_offset && if (pp->p_offset < current_offset &&
seen_default_offset && i != FULL_DISK_PART) { seen_default_offset && i != RAW_PART) {
fprintf(stderr, fprintf(stderr,
"Offset %ld for partition %c overlaps previous partition which ends at %ld\n", "Offset %ld for partition %c overlaps previous partition which ends at %lu\n",
pp->p_offset,i+'a',current_offset); (long)pp->p_offset,i+'a',current_offset);
fprintf(stderr, fprintf(stderr,
"Labels with any *'s for offset must be in ascending order by sector\n"); "Labels with any *'s for offset must be in ascending order by sector\n");
errors++; errors++;
} else if (pp->p_offset != current_offset && } else if (pp->p_offset != current_offset &&
i != FULL_DISK_PART && seen_default_offset) { i != RAW_PART && seen_default_offset) {
/* /*
* this may give unneeded warnings if * this may give unneeded warnings if
* partitions are out-of-order * partitions are out-of-order
*/ */
Warning( Warning(
"Offset %ld for partition %c doesn't match expected value %ld", "Offset %ld for partition %c doesn't match expected value %ld",
pp->p_offset, i + 'a', current_offset); (long)pp->p_offset, i + 'a', current_offset);
} }
} }
/* partition 2 ('c') is special */ if (i != RAW_PART)
if (i != FULL_DISK_PART)
current_offset = pp->p_offset + pp->p_size; current_offset = pp->p_offset + pp->p_size;
} }
} }
@ -1519,7 +1513,7 @@ checklabel(struct disklabel *lp)
part); part);
errors++; errors++;
} }
if (i == FULL_DISK_PART) if (i == RAW_PART)
{ {
if (pp->p_fstype != FS_UNUSED) if (pp->p_fstype != FS_UNUSED)
Warning("partition %c is not marked as unused!",part); Warning("partition %c is not marked as unused!",part);
@ -1538,8 +1532,7 @@ checklabel(struct disklabel *lp)
/* check for overlaps */ /* check for overlaps */
/* this will check for all possible overlaps once and only once */ /* this will check for all possible overlaps once and only once */
for (j = 0; j < i; j++) { for (j = 0; j < i; j++) {
/* partition 2 ('c') is special */ if (j != RAW_PART && i != RAW_PART &&
if (j != FULL_DISK_PART && i != FULL_DISK_PART &&
part_set[i] && part_set[j]) { part_set[i] && part_set[j]) {
pp2 = &lp->d_partitions[j]; pp2 = &lp->d_partitions[j];
if (pp2->p_offset < pp->p_offset + pp->p_size && if (pp2->p_offset < pp->p_offset + pp->p_size &&