From 6eb270983373b863deeca1497b56fcb1d23f2c2b Mon Sep 17 00:00:00 2001 From: Mika Laitio Date: Mon, 11 Apr 2011 18:02:57 +0300 Subject: [PATCH] Removed unrequired code uci_lookup_option for section was not needed when saving config-data. Signed-off-by: Mika Laitio --- src/config.c | 39 +++++++++++++++----------------------- src_test/test_config2.c | 42 ++++++++++++++++------------------------- 2 files changed, 31 insertions(+), 50 deletions(-) diff --git a/src/config.c b/src/config.c index df77e3b..4e51b43 100644 --- a/src/config.c +++ b/src/config.c @@ -50,18 +50,15 @@ bool set_config_value(const char *conf_dir_name, struct uci_package *pkg; struct uci_section *sct; struct uci_section *tmp_sct; - struct uci_option *opt; int err_flg; char *fname; int b_count; - bool save; struct uci_element *elem; struct uci_ptr ptr; FILE *fp; bool ret_val; ret_val = false; - save = false; if ((conf_dir_name != NULL) && (conf_file_name != NULL) && (section_type != NULL) && @@ -109,45 +106,39 @@ bool set_config_value(const char *conf_dir_name, } } if (err_flg == 0) { - opt = uci_lookup_option(ctx, sct, key); - if (opt != NULL) { - memset(&ptr, 0, sizeof(ptr)); - ptr.package = pkg->e.name; - ptr.section = sct->e.name; - ptr.option = key; + memset(&ptr, 0, sizeof(ptr)); + ptr.package = pkg->e.name; + ptr.section = sct->e.name; + ptr.option = key; - if (uci_lookup_ptr(ctx, &ptr, NULL, false) == UCI_OK) { - ptr.value = value; - uci_set(ctx, &ptr); - save = true; - } + if (uci_lookup_ptr(ctx, &ptr, NULL, false) == UCI_OK) { + ptr.value = value; + uci_set(ctx, &ptr); + uci_save(ctx, pkg); + ret_val = true; + log_debug("Created configuration section %s to configuration file: %s\n", section_name, fname); } else { - opt = uci_alloc_option(sct, key, value); - save = true; - } - if (save == true) { - uci_save(ctx, pkg); + log_error("Could not write to configuration file: %s\n. Could not look-up pointer for package %s section %s.\n", fname, pkg->e.name, sct->e.name); } uci_free_context(ctx); - ret_val = true; } else { - log_error("Could not write to configuration file: %s\n. Could not create section %s.", fname, section_name); + log_error("Could not write to configuration file: %s. Could not create section %s.\n", fname, section_name); } } else { - log_error("Could not write to configuration file: %s\n. File does not exist or is not writable.", fname); + log_error("Could not write to configuration file: %s. File does not exist or is not writable\n.", fname); } } free(fname); } else { - log_error("Could not change config value, out of memory"); + log_error("Could not change config value, out of memory\n"); } } else { - log_error("Could not change config value, invalid parameters"); + log_error("Could not change config value, invalid parameters\n"); } return ret_val; } diff --git a/src_test/test_config2.c b/src_test/test_config2.c index 32e1d93..dfd0987 100644 --- a/src_test/test_config2.c +++ b/src_test/test_config2.c @@ -84,18 +84,15 @@ bool set_config_value2(const char *conf_dir_name, struct uci_package *pkg; struct uci_section *sct; struct uci_section *tmp_sct; - struct uci_option *opt; int err_flg; char *fname; int b_count; - bool save; struct uci_element *elem; struct uci_ptr ptr; FILE *fp; bool ret_val; ret_val = false; - save = false; if ((conf_dir_name != NULL) && (conf_file_name != NULL) && (section_type != NULL) && @@ -128,7 +125,6 @@ bool set_config_value2(const char *conf_dir_name, } } if (sct == NULL) { - log_debug("Creating configuration section %s to configuration file: %s\n", section_name, fname); //err_flg = uci_add_named_section(ctx, pkg, section_type, section_name, &sct); //err_flg = uci_add_section(ctx, pkg, section_name, &sct); err_flg = uci_create_named_section(ctx, conf_file_name, section_type, section_name); @@ -143,45 +139,39 @@ bool set_config_value2(const char *conf_dir_name, } } if (err_flg == 0) { - opt = uci_lookup_option(ctx, sct, key); - if (opt != NULL) { - memset(&ptr, 0, sizeof(ptr)); - ptr.package = pkg->e.name; - ptr.section = sct->e.name; - ptr.option = key; - - if (uci_lookup_ptr(ctx, &ptr, NULL, false) == UCI_OK) { - ptr.value = value; - uci_set(ctx, &ptr); - save = true; - } + memset(&ptr, 0, sizeof(ptr)); + ptr.package = pkg->e.name; + ptr.section = sct->e.name; + ptr.option = key; + + if (uci_lookup_ptr(ctx, &ptr, NULL, false) == UCI_OK) { + ptr.value = value; + uci_set(ctx, &ptr); + uci_save(ctx, pkg); + ret_val = true; + log_debug("Created configuration section %s to configuration file: %s\n", section_name, fname); } else { - opt = uci_alloc_option(sct, key, value); - save = true; - } - if (save == true) { - uci_save(ctx, pkg); + log_error("Could not write to configuration file: %s\n. Could not look-up pointer for package %s section %s.\n", fname, pkg->e.name, sct->e.name); } uci_free_context(ctx); - ret_val = true; } else { - log_error("Could not write to configuration file: %s\n. Could not create section %s.", fname, section_name); + log_error("Could not write to configuration file: %s\n. Could not create section %s.\n", fname, section_name); } } else { - log_error("Could not write to configuration file: %s\n. File does not exist or is not writable.", fname); + log_error("Could not write to configuration file: %s. File does not exist or is not writable.\n", fname); } } free(fname); } else { - log_error("Could not change config value, out of memory"); + log_error("Could not change config value, out of memory\n"); } } else { - log_error("Could not change config value, invalid parameters"); + log_error("Could not change config value, invalid parameters\n"); } return ret_val; } -- 2.41.1