[libvirt] [PATCH 2/2] 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 --- src/util/virnetdev.c | 3 +-- src/util/virnetlink.c | 6 ++ 2 files changed, 3 insertions(+), 6 deletions(-) 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; } -- 2.14.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/2] Fix the build on non-linux platforms after VIR_AUTOPTR related changes
On Wed, Aug 08, 2018 at 08:23:42AM +0200, Erik Skultety wrote: 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. If you keep the series bisectable even with clang with warnings turned on, you can GET a cookie! Signed-off-by: Erik Skultety --- src/util/virnetdev.c | 3 +-- src/util/virnetlink.c | 6 ++ 2 files changed, 3 insertions(+), 6 deletions(-) This fixes the build for me with CLang 5.0.1 Reviewed-by: Ján Tomko Jano signature.asc Description: Digital signature -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/2] Fix the build on non-linux platforms after VIR_AUTOPTR related changes
On Wed, Aug 08, 2018 at 09:16:20AM +0200, Ján Tomko wrote: > On Wed, Aug 08, 2018 at 08:23:42AM +0200, Erik Skultety wrote: > > 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. > > > > If you keep the series bisectable even with clang with warnings turned > on, you can GET a cookie! > > > Signed-off-by: Erik Skultety > > --- > > src/util/virnetdev.c | 3 +-- > > src/util/virnetlink.c | 6 ++ > > 2 files changed, 3 insertions(+), 6 deletions(-) > > > > This fixes the build for me with CLang 5.0.1 > > Reviewed-by: Ján Tomko Pushed, thanks. Erik -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
