diff options
Diffstat (limited to 'util-linux/mkswap.c')
-rw-r--r-- | util-linux/mkswap.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c index 60ae2864d..e7fab4e07 100644 --- a/util-linux/mkswap.c +++ b/util-linux/mkswap.c | |||
@@ -260,11 +260,8 @@ static long get_size(const char *file) | |||
260 | int fd; | 260 | int fd; |
261 | long size; | 261 | long size; |
262 | 262 | ||
263 | fd = open(file, O_RDONLY); | 263 | if ((fd = open(file, O_RDONLY)) < 0) |
264 | if (fd < 0) { | 264 | perror_msg_and_die("%s", file); |
265 | perror(file); | ||
266 | exit(1); | ||
267 | } | ||
268 | if (ioctl(fd, BLKGETSIZE, &size) >= 0) { | 265 | if (ioctl(fd, BLKGETSIZE, &size) >= 0) { |
269 | int sectors_per_page = pagesize / 512; | 266 | int sectors_per_page = pagesize / 512; |
270 | 267 | ||
@@ -367,10 +364,8 @@ int mkswap_main(int argc, char **argv) | |||
367 | } | 364 | } |
368 | 365 | ||
369 | DEV = open(device_name, O_RDWR); | 366 | DEV = open(device_name, O_RDWR); |
370 | if (DEV < 0 || fstat(DEV, &statbuf) < 0) { | 367 | if (DEV < 0 || fstat(DEV, &statbuf) < 0) |
371 | perror(device_name); | 368 | perror_msg_and_die("%s", device_name); |
372 | return EXIT_FAILURE; | ||
373 | } | ||
374 | if (!S_ISBLK(statbuf.st_mode)) | 369 | if (!S_ISBLK(statbuf.st_mode)) |
375 | check = 0; | 370 | check = 0; |
376 | else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) | 371 | else if (statbuf.st_rdev == 0x0300 || statbuf.st_rdev == 0x0340) |