mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-08 16:54:49 +00:00
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 <skrtbhtngr@gmail.com> Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
parent
cbc1326b21
commit
f7d0663d49
@ -38,7 +38,6 @@
|
|||||||
#include "virnetlink.h"
|
#include "virnetlink.h"
|
||||||
#include "virnetdev.h"
|
#include "virnetdev.h"
|
||||||
#include "virlog.h"
|
#include "virlog.h"
|
||||||
#include "viralloc.h"
|
|
||||||
#include "virthread.h"
|
#include "virthread.h"
|
||||||
#include "virmacaddr.h"
|
#include "virmacaddr.h"
|
||||||
#include "virerror.h"
|
#include "virerror.h"
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
# include "internal.h"
|
# include "internal.h"
|
||||||
# include "virmacaddr.h"
|
# include "virmacaddr.h"
|
||||||
|
# include "viralloc.h"
|
||||||
|
|
||||||
# if defined(__linux__) && defined(HAVE_LIBNL)
|
# if defined(__linux__) && defined(HAVE_LIBNL)
|
||||||
|
|
||||||
@ -44,6 +45,8 @@ struct nlmsghdr;
|
|||||||
|
|
||||||
# endif /* __linux__ */
|
# endif /* __linux__ */
|
||||||
|
|
||||||
|
typedef struct nl_msg virNetlinkMsg;
|
||||||
|
|
||||||
int virNetlinkStartup(void);
|
int virNetlinkStartup(void);
|
||||||
void virNetlinkShutdown(void);
|
void virNetlinkShutdown(void);
|
||||||
|
|
||||||
@ -123,4 +126,6 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB,
|
|||||||
int virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr,
|
int virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr,
|
||||||
unsigned int protocol);
|
unsigned int protocol);
|
||||||
|
|
||||||
|
VIR_DEFINE_AUTOPTR_FUNC(virNetlinkMsg, nlmsg_free)
|
||||||
|
|
||||||
#endif /* __VIR_NETLINK_H__ */
|
#endif /* __VIR_NETLINK_H__ */
|
||||||
|
Loading…
Reference in New Issue
Block a user