diff options
Diffstat (limited to 'mkswap.c')
| -rw-r--r-- | mkswap.c | 16 |
1 files changed, 8 insertions, 8 deletions
| @@ -87,7 +87,7 @@ static void init_signature_page() | |||
| 87 | 87 | ||
| 88 | #ifdef PAGE_SIZE | 88 | #ifdef PAGE_SIZE |
| 89 | if (pagesize != PAGE_SIZE) | 89 | if (pagesize != PAGE_SIZE) |
| 90 | errorMsg("Assuming pages of size %d\n", pagesize); | 90 | error_msg("Assuming pages of size %d\n", pagesize); |
| 91 | #endif | 91 | #endif |
| 92 | signature_page = (int *) xmalloc(pagesize); | 92 | signature_page = (int *) xmalloc(pagesize); |
| 93 | memset(signature_page, 0, pagesize); | 93 | memset(signature_page, 0, pagesize); |
| @@ -175,7 +175,7 @@ static int bit_test_and_clear(unsigned int *addr, unsigned int nr) | |||
| 175 | 175 | ||
| 176 | void die(const char *str) | 176 | void die(const char *str) |
| 177 | { | 177 | { |
| 178 | errorMsg("%s\n", str); | 178 | error_msg("%s\n", str); |
| 179 | exit(EXIT_FAILURE); | 179 | exit(EXIT_FAILURE); |
| 180 | } | 180 | } |
| 181 | 181 | ||
| @@ -316,14 +316,14 @@ int mkswap_main(int argc, char **argv) | |||
| 316 | } | 316 | } |
| 317 | } | 317 | } |
| 318 | if (!device_name) { | 318 | if (!device_name) { |
| 319 | errorMsg("error: Nowhere to set up swap on?\n"); | 319 | error_msg("error: Nowhere to set up swap on?\n"); |
| 320 | usage(mkswap_usage); | 320 | usage(mkswap_usage); |
| 321 | } | 321 | } |
| 322 | sz = get_size(device_name); | 322 | sz = get_size(device_name); |
| 323 | if (!PAGES) { | 323 | if (!PAGES) { |
| 324 | PAGES = sz; | 324 | PAGES = sz; |
| 325 | } else if (PAGES > sz && !force) { | 325 | } else if (PAGES > sz && !force) { |
| 326 | errorMsg("error: size %ld is larger than device size %d\n", | 326 | error_msg("error: size %ld is larger than device size %d\n", |
| 327 | PAGES * (pagesize / 1024), sz * (pagesize / 1024)); | 327 | PAGES * (pagesize / 1024), sz * (pagesize / 1024)); |
| 328 | return EXIT_FAILURE; | 328 | return EXIT_FAILURE; |
| 329 | } | 329 | } |
| @@ -339,11 +339,11 @@ int mkswap_main(int argc, char **argv) | |||
| 339 | version = 1; | 339 | version = 1; |
| 340 | } | 340 | } |
| 341 | if (version != 0 && version != 1) { | 341 | if (version != 0 && version != 1) { |
| 342 | errorMsg("error: unknown version %d\n", version); | 342 | error_msg("error: unknown version %d\n", version); |
| 343 | usage(mkswap_usage); | 343 | usage(mkswap_usage); |
| 344 | } | 344 | } |
| 345 | if (PAGES < 10) { | 345 | if (PAGES < 10) { |
| 346 | errorMsg("error: swap area needs to be at least %ldkB\n", | 346 | error_msg("error: swap area needs to be at least %ldkB\n", |
| 347 | (long) (10 * pagesize / 1024)); | 347 | (long) (10 * pagesize / 1024)); |
| 348 | usage(mkswap_usage); | 348 | usage(mkswap_usage); |
| 349 | } | 349 | } |
| @@ -362,7 +362,7 @@ int mkswap_main(int argc, char **argv) | |||
| 362 | #endif | 362 | #endif |
| 363 | if (PAGES > maxpages) { | 363 | if (PAGES > maxpages) { |
| 364 | PAGES = maxpages; | 364 | PAGES = maxpages; |
| 365 | errorMsg("warning: truncating swap area to %ldkB\n", | 365 | error_msg("warning: truncating swap area to %ldkB\n", |
| 366 | PAGES * pagesize / 1024); | 366 | PAGES * pagesize / 1024); |
| 367 | } | 367 | } |
| 368 | 368 | ||
| @@ -389,7 +389,7 @@ int mkswap_main(int argc, char **argv) | |||
| 389 | for (sum = 0; q >= (unsigned short *) buffer;) | 389 | for (sum = 0; q >= (unsigned short *) buffer;) |
| 390 | sum ^= *q--; | 390 | sum ^= *q--; |
| 391 | if (!sum) { | 391 | if (!sum) { |
| 392 | errorMsg("Device '%s' contains a valid Sun disklabel.\n" | 392 | error_msg("Device '%s' contains a valid Sun disklabel.\n" |
| 393 | "This probably means creating v0 swap would destroy your partition table\n" | 393 | "This probably means creating v0 swap would destroy your partition table\n" |
| 394 | "No swap created. If you really want to create swap v0 on that device, use\n" | 394 | "No swap created. If you really want to create swap v0 on that device, use\n" |
| 395 | "the -f option to force it.\n", device_name); | 395 | "the -f option to force it.\n", device_name); |