[libvirt PATCH v2 03/21] virdnsmasq: drop unused dnsmasqCapsRefresh function

Pavel Hrdina posted 21 patches 4 years, 9 months ago
There is a newer version of this series
[libvirt PATCH v2 03/21] virdnsmasq: drop unused dnsmasqCapsRefresh function
Posted by Pavel Hrdina 4 years, 9 months ago
Instead of removing binaryPath let's drop the function completely as
it is not used anywhere.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---
 src/libvirt_private.syms |  1 -
 src/util/virdnsmasq.c    | 17 -----------------
 src/util/virdnsmasq.h    |  1 -
 3 files changed, 19 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d60d15a43e..34e22d37d6 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2091,7 +2091,6 @@ dnsmasqCapsGetBinaryPath;
 dnsmasqCapsGetVersion;
 dnsmasqCapsNewFromBinary;
 dnsmasqCapsNewFromBuffer;
-dnsmasqCapsRefresh;
 dnsmasqContextFree;
 dnsmasqContextNew;
 dnsmasqDelete;
diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index 57f7ef67f1..89f33c22a8 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -773,23 +773,6 @@ dnsmasqCapsNewFromBinary(const char *binaryPath)
     return caps;
 }
 
-/** dnsmasqCapsRefresh:
- *
- *   Refresh an existing caps object if the binary has changed. If
- *   there isn't yet a caps object (if it's NULL), create a new one.
- *
- *   Returns 0 on success, -1 on failure
- */
-int
-dnsmasqCapsRefresh(dnsmasqCaps **caps, const char *binaryPath)
-{
-    if (!*caps) {
-        *caps = dnsmasqCapsNewFromBinary(binaryPath);
-        return *caps ? 0 : -1;
-    }
-    return dnsmasqCapsRefreshInternal(*caps, false);
-}
-
 const char *
 dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps)
 {
diff --git a/src/util/virdnsmasq.h b/src/util/virdnsmasq.h
index 09e6164dc0..8b9474f774 100644
--- a/src/util/virdnsmasq.h
+++ b/src/util/virdnsmasq.h
@@ -102,7 +102,6 @@ int              dnsmasqReload(pid_t pid);
 dnsmasqCaps *dnsmasqCapsNewFromBuffer(const char *buf,
                                         const char *binaryPath);
 dnsmasqCaps *dnsmasqCapsNewFromBinary(const char *binaryPath);
-int dnsmasqCapsRefresh(dnsmasqCaps **caps, const char *binaryPath);
 bool dnsmasqCapsGet(dnsmasqCaps *caps, dnsmasqCapsFlags flag);
 const char *dnsmasqCapsGetBinaryPath(dnsmasqCaps *caps);
 unsigned long dnsmasqCapsGetVersion(dnsmasqCaps *caps);
-- 
2.30.2

Re: [libvirt PATCH v2 03/21] virdnsmasq: drop unused dnsmasqCapsRefresh function
Posted by Daniel P. Berrangé 4 years, 9 months ago
On Mon, Apr 19, 2021 at 07:14:06PM +0200, Pavel Hrdina wrote:
> Instead of removing binaryPath let's drop the function completely as
> it is not used anywhere.
> 
> Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
> ---
>  src/libvirt_private.syms |  1 -
>  src/util/virdnsmasq.c    | 17 -----------------
>  src/util/virdnsmasq.h    |  1 -
>  3 files changed, 19 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|