From fd268d35cbddff04fc0b27a8af2c97185c8a97ba Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Aug 2022 14:32:15 +0200 Subject: Merging upstream version 2.1.2. Signed-off-by: Daniel Baumann --- wrapper.c | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) (limited to 'wrapper.c') diff --git a/wrapper.c b/wrapper.c index 7341631..2ba5b32 100644 --- a/wrapper.c +++ b/wrapper.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0-only +// SPDX-License-Identifier: GPL-2.0-or-later /* * This file is part of nvme-cli * @@ -9,14 +9,34 @@ #include -const char * __attribute__((weak)) nvme_get_version(enum nvme_version type) -{ - const char *(*libnvme_get_version)(enum nvme_version type); +#define PROTO(args...) args +#define ARGS(args...) args - libnvme_get_version = dlsym(RTLD_NEXT, "nvme_get_version"); - - if (libnvme_get_version) - return libnvme_get_version(type); +#define VOID_FN(name, proto, args) \ +void __attribute__((weak)) name(proto) \ +{ \ + void (*fn)(proto); \ + fn = dlsym(RTLD_NEXT, #name); \ + if (fn) \ + fn(args); \ +} - return "n/a"; +#define FN(name, rtype, proto, args, fallback) \ +rtype __attribute__((weak)) name(proto) \ +{ \ + rtype (*fn)(proto); \ + fn = dlsym(RTLD_NEXT, #name); \ + if (fn) \ + return fn(args); \ + return fallback; \ } + +FN(nvme_get_version, + const char *, PROTO(enum nvme_version type), + ARGS(type), "n/a") + +VOID_FN(nvme_init_copy_range_f1, + PROTO(struct nvme_copy_range_f1 *copy, __u16 *nlbs, + __u64 *slbas, __u64 *eilbrts, __u32 *elbatms, + __u32 *elbats, __u16 nr), + ARGS(copy, nlbs, slbas, eilbrts, elbatms, elbats, nr)) -- cgit v1.2.3