From 3086774fa69b1732ccc737951e87d68c81fef108 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Sun, 20 Feb 2022 12:09:34 -0800
Subject: 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".
---
 capinfos.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'capinfos.c')

diff --git a/capinfos.c b/capinfos.c
index 8a0a9ad166..0f21f369e4 100644
--- a/capinfos.c
+++ b/capinfos.c
@@ -1569,7 +1569,7 @@ capinfos_cmdarg_err_cont(const char *msg_format, va_list ap)
 int
 main(int argc, char *argv[])
 {
-    char  *init_progfile_dir_error;
+    char  *configuration_init_error;
     static const struct report_message_routines capinfos_report_routines = {
         failure_message,
         failure_message,
@@ -1630,12 +1630,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,
                 "capinfos: Can't get pathname of directory containing the capinfos program: %s.\n",
-                init_progfile_dir_error);
-        g_free(init_progfile_dir_error);
+                configuration_init_error);
+        g_free(configuration_init_error);
     }
 
     init_report_message("capinfos", &capinfos_report_routines);
-- 
cgit v1.2.3