External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

virdnsmasq: remove binaryPath argument from dnsmasqCapsNewFromBuffer

Browse Source 
We always pass DNSMASQ so there is no need for the argument at all.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Pavel Hrdina 2021-04-14 17:46:47 +02:00
parent 6df8455aac
commit 84fd53f555
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/virdnsmasq.c
View File

@ -744,9 +744,9 @@ dnsmasqCapsNewEmpty(const char *binaryPath)
} }
dnsmasqCaps * dnsmasqCaps *
dnsmasqCapsNewFromBuffer(const char *buf, const char *binaryPath) dnsmasqCapsNewFromBuffer(const char *buf)
{ {
dnsmasqCaps *caps = dnsmasqCapsNewEmpty(binaryPath); dnsmasqCaps *caps = dnsmasqCapsNewEmpty(DNSMASQ);
if (!caps) if (!caps)
return NULL; return NULL;

3
src/util/virdnsmasq.h
View File

@ -99,8 +99,7 @@ int dnsmasqSave(const dnsmasqContext *ctx);
int dnsmasqDelete(const dnsmasqContext *ctx); int dnsmasqDelete(const dnsmasqContext *ctx);
int dnsmasqReload(pid_t pid); int dnsmasqReload(pid_t pid);
dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf, dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf);
const char *binaryPath);
dnsmasqCaps *dnsmasqCapsNewFromBinary(const char *binaryPath); dnsmasqCaps *dnsmasqCapsNewFromBinary(const char *binaryPath);
bool dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag); bool dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag);
const char *dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps); const char *dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps);

6
tests/networkxml2conftest.c
View File

@ -123,11 +123,11 @@ mymain(void)
{ {
int ret = 0; int ret = 0;
dnsmasqCaps *restricted dnsmasqCaps *restricted
= dnsmasqCapsNewFromBuffer("Dnsmasq version 2.48", DNSMASQ); = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.48");
dnsmasqCaps *full dnsmasqCaps *full
= dnsmasqCapsNewFromBuffer("Dnsmasq version 2.63\n--bind-dynamic", DNSMASQ); = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.63\n--bind-dynamic");
dnsmasqCaps *dhcpv6 dnsmasqCaps *dhcpv6
= dnsmasqCapsNewFromBuffer("Dnsmasq version 2.64\n--bind-dynamic", DNSMASQ); = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.64\n--bind-dynamic");
#define DO_TEST(xname, xcaps) \ #define DO_TEST(xname, xcaps) \
do { \ do { \