[PATCH 02/23] virDomainDeviceValidateAliasImpl: Automatically free GHashTable and remove cleanup
After the conversion to g_autofree, the cleanup label is no longer
needed.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/conf/domain_validate.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 80401cf8c7..a4271f1247 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -1360,28 +1360,23 @@ static int
virDomainDeviceValidateAliasImpl(const virDomainDef *def,
virDomainDeviceDef *dev)
{
- GHashTable *aliases = NULL;
+ g_autoptr(GHashTable) aliases = NULL;
virDomainDeviceInfo *info = virDomainDeviceGetInfo(dev);
- int ret = -1;
if (!info || !info->alias)
return 0;
if (virDomainDefValidateAliases(def, &aliases) < 0)
- goto cleanup;
+ return -1;
if (virHashLookup(aliases, info->alias)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("non unique alias detected: %s"),
info->alias);
- goto cleanup;
+ return -1;
}
- ret = 0;
- cleanup:
-
- virHashFree(aliases);
- return ret;
+ return 0;
}
--
2.31.1