Factor out the main logic of btrfs_util_subvolume_iterator_next(). This is a preparation work to relax the root privilege of this function.
No functional change happens. Signed-off-by: Misono Tomohiro <misono.tomoh...@jp.fujitsu.com> --- libbtrfsutil/subvolume.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libbtrfsutil/subvolume.c b/libbtrfsutil/subvolume.c index e94c7079..73471d4f 100644 --- a/libbtrfsutil/subvolume.c +++ b/libbtrfsutil/subvolume.c @@ -1255,9 +1255,9 @@ static enum btrfs_util_error build_subvol_path(struct btrfs_util_subvolume_itera return BTRFS_UTIL_OK; } -PUBLIC enum btrfs_util_error btrfs_util_subvolume_iterator_next(struct btrfs_util_subvolume_iterator *iter, - char **path_ret, - uint64_t *id_ret) +static enum btrfs_util_error subvolume_iterator_next_root(struct btrfs_util_subvolume_iterator *iter, + char **path_ret, + uint64_t *id_ret) { struct search_stack_entry *top; const struct btrfs_ioctl_search_header *header; @@ -1331,6 +1331,13 @@ out: return BTRFS_UTIL_OK; } +PUBLIC enum btrfs_util_error btrfs_util_subvolume_iterator_next(struct btrfs_util_subvolume_iterator *iter, + char **path_ret, + uint64_t *id_ret) +{ + return subvolume_iterator_next_root(iter, path_ret, id_ret); +} + PUBLIC enum btrfs_util_error btrfs_util_subvolume_iterator_next_info(struct btrfs_util_subvolume_iterator *iter, char **path_ret, struct btrfs_util_subvolume_info *subvol) -- 2.14.4 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html