[libvirt] [PATCH v4 3/8] nssmock: Adapt to virmock.h

Instead of introducing our own wrapper for dlsym() we can use the one provided by virmock.h. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- tests/nssmock.c | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/tests/nssmock.c b/tests/nssmock.c index 31b1177..ee1d948 100644 --- a/tests/nssmock.c +++ b/tests/nssmock.c @@ -21,21 +21,18 @@ #include <config.h> #ifdef NSS -# include <stdio.h> -# include <stdlib.h> -# include <dlfcn.h> +# include "virmock.h" # include <sys/types.h> # include <dirent.h> # include <sys/stat.h> # include <fcntl.h> # include "configmake.h" -# include "internal.h" # include "virstring.h" # include "viralloc.h" -static int (*realopen)(const char *path, int flags, ...); -static DIR * (*realopendir)(const char *name); +static int (*real_open)(const char *path, int flags, ...); +static DIR * (*real_opendir)(const char *name); # define LEASEDIR LOCALSTATEDIR "/lib/libvirt/dnsmasq/" @@ -59,17 +56,11 @@ static DIR * (*realopendir)(const char *name); static void init_syms(void) { - if (realopen) + if (real_open) return; -# define LOAD_SYM(name) \ - do { \ - if (!(real ## name = dlsym(RTLD_NEXT, #name))) \ - ABORT("Cannot find real '%s' symbol\n", #name); \ - } while (0) - - LOAD_SYM(open); - LOAD_SYM(opendir); + VIR_MOCK_REAL_INIT(open); + VIR_MOCK_REAL_INIT(opendir); } static int @@ -109,9 +100,9 @@ open(const char *path, int flags, ...) va_start(ap, flags); mode = va_arg(ap, int); va_end(ap); - ret = realopen(newpath ? newpath : path, flags, mode); + ret = real_open(newpath ? newpath : path, flags, mode); } else { - ret = realopen(newpath ? newpath : path, flags); + ret = real_open(newpath ? newpath : path, flags); } VIR_FREE(newpath); @@ -130,7 +121,7 @@ opendir(const char *path) getrealpath(&newpath, path) < 0) return NULL; - ret = realopendir(newpath ? newpath : path); + ret = real_opendir(newpath ? newpath : path); VIR_FREE(newpath); return ret; -- 2.8.1