From 39eff20bd938bae630270a3f06b17f787663826c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 18 May 2018 12:27:35 -0400 Subject: use return codes from fiemap --- lib/extent-map.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/extent-map.c') diff --git a/lib/extent-map.c b/lib/extent-map.c index b698fa1..297448c 100644 --- a/lib/extent-map.c +++ b/lib/extent-map.c @@ -2,13 +2,15 @@ #include /* for error(3gnu) */ #include /* for all of the other fiemap stuff */ #include /* for FS_IOC_FIEMAP */ -#include /* for calloc(3p), exit(3p), EXIT_SUCCESS, EXIT_FAILURE */ +#include /* for calloc(3p), EXIT_SUCCESS, EXIT_FAILURE */ #include /* for ioctl(2) */ #include /* for sysconf(3p), _SC_PAGESIZE */ #include "extent-map.h" -void fiemap(int fd, uint32_t flags, int (*handle_extent)(struct fiemap_extent)) { +#define error(_exit_code, ...) do { error(0, __VA_ARGS__); if (_exit_code) return _exit_code; } while(0) + +int fiemap(int fd, uint32_t flags, int (*handle_extent)(struct fiemap_extent)) { const size_t fm_size = sysconf(_SC_PAGESIZE);; struct fiemap *fm = calloc(1, fm_size); if (!fm) @@ -29,12 +31,12 @@ void fiemap(int fd, uint32_t flags, int (*handle_extent)(struct fiemap_extent)) int r = handle_extent(fm->fm_extents[i]); if (r) { free(fm); - exit(r); + return r; } if (fm->fm_extents[i].fe_flags & FIEMAP_EXTENT_LAST) { free(fm); - exit(EXIT_SUCCESS); + return EXIT_SUCCESS; } } } -- cgit v1.2.3