[libvirt PATCH 05/17] virdnsmasq: remove binaryPath argument from dnsmasqCapsNewFromBinary
We always pass DNSMASQ so there is no need for the argument at all.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/network/bridge_driver.c | 4 ++--
src/util/virdnsmasq.c | 4 ++--
src/util/virdnsmasq.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 706a557ee8..ee3f9dab0a 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -130,7 +130,7 @@ networkDnsmasqCapsRefresh(virNetworkDriverState *driver)
{
dnsmasqCaps *caps;
- if (!(caps = dnsmasqCapsNewFromBinary(DNSMASQ)))
+ if (!(caps = dnsmasqCapsNewFromBinary()))
return -1;
networkDriverLock(driver);
@@ -749,7 +749,7 @@ networkStateInitialize(bool privileged,
goto error;
/* if this fails now, it will be retried later with networkDnsmasqCapsRefresh() */
- network_driver->dnsmasqCaps = dnsmasqCapsNewFromBinary(DNSMASQ);
+ network_driver->dnsmasqCaps = dnsmasqCapsNewFromBinary();
if (!(network_driver->networks = virNetworkObjListNew()))
goto error;
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 82a26e83e9..f2f606913f 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -759,9 +759,9 @@ dnsmasqCapsNewFromBuffer(const char *buf)
}
dnsmasqCaps *
-dnsmasqCapsNewFromBinary(const char *binaryPath)
+dnsmasqCapsNewFromBinary(void)
{
- 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 cf6d50fe38..ee9839cd25 100644
--- a/src/util/virdnsmasq.h
+++ b/src/util/virdnsmasq.h
@@ -100,7 +100,7 @@ int dnsmasqDelete(const dnsmasqContext *ctx);
int dnsmasqReload(pid_t pid);
dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf);
-dnsmasqCaps *dnsmasqCapsNewFromBinary(const char *binaryPath);
+dnsmasqCaps *dnsmasqCapsNewFromBinary(void);
bool dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag);
const char *dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps);
unsigned long dnsmasqCapsGetVersion(dnsmasqCaps *caps);
--
2.30.2