External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 13:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: socketaddr: 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.

When a variable of type virSocketAddrPtr is declared using
VIR_AUTOPTR, the function virSocketAddrFree 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-07-28 23:31:23 +05:30 committed by Erik Skultety
parent d090c814ab
commit 0b25749709
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/util/virsocketaddr.c
View File

@ -26,7 +26,6 @@
#include "virsocketaddr.h" #include "virsocketaddr.h"
#include "virerror.h" #include "virerror.h"
#include "virstring.h" #include "virstring.h"
#include "viralloc.h"
#include "virbuffer.h" #include "virbuffer.h"
#include <netdb.h> #include <netdb.h>

7
src/util/virsocketaddr.h
View File

@ -24,14 +24,15 @@
#ifndef __VIR_SOCKETADDR_H__ #ifndef __VIR_SOCKETADDR_H__
# define __VIR_SOCKETADDR_H__ # define __VIR_SOCKETADDR_H__
# include "internal.h"
# include <netinet/in.h> # include <netinet/in.h>
# include <sys/socket.h> # include <sys/socket.h>
# ifdef HAVE_SYS_UN_H # ifdef HAVE_SYS_UN_H
# include <sys/un.h> # include <sys/un.h>
# endif # endif
# include "internal.h"
# include "viralloc.h"
/* On architectures which lack these limits, define them (ie. Cygwin). /* On architectures which lack these limits, define them (ie. Cygwin).
* Note that the libvirt code should be robust enough to handle the * Note that the libvirt code should be robust enough to handle the
* case where actual value is longer than these limits (eg. by setting * case where actual value is longer than these limits (eg. by setting
@ -164,4 +165,6 @@ int virSocketAddrPTRDomain(const virSocketAddr *addr,
void virSocketAddrFree(virSocketAddrPtr addr); void virSocketAddrFree(virSocketAddrPtr addr);
VIR_DEFINE_AUTOPTR_FUNC(virSocketAddr, virSocketAddrFree)
#endif /* __VIR_SOCKETADDR_H__ */ #endif /* __VIR_SOCKETADDR_H__ */