From: Daniel Wagner Date: Mon, 24 Oct 2022 13:43:04 +0000 (+0200) Subject: libnvme-wrap: Avoid fallback as variable name X-Git-Tag: v2.2~13^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cc5bd7a3dca9cabb31beae05e3ab9e61da239fb4;p=users%2Fsagi%2Fnvme-cli.git libnvme-wrap: Avoid fallback as variable name The libnvme util.h header file has support for the 'fallback statement' for older compilers. This is done by precompiler tricks which will replace all 'fallback' texts. So we should avoid fallback as variable name. Signed-off-by: Daniel Wagner --- diff --git a/libnvme-wrap.c b/libnvme-wrap.c index 2ba5b322..c3c6dd22 100644 --- a/libnvme-wrap.c +++ b/libnvme-wrap.c @@ -21,14 +21,14 @@ void __attribute__((weak)) name(proto) \ fn(args); \ } -#define FN(name, rtype, proto, args, fallback) \ +#define FN(name, rtype, proto, args, defret) \ rtype __attribute__((weak)) name(proto) \ { \ rtype (*fn)(proto); \ fn = dlsym(RTLD_NEXT, #name); \ if (fn) \ return fn(args); \ - return fallback; \ + return defret; \ } FN(nvme_get_version,