External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: netlink: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC

Browse Source 
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 <skrtbhtngr@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Sukrit Bhatnagar 2018-08-09 09:42:10 +05:30 committed by Erik Skultety
parent cbc1326b21
commit f7d0663d49
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/util/virnetlink.c
View File

@ -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"

5
src/util/virnetlink.h
View File

@ -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__ */