aboutsummaryrefslogtreecommitdiffstats
path: root/editcap.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2022-02-20 12:09:34 -0800
committerGerald Combs <gerald@wireshark.org>2022-04-04 09:39:27 -0700
commit3086774fa69b1732ccc737951e87d68c81fef108 (patch)
treec7afb76cb90072cad685d6e465e80d290960dc89 /editcap.c
parent6d2ab6900ff68726e1b59fe3c2056f814f386f9c (diff)
wsutil: Add configuration namespaces.
Rename init_progfile_dir to configuration_init. Add an argument which specifies our configuration namespace, which can be "Wireshark" (default) or "Logwolf".
Diffstat (limited to 'editcap.c')
-rw-r--r--editcap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/editcap.c b/editcap.c
index 9dfa26d8c7..56f8acf061 100644
--- a/editcap.c
+++ b/editcap.c
@@ -1102,7 +1102,7 @@ process_new_idbs(wtap *wth, wtap_dumper *pdh, GArray *idbs_seen,
int
main(int argc, char *argv[])
{
- char *init_progfile_dir_error;
+ char *configuration_init_error;
static const struct report_message_routines editcap_report_routines = {
failure_message,
failure_message,
@@ -1203,12 +1203,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,
"editcap: Can't get pathname of directory containing the editcap program: %s.\n",
- init_progfile_dir_error);
- g_free(init_progfile_dir_error);
+ configuration_init_error);
+ g_free(configuration_init_error);
}
init_report_message("editcap", &editcap_report_routines);