From 73611843264fcd5b7c618c3ef95929d58227bc18 Mon Sep 17 00:00:00 2001 From: Francesco Cosoleto Date: Fri, 8 Apr 2011 15:51:48 +0200 Subject: isosize: simplify some error messages perror() and fprintf() are replaced with err() calls Signed-off-by: Francesco Cosoleto Signed-off-by: Karel Zak --- disk-utils/isosize.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) (limited to 'disk-utils/isosize.c') diff --git a/disk-utils/isosize.c b/disk-utils/isosize.c index 5f0358e51..d00e4f0e0 100644 --- a/disk-utils/isosize.c +++ b/disk-utils/isosize.c @@ -26,6 +26,7 @@ #include #include "nls.h" +#include "c.h" #define ISODCL(from, to) (to - from + 1) @@ -124,24 +125,14 @@ isosize(char *filenamep) { int fd, nsecs, ssize; struct iso_primary_descriptor ipd; - if ((fd = open(filenamep, O_RDONLY)) < 0) { - perror(filenamep); - fprintf(stderr, _("%s: failed to open: %s\n"), - progname, filenamep); - exit(1); - } - if (lseek(fd, 16 << 11, 0) == (off_t)-1) { - perror("lseek"); - fprintf(stderr, _("%s: seek error on %s\n"), - progname, filenamep); - exit(1); - } - if (read(fd, &ipd, sizeof(ipd)) < 0) { - perror("read"); - fprintf(stderr, _("%s: read error on %s\n"), - progname, filenamep); - exit(1); - } + if ((fd = open(filenamep, O_RDONLY)) < 0) + err(EXIT_FAILURE, _("failed to open %s"), filenamep); + + if (lseek(fd, 16 << 11, 0) == (off_t)-1) + err(EXIT_FAILURE, _("seek error on %s"), filenamep); + + if (read(fd, &ipd, sizeof(ipd)) < 0) + err(EXIT_FAILURE, _("read error on %s"), filenamep); nsecs = isonum_733(ipd.volume_space_size); ssize = isonum_723(ipd.logical_block_size); /* nowadays always 2048 */ -- cgit v1.2.3-55-g7522