Re: [PATCH v2 03/17] virfdstream: Use autoptr for virFDStreamMsg

[Peter Krempa]

On Tue, Jul 07, 2020 at 21:46:21 +0200, Michal Privoznik wrote:
> A cleanup function can be declared for virFDStreamMsg type so
> that the structure doesn't have to be freed explicitly.
> 
> Signed-off-by: Michal Privoznik 
> ---
>  src/util/virfdstream.c | 11 +--
>  1 file changed, 5 insertions(+), 6 deletions(-)

Reviewed-by: Peter Krempa 

[PATCH v2 03/17] virfdstream: Use autoptr for virFDStreamMsg

[Michal Privoznik]

A cleanup function can be declared for virFDStreamMsg type so
that the structure doesn't have to be freed explicitly.

Signed-off-by: Michal Privoznik 
---
 src/util/virfdstream.c | 11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c
index 6efe6c17ad..25661736ca 100644
--- a/src/util/virfdstream.c
+++ b/src/util/virfdstream.c
@@ -208,6 +208,8 @@ virFDStreamMsgFree(virFDStreamMsgPtr msg)
 VIR_FREE(msg);
 }
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virFDStreamMsg, virFDStreamMsgFree);
+
 
 static void
 virFDStreamMsgQueueFree(virFDStreamMsgPtr *queue)
@@ -428,7 +430,7 @@ virFDStreamThreadDoRead(virFDStreamDataPtr fdst,
 size_t *dataLen,
 size_t buflen)
 {
-virFDStreamMsgPtr msg = NULL;
+g_autoptr(virFDStreamMsg) msg = NULL;
 int inData = 0;
 long long sectionLen = 0;
 g_autofree char *buf = NULL;
@@ -494,7 +496,6 @@ virFDStreamThreadDoRead(virFDStreamDataPtr fdst,
 return got;
 
  error:
-virFDStreamMsgFree(msg);
 return -1;
 }
 
@@ -761,7 +762,7 @@ virFDStreamAbort(virStreamPtr st)
 static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes)
 {
 virFDStreamDataPtr fdst = st->privateData;
-virFDStreamMsgPtr msg = NULL;
+g_autoptr(virFDStreamMsg) msg = NULL;
 int ret = -1;
 
 if (nbytes > INT_MAX) {
@@ -838,7 +839,6 @@ static int virFDStreamWrite(virStreamPtr st, const char 
*bytes, size_t nbytes)
 
  cleanup:
 virObjectUnlock(fdst);
-virFDStreamMsgFree(msg);
 return ret;
 }
 
@@ -960,7 +960,7 @@ virFDStreamSendHole(virStreamPtr st,
 unsigned int flags)
 {
 virFDStreamDataPtr fdst = st->privateData;
-virFDStreamMsgPtr msg = NULL;
+g_autoptr(virFDStreamMsg) msg = NULL;
 off_t off;
 int ret = -1;
 
@@ -1028,7 +1028,6 @@ virFDStreamSendHole(virStreamPtr st,
 ret = 0;
  cleanup:
 virObjectUnlock(fdst);
-virFDStreamMsgFree(msg);
 return ret;
 }
 
-- 
2.26.2