From 569fcd6e2e9f069a0c25e177de900e81b99a0001 Mon Sep 17 00:00:00 2001 From: Tim Wiederhake Date: Fri, 11 Sep 2020 13:42:17 +0200 Subject: [PATCH] util: Use glib memory functions in virFileGetXAttrQuiet MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Tim Wiederhake Reviewed-by: Ján Tomko Signed-off-by: Ján Tomko --- src/util/virfile.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 90156845df..61d2c16072 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -4327,8 +4327,7 @@ virFileGetXAttrQuiet(const char *path, const char *name, char **value) { - char *buf = NULL; - int ret = -1; + g_autofree char *buf = NULL; /* We might be racing with somebody who sets the same attribute. */ while (1) { @@ -4337,15 +4336,14 @@ virFileGetXAttrQuiet(const char *path, /* The first call determines how many bytes we need to allocate. */ if ((need = getxattr(path, name, NULL, 0)) < 0) - goto cleanup; + return -1; - if (VIR_REALLOC_N_QUIET(buf, need + 1) < 0) - goto cleanup; + buf = g_renew(char, buf, need + 1); if ((got = getxattr(path, name, buf, need)) < 0) { if (errno == ERANGE) continue; - goto cleanup; + return -1; } buf[got] = '\0'; @@ -4353,10 +4351,7 @@ virFileGetXAttrQuiet(const char *path, } *value = g_steal_pointer(&buf); - ret = 0; - cleanup: - VIR_FREE(buf); - return ret; + return 0; } /** -- 2.47.2