RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-26 21:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: qgoup: propagate errors from btrfs_qgroup_parse_sort_string

Browse Source 
Get rid of the exit inside and propagate errors to the callers.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2019-03-04 17:04:18 +01:00
parent 9a1550bb2d
commit c7d546ab6b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qgroup.c
View File

@ -468,9 +468,8 @@ int btrfs_qgroup_setup_comparer(struct btrfs_qgroup_comparer_set **comp_set,
tmp = set; tmp = set;
set = realloc(set, size); set = realloc(set, size);
if (!set) { if (!set) {
error("memory allocation failed");
free(tmp); free(tmp);
exit(1); return -ENOMEM;
} }
memset(&set->comps[set->total], 0, memset(&set->comps[set->total], 0,
@ -1211,7 +1210,7 @@ int btrfs_qgroup_parse_sort_string(const char *opt_arg,
char **ptr_argv; char **ptr_argv;
int what_to_sort; int what_to_sort;
char *opt_tmp; char *opt_tmp;
int ret = 0; int ret = 0, ret2;
opt_tmp = strdup(opt_arg); opt_tmp = strdup(opt_arg);
if (!opt_tmp) if (!opt_tmp)
@ -1256,7 +1255,12 @@ int btrfs_qgroup_parse_sort_string(const char *opt_arg,
ret = 1; ret = 1;
goto out; goto out;
} }
btrfs_qgroup_setup_comparer(comps, what_to_sort, order); ret2 = btrfs_qgroup_setup_comparer(comps, what_to_sort,
order);
if (ret2 < 0) {
ret = ret2;
goto out;
}
} }
p = strtok(NULL, ","); p = strtok(NULL, ",");
} }