diff options
Diffstat (limited to 'usr/src/cmd/format/io.c')
| -rw-r--r-- | usr/src/cmd/format/io.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/usr/src/cmd/format/io.c b/usr/src/cmd/format/io.c index e9171a7fdc..06342e975e 100644 --- a/usr/src/cmd/format/io.c +++ b/usr/src/cmd/format/io.c @@ -48,7 +48,7 @@ extern int data_lineno; -extern char *space2str(); +extern char *space2str(uint_t); /* * This variable is used to determine whether a token is present in the pipe @@ -194,7 +194,7 @@ clean_token(char *cleantoken, char *token) * This routine checks if a token is already present on the input line */ int -istokenpresent() +istokenpresent(void) { return (token_present); } @@ -205,7 +205,7 @@ istokenpresent() * may have already been swallowed by the last gettoken. */ static void -flushline() +flushline(void) { if (token_present) { /* @@ -497,7 +497,7 @@ reprompt: * the first item in the list. */ s = find_string(param->io_slist, *deflt); - if (s == (char *)NULL) { + if (s == NULL) { s = (param->io_slist)->str; } fmt_print("[%s]", s); @@ -701,10 +701,10 @@ reprompt: */ s = find_string(param->io_slist, *deflt); if ((cur_label == L_TYPE_EFI) && - (s == (char *)NULL)) { + (s == NULL)) { return (*deflt); } - if (s == (char *)NULL) { + if (s == NULL) { return ((param->io_slist)->value); } else { return (*deflt); @@ -772,8 +772,7 @@ reprompt: * Convert token to a disk block number. */ if (cur_label == L_TYPE_EFI) { - if (geti64(cleantoken, (uint64_t *)&bn64, - (uint64_t *)NULL)) + if (geti64(cleantoken, (uint64_t *)&bn64, NULL)) break; } else { if (getbn(cleantoken, &bn64)) @@ -812,7 +811,7 @@ reprompt: /* * Convert the token into an integer. */ - if (geti(cleantoken, (int *)&bn, (int *)NULL)) + if (geti(cleantoken, (int *)&bn, NULL)) break; /* * Check to be sure it is within the legal bounds. @@ -842,7 +841,7 @@ reprompt: /* * Convert the token into an integer. */ - if (geti64(cleantoken, (uint64_t *)&bn64, (uint64_t *)NULL)) { + if (geti64(cleantoken, (uint64_t *)&bn64, NULL)) { break; } /* @@ -876,7 +875,7 @@ reprompt: /* * Convert the token into an integer. */ - if (geti(cleantoken, (int *)&bn, (int *)NULL)) + if (geti(cleantoken, (int *)&bn, NULL)) break; /* * Check to be sure it is within the legal bounds. @@ -1335,7 +1334,7 @@ or g(gigabytes)\n"); */ /* convert token to integer */ - if (geti(cleantoken, &cylno, (int *)NULL)) { + if (geti(cleantoken, &cylno, NULL)) { break; } @@ -1548,7 +1547,7 @@ or g(gigabytes)\n"); /* * Token is number of blocks */ - if (geti64(cleantoken, &blokno, (uint64_t *)NULL)) { + if (geti64(cleantoken, &blokno, NULL)) { break; } if (blokno > bounds->upper) { @@ -1564,7 +1563,7 @@ or g(gigabytes)\n"); */ /* convert token to integer */ - if (geti64(cleantoken, &blokno, (uint64_t *)NULL)) { + if (geti64(cleantoken, &blokno, NULL)) { break; } |