In some new code we may need the same functionality as provided by
newly introduced choose_swap_func() helper.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
---
lib/sort.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/lib/sort.c b/lib/sort.c
index aa18153864d2..d9b2f5b73620 100644
--- a/lib/sort.c
+++ b/lib/sort.c
@@ -151,6 +151,18 @@ static int do_cmp(const void *a, const void *b, cmp_r_func_t cmp, const void *pr
return cmp(a, b, priv);
}
+static swap_func_t choose_swap_func(swap_func_t swap_func, void *base, size_t size)
+{
+ if (swap_func)
+ return swap_func;
+
+ if (is_aligned(base, size, 8))
+ return SWAP_WORDS_64;
+ if (is_aligned(base, size, 4))
+ return SWAP_WORDS_32;
+ return SWAP_BYTES;
+}
+
/**
* parent - given the offset of the child, find the offset of the parent.
* @i: the offset of the heap element whose parent is sought. Non-zero.
@@ -208,14 +220,7 @@ void sort_r(void *base, size_t num, size_t size,
if (!a) /* num < 2 || size == 0 */
return;
- if (!swap_func) {
- if (is_aligned(base, size, 8))
- swap_func = SWAP_WORDS_64;
- else if (is_aligned(base, size, 4))
- swap_func = SWAP_WORDS_32;
- else
- swap_func = SWAP_BYTES;
- }
+ swap_func = choose_swap_func(swap_func, base, size);
/*
* Loop invariants:
--
2.32.0
