Re: [PATCH 05/25] util: remove OOM error log from virGetHostnameImpl()

[Ján Tomko]

On a Wednesday in 2020, Laine Stump wrote:

The strings allocated in virGetHostnameImpl() are all allocated via
g_strdup(), which will exit on OOM anyway, so the call to
virReportOOMError() is redundant, and removing it allows slight
modification to the code, in particular the cleanup label can be
eliminated.

Signed-off-by: Laine Stump 
---
src/util/virutil.c | 10 ++
1 file changed, 2 insertions(+), 8 deletions(-)



Reviewed-by: Ján Tomko 

Jano


signature.asc
Description: PGP signature

[PATCH 05/25] util: remove OOM error log from virGetHostnameImpl()

[Laine Stump]

The strings allocated in virGetHostnameImpl() are all allocated via
g_strdup(), which will exit on OOM anyway, so the call to
virReportOOMError() is redundant, and removing it allows slight
modification to the code, in particular the cleanup label can be
eliminated.

Signed-off-by: Laine Stump 
---
 src/util/virutil.c | 10 ++
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/util/virutil.c b/src/util/virutil.c
index f39122e8dd..04f882fda7 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -503,8 +503,7 @@ virGetHostnameImpl(bool quiet)
  * string as-is; it's up to callers to check whether "localhost"
  * is allowed.
  */
-result = g_strdup(hostname);
-goto cleanup;
+return g_strdup(hostname);
 }
 
 /* otherwise, it's a shortened, non-localhost, hostname.  Attempt to
@@ -519,8 +518,7 @@ virGetHostnameImpl(bool quiet)
 if (!quiet)
 VIR_WARN("getaddrinfo failed for '%s': %s",
  hostname, gai_strerror(r));
-result = g_strdup(hostname);
-goto cleanup;
+return g_strdup(hostname);
 }
 
 /* Tell static analyzers about getaddrinfo semantics.  */
@@ -538,10 +536,6 @@ virGetHostnameImpl(bool quiet)
 result = g_strdup(info->ai_canonname);
 
 freeaddrinfo(info);
-
- cleanup:
-if (!result)
-virReportOOMError();
 return result;
 }
 
-- 
2.25.4