From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Fri, 9 Dec 2011 18:06:04 +0000 (-0200)
Subject: Pass enum around instead of filename
X-Git-Tag: v1~55^2~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=810803dbe8226ff1518af1f449bc974969d39bb9;p=thirdparty%2Fkmod.git

Pass enum around instead of filename

This will allow us to later use the index to search these indexes.
---

diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
index 847bc4be..b93b226e 100644
--- a/libkmod/libkmod.c
+++ b/libkmod/libkmod.c
@@ -354,7 +354,7 @@ void kmod_pool_del_module(struct kmod_ctx *ctx, struct kmod_module *mod)
 }
 
 static int kmod_lookup_alias_from_alias_bin(struct kmod_ctx *ctx,
-						const char *file,
+						enum kmod_index index_number,
 						const char *name,
 						struct kmod_list **list)
 {
@@ -364,7 +364,8 @@ static int kmod_lookup_alias_from_alias_bin(struct kmod_ctx *ctx,
 	struct index_value *realnames, *realname;
 
 	fn[PATH_MAX - 1] = '\0';
-	snprintf(fn, sizeof(fn) - 1, "%s/%s.bin", ctx->dirname, file);
+	snprintf(fn, sizeof(fn) - 1, "%s/%s.bin", ctx->dirname,
+						index_files[index_number]);
 
 	DBG(ctx, "file=%s name=%s\n", fn, name);
 
@@ -404,15 +405,15 @@ int kmod_lookup_alias_from_symbols_file(struct kmod_ctx *ctx, const char *name,
 	if (!startswith(name, "symbol:"))
 		return 0;
 
-	return kmod_lookup_alias_from_alias_bin(ctx,
-				index_files[KMOD_INDEX_SYMBOL], name, list);
+	return kmod_lookup_alias_from_alias_bin(ctx, KMOD_INDEX_SYMBOL, name,
+									list);
 }
 
 int kmod_lookup_alias_from_aliases_file(struct kmod_ctx *ctx, const char *name,
 						struct kmod_list **list)
 {
-	return kmod_lookup_alias_from_alias_bin(ctx,
-				index_files[KMOD_INDEX_ALIAS], name, list);
+	return kmod_lookup_alias_from_alias_bin(ctx, KMOD_INDEX_ALIAS, name,
+									list);
 }
 
 char *kmod_search_moddep(struct kmod_ctx *ctx, const char *name)