diff options
author | Dmitri Pal <dpal@redhat.com> | 2012-12-24 17:45:00 -0500 |
---|---|---|
committer | Ondrej Kos <okos@redhat.com> | 2013-01-24 08:34:51 +0100 |
commit | 6823d7104cca0f8ac22ed9432ee8a2f1a0d9124a (patch) | |
tree | 51c9c817e8335c0001f3c012819760bfcf6a1681 /ini/ini_parse_ut.c | |
parent | fa00e2e16e5c1d3ac56f1bbd3a84875642d0bb39 (diff) | |
download | ding-libs-6823d7104cca0f8ac22ed9432ee8a2f1a0d9124a.tar.gz ding-libs-6823d7104cca0f8ac22ed9432ee8a2f1a0d9124a.tar.xz ding-libs-6823d7104cca0f8ac22ed9432ee8a2f1a0d9124a.zip |
More interface refactoring
I also realized that error list processing should not be
bound to the file object.
This patch corrects that by moving the error_list and
corresponding count from file object to the config object.
Things updated by the patch:
1. The internal variables are moved from file obj to config obj.
2. The external header is updated to reflect the change
3. Functions are moved from file obj module to config obj module.
4. Parser code is updated because error validation was in
the wrong place
5. Unit test is adjusted to get error list from the right object.
I had to adjust the copy function for the config object.
Copy function does not copy over the error list.
Diffstat (limited to 'ini/ini_parse_ut.c')
-rw-r--r-- | ini/ini_parse_ut.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ini/ini_parse_ut.c b/ini/ini_parse_ut.c index 3526d48..e31b356 100644 --- a/ini/ini_parse_ut.c +++ b/ini/ini_parse_ut.c @@ -86,10 +86,10 @@ int test_one_file(const char *in_filename, if (error) { INIOUT(printf("Failed to parse configuration. Error %d.\n", error)); - if (ini_config_error_count(file_ctx)) { + if (ini_config_error_count(ini_config)) { INIOUT(printf("Errors detected while parsing: %s\n", ini_config_get_filename(file_ctx))); - ini_config_get_errors(file_ctx, &error_list); + ini_config_get_errors(ini_config, &error_list); INIOUT(ini_config_print_errors(stdout, error_list)); ini_config_free_errors(error_list); } @@ -389,10 +389,10 @@ int merge_values_test(void) INIOUT(printf("Failed to parse configuration. Error %d.\n", error)); - if (ini_config_error_count(file_ctx)) { + if (ini_config_error_count(ini_config)) { INIOUT(printf("Errors detected while parsing: %s\n", ini_config_get_filename(file_ctx))); - ini_config_get_errors(file_ctx, &error_list); + ini_config_get_errors(ini_config, &error_list); INIOUT(ini_config_print_errors(stdout, error_list)); ini_config_free_errors(error_list); } @@ -585,10 +585,10 @@ int merge_section_test(void) INIOUT(printf("Failed to parse configuration. " "Error %d.\n", error)); - if (ini_config_error_count(file_ctx)) { + if (ini_config_error_count(ini_config)) { INIOUT(printf("Errors detected while parsing: %s\n", ini_config_get_filename(file_ctx))); - ini_config_get_errors(file_ctx, &error_list); + ini_config_get_errors(ini_config, &error_list); INIOUT(ini_config_print_errors(stdout, error_list)); ini_config_free_errors(error_list); } @@ -707,10 +707,10 @@ int read_one_file(char *name, INIOUT(printf("Failed to parse configuration. " "Error %d.\n", error)); - if (ini_config_error_count(file_ctx)) { + if (ini_config_error_count(ini_config)) { INIOUT(printf("Errors detected while parsing: %s\n", ini_config_get_filename(file_ctx))); - ini_config_get_errors(file_ctx, &error_list); + ini_config_get_errors(ini_config, &error_list); INIOUT(ini_config_print_errors(stdout, error_list)); ini_config_free_errors(error_list); } @@ -1146,10 +1146,10 @@ int startup_test(void) if (error) { INIOUT(printf("Failed to parse configuration. Error %d.\n", error)); - if (ini_config_error_count(file_ctx)) { + if (ini_config_error_count(ini_config)) { INIOUT(printf("Errors detected while parsing: %s\n", ini_config_get_filename(file_ctx))); - ini_config_get_errors(file_ctx, &error_list); + ini_config_get_errors(ini_config, &error_list); INIOUT(ini_config_print_errors(stdout, error_list)); ini_config_free_errors(error_list); } @@ -1430,10 +1430,10 @@ int get_test(void) if (error) { INIOUT(printf("Failed to parse configuration. Error %d.\n", error)); - if (ini_config_error_count(file_ctx)) { + if (ini_config_error_count(ini_config)) { INIOUT(printf("Errors detected while parsing: %s\n", ini_config_get_filename(file_ctx))); - ini_config_get_errors(file_ctx, &error_list); + ini_config_get_errors(ini_config, &error_list); INIOUT(ini_config_print_errors(stdout, error_list)); ini_config_free_errors(error_list); } |