diff options
| author | Dmitri Pal <dpal@redhat.com> | 2010-12-26 21:45:39 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-04-05 11:20:09 -0700 |
| commit | 0513944b4e65415a697190d716551dbeb9a0fa0d (patch) | |
| tree | ee5acb44fa70cc77f2588452b5a2fdb28d3359f7 | |
| parent | ce8a6de72d6fcfa7fe8be9e3ec578a0a514ce3a7 (diff) | |
| download | ding-libs-0513944b4e65415a697190d716551dbeb9a0fa0d.tar.gz ding-libs-0513944b4e65415a697190d716551dbeb9a0fa0d.tar.xz ding-libs-0513944b4e65415a697190d716551dbeb9a0fa0d.zip | |
Rename error print function
All config file processing functions start with "ini_config".
The only function that does not comply is
ini_print_errors. We can't rename it since
it is a part of the current active interface.
I marked that function needs to be removed when we
remove old interface and created a copy with
the correct name. I also updated unit test accordingly.
| -rw-r--r-- | ini/ini_configobj.h | 5 | ||||
| -rw-r--r-- | ini/ini_parse_ut.c | 8 | ||||
| -rw-r--r-- | ini/ini_print.c | 3 |
3 files changed, 6 insertions, 10 deletions
diff --git a/ini/ini_configobj.h b/ini/ini_configobj.h index 913b91e..7089b62 100644 --- a/ini/ini_configobj.h +++ b/ini/ini_configobj.h @@ -300,10 +300,7 @@ int ini_config_copy(struct ini_cfgobj *ini_config, struct ini_cfgobj **ini_new); /* Function to print errors from the list */ -void ini_print_errors(FILE *file, char **error_list); - - - +void ini_config_print_errors(FILE *file, char **error_list); /* Merge two configurations together creating a new one */ int ini_config_merge(struct ini_cfgobj *first, diff --git a/ini/ini_parse_ut.c b/ini/ini_parse_ut.c index 45cdcee..4effeb1 100644 --- a/ini/ini_parse_ut.c +++ b/ini/ini_parse_ut.c @@ -85,7 +85,7 @@ int test_one_file(const char *in_filename, INIOUT(printf("Errors detected while parsing: %s\n", ini_config_get_filename(file_ctx))); ini_config_get_errors(file_ctx, &error_list); - INIOUT(ini_print_errors(stdout, error_list)); + INIOUT(ini_config_print_errors(stdout, error_list)); ini_config_free_errors(error_list); } /* We do not return here intentionally */ @@ -371,7 +371,7 @@ int merge_values_test(void) INIOUT(printf("Errors detected while parsing: %s\n", ini_config_get_filename(file_ctx))); ini_config_get_errors(file_ctx, &error_list); - INIOUT(ini_print_errors(stdout, error_list)); + INIOUT(ini_config_print_errors(stdout, error_list)); ini_config_free_errors(error_list); } @@ -548,7 +548,7 @@ int merge_section_test(void) INIOUT(printf("Errors detected while parsing: %s\n", ini_config_get_filename(file_ctx))); ini_config_get_errors(file_ctx, &error_list); - INIOUT(ini_print_errors(stdout, error_list)); + INIOUT(ini_config_print_errors(stdout, error_list)); ini_config_free_errors(error_list); } @@ -719,7 +719,7 @@ int startup_test(void) INIOUT(printf("Errors detected while parsing: %s\n", ini_config_get_filename(file_ctx))); ini_config_get_errors(file_ctx, &error_list); - INIOUT(ini_print_errors(stdout, error_list)); + INIOUT(ini_config_print_errors(stdout, error_list)); ini_config_free_errors(error_list); } /* We do not return here intentionally */ diff --git a/ini/ini_print.c b/ini/ini_print.c index 1dcfa54..1128b70 100644 --- a/ini/ini_print.c +++ b/ini/ini_print.c @@ -459,9 +459,8 @@ void print_config_parsing_errors(FILE *file, TRACE_FLOW_STRING("print_config_parsing_errors", "Exit"); } - /* Function to print errors from the list */ -void ini_print_errors(FILE *file, char **error_list) +void ini_config_print_errors(FILE *file, char **error_list) { unsigned count = 0; |