diff options
author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2019-01-17 16:41:55 -0800 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-01-24 08:25:37 +0100 |
commit | a24ae66249674eaba96e628454c1d49db57a30cb (patch) | |
tree | 8507cd85326ee926d445050b3d3b4d3025a7c976 /lib | |
parent | 4ebb55e96177a4b5f05e1407e01095cb4924d0a5 (diff) | |
download | barebox-a24ae66249674eaba96e628454c1d49db57a30cb.tar.gz barebox-a24ae66249674eaba96e628454c1d49db57a30cb.tar.xz |
unlink_recursive: Drop struct data
Drop struct data which doesn't seem to serve any purpose in the code
and looks like a leftover.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/unlink-recursive.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/lib/unlink-recursive.c b/lib/unlink-recursive.c index 434fdc791b..f28c6dae5b 100644 --- a/lib/unlink-recursive.c +++ b/lib/unlink-recursive.c @@ -6,50 +6,37 @@ static char unlink_recursive_failedpath[PATH_MAX]; -struct data { - int error; -}; - static int file_action(const char *filename, struct stat *statbuf, void *userdata, int depth) { - struct data *data = userdata; - int ret; - - ret = unlink(filename); - if (ret) { + if (unlink(filename)) { strcpy(unlink_recursive_failedpath, filename); - data->error = ret; + return 0; } - return ret ? 0 : 1; + return 1; } static int dir_action(const char *dirname, struct stat *statbuf, void *userdata, int depth) { - struct data *data = userdata; - int ret; - - ret = rmdir(dirname); - if (ret) { + if (rmdir(dirname)) { strcpy(unlink_recursive_failedpath, dirname); - data->error = ret; + return 0; } - return ret ? 0 : 1; + return 1; } int unlink_recursive(const char *path, char **failedpath) { - struct data data = {}; int ret; if (failedpath) *failedpath = NULL; ret = recursive_action(path, ACTION_RECURSE | ACTION_DEPTHFIRST, - file_action, dir_action, &data, 0); + file_action, dir_action, NULL, 0); if (!ret && failedpath) *failedpath = unlink_recursive_failedpath; |