[libvirt PATCH 04/17] virdnsmasq: remove binaryPath argument from dnsmasqCapsNewFromBuffer
We always pass DNSMASQ so there is no need for the argument at all.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/util/virdnsmasq.c | 4 ++--
src/util/virdnsmasq.h | 3 +--
tests/networkxml2conftest.c | 6 +++---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 89f33c22a8..82a26e83e9 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -744,9 +744,9 @@ dnsmasqCapsNewEmpty(const char *binaryPath)
}
dnsmasqCaps *
-dnsmasqCapsNewFromBuffer(const char *buf, const char *binaryPath)
+dnsmasqCapsNewFromBuffer(const char *buf)
{
- dnsmasqCaps *caps = dnsmasqCapsNewEmpty(binaryPath);
+ dnsmasqCaps *caps = dnsmasqCapsNewEmpty(DNSMASQ);
if (!caps)
return NULL;
diff --git a/src/util/virdnsmasq.h b/src/util/virdnsmasq.h
index 8b9474f774..cf6d50fe38 100644
--- a/src/util/virdnsmasq.h
+++ b/src/util/virdnsmasq.h
@@ -99,8 +99,7 @@ int dnsmasqSave(const dnsmasqContext *ctx);
int dnsmasqDelete(const dnsmasqContext *ctx);
int dnsmasqReload(pid_t pid);
-dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf,
- const char *binaryPath);
+dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf);
dnsmasqCaps *dnsmasqCapsNewFromBinary(const char *binaryPath);
bool dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag);
const char *dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps);
diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index 402244ea4a..7444390b77 100644
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -123,11 +123,11 @@ mymain(void)
{
int ret = 0;
dnsmasqCaps *restricted
- = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.48", DNSMASQ);
+ = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.48");
dnsmasqCaps *full
- = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.63\n--bind-dynamic",
DNSMASQ);
+ = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.63\n--bind-dynamic");
dnsmasqCaps *dhcpv6
- = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.64\n--bind-dynamic",
DNSMASQ);
+ = dnsmasqCapsNewFromBuffer("Dnsmasq version 2.64\n--bind-dynamic");
#define DO_TEST(xname, xcaps) \
do { \
--
2.30.2