Libconfig Interfaced

Ready for plugin use.
Thanks to Haruna

Signed-off-by: shennetsind <ind@henn.et>

1 files changed, 116 insertions, 42 deletions

diff --git a/src/common/conf.c b/src/common/conf.c
index 813069ac4..b816b2f7f 100644
--- a/src/common/conf.c
+++ b/src/common/conf.c
@@ -7,13 +7,16 @@
 
 #include "../common/showmsg.h" // ShowError
 
-int conf_read_file(config_t *config, const char *config_filename)
-{
-	config_init(config);
-	if (!config_read_file(config, config_filename)) {
+/* interface source */
+struct libconfig_interface libconfig_s;
+
+
+int conf_read_file(config_t *config, const char *config_filename) {
+	libconfig->init(config);
+	if (!libconfig->read_file_src(config, config_filename)) {
 		ShowError("%s:%d - %s\n", config_error_file(config),
 		          config_error_line(config), config_error_text(config));
-		config_destroy(config);
+		libconfig->destroy(config);
 		return 1;
 	}
 	return 0;
@@ -22,71 +25,63 @@ int conf_read_file(config_t *config, const char *config_filename)
 //
 // Functions to copy settings from libconfig/contrib
 //
-static void config_setting_copy_simple(config_setting_t *parent, const config_setting_t *src);
-static void config_setting_copy_elem(config_setting_t *parent, const config_setting_t *src);
-static void config_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src);
-int config_setting_copy(config_setting_t *parent, const config_setting_t *src);
-
-void config_setting_copy_simple(config_setting_t *parent, const config_setting_t *src)
-{
+void config_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) {
 	if (config_setting_is_aggregate(src)) {
-		config_setting_copy_aggregate(parent, src);
+		libconfig->setting_copy_aggregate(parent, src);
 	}
 	else {
 		config_setting_t *set;
 		
-		if( config_setting_get_member(parent, config_setting_name(src)) != NULL )
+		if( libconfig->setting_get_member(parent, config_setting_name(src)) != NULL )
 			return;
 		
-		if ((set = config_setting_add(parent, config_setting_name(src), config_setting_type(src))) == NULL)
+		if ((set = libconfig->setting_add(parent, config_setting_name(src), config_setting_type(src))) == NULL)
 			return;
 
 		if (CONFIG_TYPE_INT == config_setting_type(src)) {
-			config_setting_set_int(set, config_setting_get_int(src));
-			config_setting_set_format(set, src->format);
+			libconfig->setting_set_int(set, libconfig->setting_get_int(src));
+			libconfig->setting_set_format(set, src->format);
 		} else if (CONFIG_TYPE_INT64 == config_setting_type(src)) {
-			config_setting_set_int64(set, config_setting_get_int64(src));
-			config_setting_set_format(set, src->format);
+			libconfig->setting_set_int64(set, libconfig->setting_get_int64(src));
+			libconfig->setting_set_format(set, src->format);
 		} else if (CONFIG_TYPE_FLOAT == config_setting_type(src)) {
-			config_setting_set_float(set, config_setting_get_float(src));
+			libconfig->setting_set_float(set, libconfig->setting_get_float(src));
 		} else if (CONFIG_TYPE_STRING == config_setting_type(src)) {
-			config_setting_set_string(set, config_setting_get_string(src));
+			libconfig->setting_set_string(set, libconfig->setting_get_string(src));
 		} else if (CONFIG_TYPE_BOOL == config_setting_type(src)) {
-			config_setting_set_bool(set, config_setting_get_bool(src));
+			libconfig->setting_set_bool(set, libconfig->setting_get_bool(src));
 		}
 	}
 }
 
-void config_setting_copy_elem(config_setting_t *parent, const config_setting_t *src)
-{
+void config_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) {
 	config_setting_t *set = NULL;
 
 	if (config_setting_is_aggregate(src))
-		config_setting_copy_aggregate(parent, src);
+		libconfig->setting_copy_aggregate(parent, src);
 	else if (CONFIG_TYPE_INT == config_setting_type(src)) {
-		set = config_setting_set_int_elem(parent, -1, config_setting_get_int(src));
-		config_setting_set_format(set, src->format);
+		set = libconfig->setting_set_int_elem(parent, -1, libconfig->setting_get_int(src));
+		libconfig->setting_set_format(set, src->format);
 	} else if (CONFIG_TYPE_INT64 == config_setting_type(src)) {
-		set = config_setting_set_int64_elem(parent, -1, config_setting_get_int64(src));
-		config_setting_set_format(set, src->format);   
+		set = libconfig->setting_set_int64_elem(parent, -1, libconfig->setting_get_int64(src));
+		libconfig->setting_set_format(set, src->format);
 	} else if (CONFIG_TYPE_FLOAT == config_setting_type(src)) {
-		config_setting_set_float_elem(parent, -1, config_setting_get_float(src));
+		libconfig->setting_set_float_elem(parent, -1, libconfig->setting_get_float(src));
 	} else if (CONFIG_TYPE_STRING == config_setting_type(src)) {
-		config_setting_set_string_elem(parent, -1, config_setting_get_string(src));
+		libconfig->setting_set_string_elem(parent, -1, libconfig->setting_get_string(src));
 	} else if (CONFIG_TYPE_BOOL == config_setting_type(src)) {
-		config_setting_set_bool_elem(parent, -1, config_setting_get_bool(src));
+		libconfig->setting_set_bool_elem(parent, -1, libconfig->setting_get_bool(src));
 	}
 }
 
-void config_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src)
-{
+void config_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) {
 	config_setting_t *newAgg;
 	int i, n;
 
-	if( config_setting_get_member(parent, config_setting_name(src)) != NULL )
+	if( libconfig->setting_get_member(parent, config_setting_name(src)) != NULL )
 		return;
 	
-	newAgg = config_setting_add(parent, config_setting_name(src), config_setting_type(src));
+	newAgg = libconfig->setting_add(parent, config_setting_name(src), config_setting_type(src));
 
 	if (newAgg == NULL)
 		return;
@@ -95,22 +90,101 @@ void config_setting_copy_aggregate(config_setting_t *parent, const config_settin
 	
 	for (i = 0; i < n; i++) {
 		if (config_setting_is_group(src)) {
-			config_setting_copy_simple(newAgg, config_setting_get_elem(src, i));            
+			libconfig->setting_copy_simple(newAgg, libconfig->setting_get_elem(src, i));
 		} else {
-			config_setting_copy_elem(newAgg, config_setting_get_elem(src, i));
+			libconfig->setting_copy_elem(newAgg, libconfig->setting_get_elem(src, i));
 		}
 	}
 }
 
-int config_setting_copy(config_setting_t *parent, const config_setting_t *src)
-{
+int config_setting_copy(config_setting_t *parent, const config_setting_t *src) {
+	
 	if (!config_setting_is_group(parent) && !config_setting_is_list(parent))
 		return CONFIG_FALSE;
 
 	if (config_setting_is_aggregate(src)) {
-		config_setting_copy_aggregate(parent, src);
+		libconfig->setting_copy_aggregate(parent, src);
 	} else {
-		config_setting_copy_simple(parent, src);
+		libconfig->setting_copy_simple(parent, src);
 	}
 	return CONFIG_TRUE;
 }
+
+void libconfig_defaults(void) {
+	libconfig = &libconfig_s;
+	
+	libconfig->read = config_read;
+	libconfig->write = config_write;
+	/* */
+	libconfig->set_auto_convert = config_set_auto_convert;
+	libconfig->get_auto_convert = config_get_auto_convert;
+	/* */
+	libconfig->read_string = config_read_string;
+	libconfig->read_file_src = config_read_file;
+	libconfig->write_file = config_write_file;
+	/* */
+	libconfig->set_destructor = config_set_destructor;
+	libconfig->set_include_dir = config_set_include_dir;
+	/* */
+	libconfig->init = config_init;
+	libconfig->destroy = config_destroy;
+	/* */
+	libconfig->setting_get_int = config_setting_get_int;
+	libconfig->setting_get_int64 = config_setting_get_int64;
+	libconfig->setting_get_float = config_setting_get_float;
+	libconfig->setting_get_bool = config_setting_get_bool;
+	libconfig->setting_get_string = config_setting_get_string;
+	/* */
+	libconfig->setting_lookup_int = config_setting_lookup_int;
+	libconfig->setting_lookup_int64 = config_setting_lookup_int64;
+	libconfig->setting_lookup_float = config_setting_lookup_float;
+	libconfig->setting_lookup_bool = config_setting_lookup_bool;
+	libconfig->setting_lookup_string = config_setting_lookup_string;
+	/* */
+	libconfig->setting_set_int = config_setting_set_int;
+	libconfig->setting_set_int64 = config_setting_set_int64;
+	libconfig->setting_set_bool = config_setting_set_bool;
+	libconfig->setting_set_string = config_setting_set_string;
+	/* */
+	libconfig->setting_set_format = config_setting_set_format;
+	libconfig->setting_get_format = config_setting_get_format;
+	/* */
+	libconfig->setting_get_int_elem = config_setting_get_int_elem;
+	libconfig->setting_get_int64_elem = config_setting_get_int64_elem;
+	libconfig->setting_get_float_elem = config_setting_get_float_elem;
+	libconfig->setting_get_bool_elem = config_setting_get_bool_elem;
+	libconfig->setting_get_string_elem = config_setting_get_string_elem;
+	/* */
+	libconfig->setting_set_int_elem = config_setting_set_int_elem;
+	libconfig->setting_set_int64_elem = config_setting_set_int64_elem;
+	libconfig->setting_set_float_elem = config_setting_set_float_elem;
+	libconfig->setting_set_bool_elem = config_setting_set_bool_elem;
+	libconfig->setting_set_string_elem = config_setting_set_string_elem;
+	/* */
+	libconfig->setting_index = config_setting_index;
+	libconfig->setting_length = config_setting_length;
+	/* */
+	libconfig->setting_get_elem = config_setting_get_elem;
+	libconfig->setting_get_member = config_setting_get_member;
+	/* */
+	libconfig->setting_add = config_setting_add;
+	libconfig->setting_remove = config_setting_remove;
+	libconfig->setting_remove_elem = config_setting_remove_elem;
+	/* */
+	libconfig->setting_set_hook = config_setting_set_hook;
+	/* */
+	libconfig->lookup = config_lookup;
+	libconfig->lookup_from = config_lookup_from;
+	/* */
+	libconfig->lookup_int = config_lookup_int;
+	libconfig->lookup_int64 = config_lookup_int64;
+	libconfig->lookup_float = config_lookup_float;
+	libconfig->lookup_bool = config_lookup_bool;
+	libconfig->lookup_string = config_lookup_string;
+	/* those are custom and are from src/common/conf.c */
+	libconfig->read_file = conf_read_file;
+	libconfig->setting_copy_simple = config_setting_copy_simple;
+	libconfig->setting_copy_elem = config_setting_copy_elem;
+	libconfig->setting_copy_aggregate = config_setting_copy_aggregate;
+	libconfig->setting_copy = config_setting_copy;
+}