From 4c4de97db817d6d0d6f3eea548e6d03431752409 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 16 Jul 2023 11:06:49 +0200 Subject: [PATCH] sort-utils: add generic uint16_t comparison call --- src/basic/sort-util.c | 4 ++++ src/basic/sort-util.h | 1 + src/shared/efi-api.c | 4 ---- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/basic/sort-util.c b/src/basic/sort-util.c index e0fb9cf4a8..9eadb960be 100644 --- a/src/basic/sort-util.c +++ b/src/basic/sort-util.c @@ -31,3 +31,7 @@ void *xbsearch_r(const void *key, const void *base, size_t nmemb, size_t size, int cmp_int(const int *a, const int *b) { return CMP(*a, *b); } + +int cmp_uint16(const uint16_t *a, const uint16_t *b) { + return CMP(*a, *b); +} diff --git a/src/basic/sort-util.h b/src/basic/sort-util.h index f0bf246aa3..48d5f12fbc 100644 --- a/src/basic/sort-util.h +++ b/src/basic/sort-util.h @@ -76,3 +76,4 @@ static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, compariso }) int cmp_int(const int *a, const int *b); +int cmp_uint16(const uint16_t *a, const uint16_t *b); diff --git a/src/shared/efi-api.c b/src/shared/efi-api.c index 153e85cfe7..d533d1ba7e 100644 --- a/src/shared/efi-api.c +++ b/src/shared/efi-api.c @@ -472,10 +472,6 @@ static int boot_id_hex(const char s[static 4]) { return id; } -static int cmp_uint16(const uint16_t *a, const uint16_t *b) { - return CMP(*a, *b); -} - int efi_get_boot_options(uint16_t **ret_options) { _cleanup_closedir_ DIR *dir = NULL; _cleanup_free_ uint16_t *list = NULL;