From f7d0663d491eddf576166d1ab78668b3e7019ac8 Mon Sep 17 00:00:00 2001 From: Sukrit Bhatnagar Date: Thu, 9 Aug 2018 09:42:10 +0530 Subject: [PATCH] util: netlink: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC Using the new VIR_DEFINE_AUTOPTR_FUNC macro defined in src/util/viralloc.h, define a new wrapper around an existing cleanup function which will be called when a variable declared with VIR_AUTOPTR macro goes out of scope. Also, drop the redundant viralloc.h include, since that has moved from the source module into the header. This commit also typedefs virNetlinkMsg to struct nl_msg type for use with the cleanup macros. When a variable of type virNetlinkMsg * is declared using VIR_AUTOPTR, the function nlmsg_free will be run automatically on it when it goes out of scope. Signed-off-by: Sukrit Bhatnagar Reviewed-by: Erik Skultety --- src/util/virnetlink.c | 1 - src/util/virnetlink.h | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 162efe6f99..ecf62c9e72 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -38,7 +38,6 @@ #include "virnetlink.h" #include "virnetdev.h" #include "virlog.h" -#include "viralloc.h" #include "virthread.h" #include "virmacaddr.h" #include "virerror.h" diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 2a9de0a575..136b42b995 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -22,6 +22,7 @@ # include "internal.h" # include "virmacaddr.h" +# include "viralloc.h" # if defined(__linux__) && defined(HAVE_LIBNL) @@ -44,6 +45,8 @@ struct nlmsghdr; # endif /* __linux__ */ +typedef struct nl_msg virNetlinkMsg; + int virNetlinkStartup(void); void virNetlinkShutdown(void); @@ -123,4 +126,6 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB, int virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr, unsigned int protocol); +VIR_DEFINE_AUTOPTR_FUNC(virNetlinkMsg, nlmsg_free) + #endif /* __VIR_NETLINK_H__ */