From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Date: Tue, 31 Jan 2012 18:05:02 +0000 (-0200)
Subject: Prepare for API bump
X-Git-Tag: v5~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bc189567447885e9c2e5a2101d050c0a4b42531;p=thirdparty%2Fkmod.git

Prepare for API bump
---

diff --git a/TODO b/TODO
index 1d6a5fe1..23d7c764 100644
--- a/TODO
+++ b/TODO
@@ -19,10 +19,6 @@ Features:
    - kmod_module_symbols_free_list()
    - kmod_module_dependency_symbols_free_list()
 
-* unify code from modprobe and libkmod:
-   - remove kmod_module_probe_insert() and turn it into
-     kmod_module_probe_get_list(); this way modprobe can use it too
-
 * provide modules.archive, a cache file with all modules compressed
   and a fast access. It's like a tar.gz, but with each entry
   compressed as opposed to the whole tar compressed, easy to pick
diff --git a/libkmod/libkmod.sym b/libkmod/libkmod.sym
index f2d704de..1f03d3c7 100644
--- a/libkmod/libkmod.sym
+++ b/libkmod/libkmod.sym
@@ -1,4 +1,4 @@
-LIBKMOD_1 {
+LIBKMOD_5 {
 global:
 	kmod_get_log_priority;
 	kmod_get_userdata;
@@ -11,9 +11,22 @@ global:
 	kmod_unref;
 	kmod_list_next;
 	kmod_list_prev;
+	kmod_list_last;
 
 	kmod_load_resources;
 	kmod_unload_resources;
+	kmod_validate_resources;
+	kmod_config_get_blacklists;
+	kmod_config_get_install_commands;
+	kmod_config_get_remove_commands;
+	kmod_config_get_aliases;
+	kmod_config_get_options;
+	kmod_config_get_softdeps;
+	kmod_config_iter_get_key;
+	kmod_config_iter_get_value;
+	kmod_config_iter_next;
+	kmod_config_iter_free_iter;
+	kmod_dump_index;
 
 	kmod_module_new_from_name;
 	kmod_module_new_from_path;
@@ -22,11 +35,13 @@ global:
 	kmod_module_ref;
 	kmod_module_unref;
 	kmod_module_unref_list;
+	kmod_module_get_module;
 	kmod_module_remove_module;
 	kmod_module_insert_module;
-	kmod_module_get_dependencies;
-	kmod_module_get_module;
+	kmod_module_probe_insert_module;
 
+	kmod_module_get_dependencies;
+	kmod_module_get_softdeps;
 	kmod_module_get_filtered_blacklist;
 
 	kmod_module_get_name;
@@ -45,15 +60,7 @@ global:
 	kmod_module_get_options;
 	kmod_module_get_install_commands;
 	kmod_module_get_remove_commands;
-local:
-        *;
-};
-
-LIBKMOD_2 {
-global:
-	kmod_list_last;
 
-	kmod_module_get_softdeps;
 	kmod_module_get_info;
 	kmod_module_info_get_key;
 	kmod_module_info_get_value;
@@ -62,12 +69,6 @@ global:
 	kmod_module_version_get_symbol;
 	kmod_module_version_get_crc;
 	kmod_module_versions_free_list;
-} LIBKMOD_1;
-
-LIBKMOD_3 {
-global:
-	kmod_validate_resources;
-
 	kmod_module_get_symbols;
 	kmod_module_symbol_get_symbol;
 	kmod_module_symbol_get_crc;
@@ -78,21 +79,6 @@ global:
 	kmod_module_dependency_symbol_get_crc;
 	kmod_module_dependency_symbol_get_bind;
 	kmod_module_dependency_symbols_free_list;
-
-	kmod_module_probe_insert_module;
-} LIBKMOD_2;
-
-LIBKMOD_4 {
-global:
-	kmod_config_get_blacklists;
-	kmod_config_get_install_commands;
-	kmod_config_get_remove_commands;
-	kmod_config_get_aliases;
-	kmod_config_get_options;
-	kmod_config_get_softdeps;
-	kmod_config_iter_get_key;
-	kmod_config_iter_get_value;
-	kmod_config_iter_next;
-	kmod_config_iter_free_iter;
-	kmod_dump_index;
-} LIBKMOD_3;
+local:
+        *;
+};