From: Tobias Stoeckmann Date: Thu, 24 Oct 2024 19:09:53 +0000 (+0200) Subject: libkmod: Unify kmod_module_new_from_* functions X-Git-Tag: v34~154 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4891b4b095aee69d6afeff9eb2f6bb67b936e0f6;p=thirdparty%2Fkmod.git libkmod: Unify kmod_module_new_from_* functions Return result of kmod_module_new directly in kmod_module_new_from_alias so this function handles return values like the others. Signed-off-by: Tobias Stoeckmann Reviewed-by: Emil Velikov Link: https://github.com/kmod-project/kmod/pull/211 Signed-off-by: Lucas De Marchi --- diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c index d79df4d6..905b050d 100644 --- a/libkmod/libkmod-module.c +++ b/libkmod/libkmod-module.c @@ -291,7 +291,6 @@ KMOD_EXPORT int kmod_module_new_from_name(struct kmod_ctx *ctx, const char *name int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias, const char *name, struct kmod_module **mod) { - int err; char key[PATH_MAX]; size_t namelen = strlen(name); size_t aliaslen = strlen(alias); @@ -303,11 +302,7 @@ int kmod_module_new_from_alias(struct kmod_ctx *ctx, const char *alias, const ch memcpy(key + namelen + 1, alias, aliaslen + 1); key[namelen] = '\\'; - err = kmod_module_new(ctx, key, name, namelen, alias, aliaslen, mod); - if (err < 0) - return err; - - return 0; + return kmod_module_new(ctx, key, name, namelen, alias, aliaslen, mod); } KMOD_EXPORT int kmod_module_new_from_path(struct kmod_ctx *ctx, const char *path,