External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

virusbmock: Switch to VIR_MOCK_REAL_INIT()

Browse Source 
Since virusbmock was written 10 years ago, back when we didn't
have virmock.h and its helpers, it open codes symbol resolution
(VIR_MOCK_REAL_INIT). With a bit of cleanup (e.g. renaming
realopen to real_open and so on) it can use virmock.h provided
macros.

And while at it, drop include of virusb.h - there is no
compelling reason for it include the file. The mock just
redirects paths passed to open()/opendir().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Michal Privoznik 2024-03-13 17:35:15 +01:00
parent 78993f618f
commit ce5efefecd
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/virusbmock.c
View File

@ -24,25 +24,21 @@
#include <dlfcn.h>
#include <fcntl.h>
#include "virusb.h"
#include "virmock.h"
#define USB_SYSFS "/sys/bus/usb"
#define FAKE_USB_SYSFS "virusbtestdata/sys_bus_usb"
static int (*realopen)(const char *pathname, int flags, ...);
static DIR *(*realopendir)(const char *name);
static int (*real_open)(const char *pathname, int flags, ...);
static DIR *(*real_opendir)(const char *name);
static void init_syms(void)
{
if (realopen)
if (real_open)
return;
realopen = dlsym(RTLD_NEXT, "open");
realopendir = dlsym(RTLD_NEXT, "opendir");
if (!realopen || !realopendir) {
fprintf(stderr, "Error getting symbols");
abort();
}
VIR_MOCK_REAL_INIT(open);
VIR_MOCK_REAL_INIT(opendir);
}
static char *get_fake_path(const char *real_path)
@ -66,7 +62,7 @@ DIR *opendir(const char *name)
path = get_fake_path(name);
return realopendir(path);
return real_opendir(path);
}
int open(const char *pathname, int flags, ...)
@ -91,6 +87,6 @@ int open(const char *pathname, int flags, ...)
va_end(ap);
}
ret = realopen(path, flags, mode);
ret = real_open(path, flags, mode);
return ret;
}