#ifndef _IO
/* pre-1.3.45 */
-#define BLKGETSIZE 0x1260
+static const int BLKGETSIZE = 0x1260;
#else
/* same on i386, m68k, arm; different on alpha, mips, sparc, ppc */
#define BLKGETSIZE _IO(0x12,96)
}
-void die(const char *str)
-{
- error_msg("%s\n", str);
- exit(EXIT_FAILURE);
-}
-
-void page_ok(int page)
+static void page_ok(int page)
{
if (version == 0)
bit_set(signature_page, page);
}
-void page_bad(int page)
+static void page_bad(int page)
{
if (version == 0)
bit_test_and_clear(signature_page, page);
else {
if (badpages == MAX_BADPAGES)
- die("too many bad pages");
+ error_msg_and_die("too many bad pages\n");
p->badpages[badpages] = page;
}
badpages++;
}
-void check_blocks(void)
+static void check_blocks(void)
{
unsigned int current_page;
int do_seek = 1;
}
if (do_seek && lseek(DEV, current_page * pagesize, SEEK_SET) !=
current_page * pagesize)
- die("seek failed in check_blocks");
+ error_msg_and_die("seek failed in check_blocks\n");
if ((do_seek = (pagesize != read(DEV, buffer, pagesize)))) {
page_bad(current_page++);
continue;
int fd;
long size;
- fd = open(file, O_RDONLY);
- if (fd < 0) {
- perror(file);
- exit(1);
- }
+ if ((fd = open(file, O_RDONLY)) < 0)
+ perror_msg_and_die("%s", file);
if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
int sectors_per_page = pagesize / 512;
}
DEV = open(device_name, O_RDWR);
- if (DEV < 0 || fstat(DEV, &statbuf) < 0) {
- perror(device_name);
- return EXIT_FAILURE;
- }
+ if (DEV < 0 || fstat(DEV, &statbuf) < 0)
+ perror_msg_and_die("%s", device_name);
if (!S_ISBLK(statbuf.st_mode))
check = 0;
else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340)
- die("Will not try to make swapdevice on '%s'");
+ error_msg_and_die("Will not try to make swapdevice on '%s'\n", device_name);
#ifdef __sparc__
if (!force && version == 0) {
unsigned short *q, sum;
if (read(DEV, buffer, 512) != 512)
- die("fatal: first page unreadable");
+ error_msg_and_die("fatal: first page unreadable\n");
if (buffer[508] == 0xDA && buffer[509] == 0xBE) {
q = (unsigned short *) (buffer + 510);
for (sum = 0; q >= (unsigned short *) buffer;)
if (version == 0 || check)
check_blocks();
if (version == 0 && !bit_test_and_clear(signature_page, 0))
- die("fatal: first page unreadable");
+ error_msg_and_die("fatal: first page unreadable\n");
if (version == 1) {
p->version = version;
p->last_page = PAGES - 1;
goodpages = PAGES - badpages - 1;
if (goodpages <= 0)
- die("Unable to set up swap-space: unreadable");
+ error_msg_and_die("Unable to set up swap-space: unreadable\n");
printf("Setting up swapspace version %d, size = %ld bytes\n",
version, (long) (goodpages * pagesize));
write_signature((version == 0) ? "SWAP-SPACE" : "SWAPSPACE2");
offset = ((version == 0) ? 0 : 1024);
if (lseek(DEV, offset, SEEK_SET) != offset)
- die("unable to rewind swap-device");
+ error_msg_and_die("unable to rewind swap-device\n");
if (write(DEV, (char *) signature_page + offset, pagesize - offset)
!= pagesize - offset)
- die("unable to write signature page");
+ error_msg_and_die("unable to write signature page\n");
/*
* A subsequent swapon() will fail if the signature
* is not actually on disk. (This is a kernel bug.)
*/
if (fsync(DEV))
- die("fsync failed");
+ error_msg_and_die("fsync failed\n");
return EXIT_SUCCESS;
}