From e3ef871d6a80d72db02c9ab1ef492e8f58c2ddeb Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 16 Jul 2019 21:02:58 +0200 Subject: cleanup: move error handling into read_retry If read_retry fails to read the expected amount of data (EOF or otherwise), it is almost always an error. This commit renames read_retry to read_data and moves error handling into the function, making a lot of error handling code redundant. Signed-off-by: David Oberhollenzer --- lib/sqfs/read_super.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'lib/sqfs/read_super.c') diff --git a/lib/sqfs/read_super.c b/lib/sqfs/read_super.c index 7b738ea..8c43fe0 100644 --- a/lib/sqfs/read_super.c +++ b/lib/sqfs/read_super.c @@ -11,23 +11,13 @@ int sqfs_super_read(sqfs_super_t *super, int fd) { size_t block_size = 0; sqfs_super_t temp; - ssize_t ret; int i; if (lseek(fd, 0, SEEK_SET) == (off_t)-1) goto fail_seek; - ret = read_retry(fd, &temp, sizeof(temp)); - - if (ret < 0) { - perror("reading super block"); + if (read_data("reading super block", fd, &temp, sizeof(temp))) return -1; - } - - if ((size_t)ret < sizeof(temp)) { - fputs("reading super block: unexpected end of file\n", stderr); - return -1; - } temp.magic = le32toh(temp.magic); temp.inode_count = le32toh(temp.inode_count); -- cgit v1.2.3