nssmock: Prefer free() over VIR_FREE()

Problem with VIR_FREE() is that we are not linking
libvirt-utils.so to our mock libs therefore there will be an
unresolved symbol. Fortunately, nsstest that eventually links
with the nssmock links also with libvirt-utils.so and thus the
symbol is resolved after all. However, if one wants to run the
test binary under valgrind it is impossible to do so. Because of
the unresolved symbol.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2016-11-29 14:59:25 +01:00
parent 03e3da2212
commit 1ef3ac82a3
2 changed files with 3 additions and 3 deletions

2
cfg.mk
View File

@ -1159,7 +1159,7 @@ exclude_file_name_regexp--sc_prohibit_select = \
^cfg\.mk$$
exclude_file_name_regexp--sc_prohibit_raw_allocation = \
^(docs/hacking\.html\.in|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|vircgroupmock)\.c|tools/wireshark/src/packet-libvirt\.c)$$
^(docs/hacking\.html\.in|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock)\.c|tools/wireshark/src/packet-libvirt\.c)$$
exclude_file_name_regexp--sc_prohibit_readlink = \
^src/(util/virutil|lxc/lxc_container)\.c$$

View File

@ -91,7 +91,7 @@ open(const char *path, int flags, ...)
ret = real_open(newpath ? newpath : path, flags);
}
VIR_FREE(newpath);
free(newpath);
return ret;
}
@ -109,7 +109,7 @@ opendir(const char *path)
ret = real_opendir(newpath ? newpath : path);
VIR_FREE(newpath);
free(newpath);
return ret;
}
#else