Fix some whitespace issues, and move a curly brace out of an #ifdef to
avoid confusing auto-indenting editors.
This commit is contained in:
parent
2c4abc3eb7
commit
266e79978a
@ -80,9 +80,9 @@ __FBSDID("$FreeBSD$");
|
||||
|
||||
static void makelabel(const char *, struct disklabel *);
|
||||
static int writelabel(void);
|
||||
static int readlabel(int flag);
|
||||
static int readlabel(int flag);
|
||||
static void display(FILE *, const struct disklabel *);
|
||||
static int edit(void);
|
||||
static int edit(void);
|
||||
static int editit(void);
|
||||
static void fixlabel(struct disklabel *);
|
||||
static char *skip(char *);
|
||||
@ -825,10 +825,11 @@ getasciilabel(FILE *f, struct disklabel *lp)
|
||||
if (!strcmp(cp, "sectors/track")) {
|
||||
v = strtoul(tp, NULL, 10);
|
||||
#if (ULONG_MAX != 0xffffffffUL)
|
||||
if (v == 0 || v > 0xffffffff) {
|
||||
if (v == 0 || v > 0xffffffff)
|
||||
#else
|
||||
if (v == 0) {
|
||||
if (v == 0)
|
||||
#endif
|
||||
{
|
||||
fprintf(stderr, "line %d: %s: bad %s\n",
|
||||
lineno, tp, cp);
|
||||
errors++;
|
||||
@ -971,9 +972,9 @@ getasciilabel(FILE *f, struct disklabel *lp)
|
||||
fprintf(stderr, "line %d: too few numeric fields\n", lineno); \
|
||||
return (1); \
|
||||
} else { \
|
||||
char *tmp; \
|
||||
char *tmp; \
|
||||
cp = tp, tp = word(cp); \
|
||||
(n) = strtoul(cp, &tmp, 10); \
|
||||
(n) = strtoul(cp, &tmp, 10); \
|
||||
if (tmp) (w) = *tmp; \
|
||||
} \
|
||||
} while (0)
|
||||
|
Loading…
x
Reference in New Issue
Block a user