From: Scott Worley Date: Sat, 6 May 2017 16:49:27 +0000 (-0700) Subject: Whitespace: Single-line error checks X-Git-Url: http://git.scottworley.com/overonion/commitdiff_plain/3a85da3a94ea2bebd3f9545880b46150c3524f4d?hp=--cc Whitespace: Single-line error checks --- 3a85da3a94ea2bebd3f9545880b46150c3524f4d diff --git a/reverse_lib.c b/reverse_lib.c index e69922b..45c4595 100644 --- a/reverse_lib.c +++ b/reverse_lib.c @@ -15,31 +15,23 @@ static void write_all(int fd, const void *buf, size_t count) { size_t written = 0; while (written < count) { int ret = write(fd, &cbuf[written], count - written); - if (ret == -1) { - err(EX_IOERR, "Could not write"); - } + if (ret == -1) err(EX_IOERR, "Could not write"); written += ret; } } void reverse_file(const char* input_filename, int output_fd) { int fd = open(input_filename, O_RDONLY); - if (fd == -1) { - err(EX_NOINPUT, "Could not open specified file"); - } + if (fd == -1) err(EX_NOINPUT, "Could not open specified file"); struct stat stats; - if (fstat(fd, &stats) == -1) { - err(EX_NOINPUT, "Could not stat input"); - } + if (fstat(fd, &stats) == -1) err(EX_NOINPUT, "Could not stat input"); long page_size = sysconf(_SC_PAGE_SIZE); off_t pages = (stats.st_size - 1) / page_size + 1; long map_size = pages * page_size; char *m = mmap(NULL, map_size, PROT_READ, MAP_SHARED, fd, 0); - if (m == MAP_FAILED) { - err(EX_NOINPUT, "Could not mmap input"); - } + if (m == MAP_FAILED) err(EX_NOINPUT, "Could not mmap input"); char buf[BUFFER_SIZE]; off_t buf_offset = 0; @@ -54,10 +46,6 @@ void reverse_file(const char* input_filename, int output_fd) { write_all(output_fd, buf, buf_offset); } - if (munmap(m, map_size) == -1) { - err(EX_IOERR, "Could not unmap input"); - } - if (close(fd) == -1) { - err(EX_IOERR, "Could not close input"); - } + if (munmap(m, map_size) == -1) err(EX_IOERR, "Could not unmap input"); + if (close(fd) == -1) err(EX_IOERR, "Could not close input"); }