[PATCH v4 13/13] virdnsmasq: Join dnsmasqCapsNewEmpty() and dnsmasqCapsNewFromBinary()

[Michal Privoznik]

After previous cleanups, there's just one caller of
dnsmasqCapsNewEmpty() and it is dnsmasqCapsNewFromBinary().
And the former is pretty short. Therefore, it is not necessary
for the code to live in two separate functions. Dissolve the
former in the latter.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
Reviewed-by: Andrea Bolognani <abologna at redhat.com>
---
 src/util/virdnsmasq.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index f5029d2fdc..57b24c9f6a 100644
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -661,13 +661,14 @@ dnsmasqCapsRefreshInternal(dnsmasqCaps *caps)
     return dnsmasqCapsSetFromBuffer(caps, version);
 }
 
-static dnsmasqCaps *
-dnsmasqCapsNewEmpty(void)
+dnsmasqCaps *
+dnsmasqCapsNewFromBinary(void)
 {
     g_autoptr(dnsmasqCaps) caps = NULL;
 
     if (dnsmasqCapsInitialize() < 0)
         return NULL;
+
     if (!(caps = virObjectNew(dnsmasqCapsClass)))
         return NULL;
 
@@ -677,17 +678,6 @@ dnsmasqCapsNewEmpty(void)
         return NULL;
     }
 
-    return g_steal_pointer(&caps);
-}
-
-dnsmasqCaps *
-dnsmasqCapsNewFromBinary(void)
-{
-    g_autoptr(dnsmasqCaps) caps = dnsmasqCapsNewEmpty();
-
-    if (!caps)
-        return NULL;
-
     if (dnsmasqCapsRefreshInternal(caps) < 0)
         return NULL;
 
-- 
2.34.1