From: Erik Skultety <eskultet@redhat.com>
Date: Tue, 7 Aug 2018 16:40:11 +0000 (+0200)
Subject: Fix the build on non-linux platforms after VIR_AUTOPTR related changes
X-Git-Tag: v4.7.0-rc1~284
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e63aa3c6648213f5b3ecd974c5365ad61403adfe;p=thirdparty%2Flibvirt.git

Fix the build on non-linux platforms after VIR_AUTOPTR related changes

Commits 7b706f33ac and 4acb7887e4 introduced some compound type *Free
wrappers in order to use them with VIR_DEFINE_AUTOPTR_FUNC. However,
since those were not used in the code right away, Clang complained about
unused functions (static ones that are defined by the macro above).
This patch puts the defined functions in use.

Signed-off-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 9eca786c95..8eac419725 100644
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -2833,7 +2833,7 @@ static int virNetDevGetMcastList(const char *ifname,
     char *buf = NULL;
     char *next = NULL;
     int ret = -1, len;
-    virNetDevMcastEntryPtr entry = NULL;
+    VIR_AUTOPTR(virNetDevMcastEntry) entry = NULL;
 
     mcast->entries = NULL;
     mcast->nentries = 0;
@@ -2867,7 +2867,6 @@ static int virNetDevGetMcastList(const char *ifname,
     ret = 0;
  cleanup:
     VIR_FREE(buf);
-    VIR_FREE(entry);
 
     return ret;
 }
diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 2702c12d24..162efe6f99 100644
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -305,7 +305,7 @@ int virNetlinkCommand(struct nl_msg *nl_msg,
             .nl_groups = 0,
     };
     struct pollfd fds[1];
-    virNetlinkHandle *nlhandle = NULL;
+    VIR_AUTOPTR(virNetlinkHandle) nlhandle = NULL;
     int len = 0;
 
     memset(fds, 0, sizeof(fds));
@@ -333,7 +333,6 @@ int virNetlinkCommand(struct nl_msg *nl_msg,
         *respbuflen = 0;
     }
 
-    virNetlinkFree(nlhandle);
     return ret;
 }
 
@@ -355,7 +354,7 @@ virNetlinkDumpCommand(struct nl_msg *nl_msg,
             .nl_pid    = dst_pid,
             .nl_groups = 0,
     };
-    virNetlinkHandle *nlhandle = NULL;
+    VIR_AUTOPTR(virNetlinkHandle) nlhandle = NULL;
 
     if (!(nlhandle = virNetlinkSendRequest(nl_msg, src_pid, nladdr,
                                            protocol, groups)))
@@ -382,7 +381,6 @@ virNetlinkDumpCommand(struct nl_msg *nl_msg,
 
  cleanup:
     VIR_FREE(resp);
-    virNetlinkFree(nlhandle);
     return ret;
 }