diff options
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mergecap.c b/mergecap.c index 58e6de23c7..8bc5be0466 100644 --- a/mergecap.c +++ b/mergecap.c @@ -184,7 +184,7 @@ merge_callback(merge_event event, int num, int main(int argc, char *argv[]) { - char *init_progfile_dir_error; + char *configuration_init_error; static const struct report_message_routines mergecap_report_routines = { failure_message, failure_message, @@ -241,12 +241,12 @@ main(int argc, char *argv[]) * Attempt to get the pathname of the directory containing the * executable file. */ - init_progfile_dir_error = init_progfile_dir(argv[0]); - if (init_progfile_dir_error != NULL) { + configuration_init_error = configuration_init(argv[0], NULL); + if (configuration_init_error != NULL) { fprintf(stderr, "mergecap: Can't get pathname of directory containing the mergecap program: %s.\n", - init_progfile_dir_error); - g_free(init_progfile_dir_error); + configuration_init_error); + g_free(configuration_init_error); } init_report_message("mergecap", &mergecap_report_routines); |