From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Wed, 4 Jun 2025 16:16:25 +0000 (+0100)
Subject: tools/depmod: explicitly return ENOMEM on hash_new() failure
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=137e47880f3c8ac7c5b687442d3548eab2fa381b;p=thirdparty%2Fkmod.git

tools/depmod: explicitly return ENOMEM on hash_new() failure

The function will always set errno of ENOMEM, so we might as well use
that. Making the code more consistent and removing a few bytes/LoC.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/368
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/tools/depmod.c b/tools/depmod.c
index 9883d79f..9b0a9cd9 100644
--- a/tools/depmod.c
+++ b/tools/depmod.c
@@ -1034,30 +1034,22 @@ static void symbol_free(void *data)
 
 static int depmod_init(struct depmod *depmod, struct cfg *cfg, struct kmod_ctx *ctx)
 {
-	int err = 0;
-
 	depmod->cfg = cfg;
 	depmod->ctx = ctx;
 
 	array_init(&depmod->modules, 128);
 
 	depmod->modules_by_uncrelpath = hash_new(512, NULL);
-	if (depmod->modules_by_uncrelpath == NULL) {
-		err = -errno;
+	if (depmod->modules_by_uncrelpath == NULL)
 		goto modules_by_uncrelpath_failed;
-	}
 
 	depmod->modules_by_name = hash_new(512, NULL);
-	if (depmod->modules_by_name == NULL) {
-		err = -errno;
+	if (depmod->modules_by_name == NULL)
 		goto modules_by_name_failed;
-	}
 
 	depmod->symbols = hash_new(2048, symbol_free);
-	if (depmod->symbols == NULL) {
-		err = -errno;
+	if (depmod->symbols == NULL)
 		goto symbols_failed;
-	}
 
 	return 0;
 
@@ -1066,7 +1058,7 @@ symbols_failed:
 modules_by_name_failed:
 	hash_free(depmod->modules_by_uncrelpath);
 modules_by_uncrelpath_failed:
-	return err;
+	return -ENOMEM;
 }
 
 static void depmod_shutdown(struct depmod *depmod)