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".

9 files changed, 17 insertions, 17 deletions

diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index 2c72fdae54..78e0f62fbb 100644
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -2539,7 +2539,7 @@ int main(int argc, char *argv[]) {
      * Attempt to get the pathname of the directory containing the
      * executable file.
      */
-    err_msg = init_progfile_dir(argv[0]);
+    err_msg = configuration_init(argv[0], NULL);
     if (err_msg != NULL) {
         ws_warning("Can't get pathname of directory containing the extcap program: %s.",
                   err_msg);
diff --git a/extcap/ciscodump.c b/extcap/ciscodump.c
index ccb250b764..1adf45a8b1 100644
--- a/extcap/ciscodump.c
+++ b/extcap/ciscodump.c
@@ -546,7 +546,7 @@ int main(int argc, char *argv[])
 	 * Attempt to get the pathname of the directory containing the
 	 * executable file.
 	 */
-	err_msg = init_progfile_dir(argv[0]);
+	err_msg = configuration_init(argv[0], NULL);
 	if (err_msg != NULL) {
 		ws_warning("Can't get pathname of directory containing the extcap program: %s.",
 			err_msg);
diff --git a/extcap/dpauxmon.c b/extcap/dpauxmon.c
index 9696b33771..b443103cd6 100644
--- a/extcap/dpauxmon.c
+++ b/extcap/dpauxmon.c
@@ -486,7 +486,7 @@ close_out:
 
 int main(int argc, char *argv[])
 {
-	char* init_progfile_dir_error;
+	char* configuration_init_error;
 	int option_idx = 0;
 	int result;
 	unsigned int interface_id = 0;
@@ -506,11 +506,11 @@ int 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) {
 		ws_warning("Can't get pathname of directory containing the extcap program: %s.",
-			init_progfile_dir_error);
-		g_free(init_progfile_dir_error);
+			configuration_init_error);
+		g_free(configuration_init_error);
 	}
 
 	extcap_base_set_util_info(extcap_conf, argv[0], DPAUXMON_VERSION_MAJOR, DPAUXMON_VERSION_MINOR, DPAUXMON_VERSION_RELEASE,
diff --git a/extcap/etwdump.c b/extcap/etwdump.c
index 3054a93d58..69b43d487f 100644
--- a/extcap/etwdump.c
+++ b/extcap/etwdump.c
@@ -135,7 +135,7 @@ int main(int argc, char* argv[])
      * Attempt to get the pathname of the directory containing the
      * executable file.
      */
-    err_msg = init_progfile_dir(argv[0]);
+    err_msg = configuration_init(argv[0], NULL);
     if (err_msg != NULL) {
         ws_warning("Can't get pathname of directory containing the extcap program: %s.",
             err_msg);
diff --git a/extcap/randpktdump.c b/extcap/randpktdump.c
index 4350eae22f..55aace8f11 100644
--- a/extcap/randpktdump.c
+++ b/extcap/randpktdump.c
@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
 	 * Attempt to get the pathname of the directory containing the
 	 * executable file.
 	 */
-	err_msg = init_progfile_dir(argv[0]);
+	err_msg = configuration_init(argv[0], NULL);
 	if (err_msg != NULL) {
 		ws_warning("Can't get pathname of directory containing the extcap program: %s.",
 			err_msg);
diff --git a/extcap/sdjournal.c b/extcap/sdjournal.c
index c1c937c705..5f72b70adb 100644
--- a/extcap/sdjournal.c
+++ b/extcap/sdjournal.c
@@ -331,7 +331,7 @@ static int list_config(char *interface)
 
 int main(int argc, char **argv)
 {
-	char* init_progfile_dir_error;
+	char* configuration_init_error;
 	int result;
 	int option_idx = 0;
 	int start_from_entries = 10;
@@ -353,11 +353,11 @@ int 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) {
 		ws_warning("Can't get pathname of directory containing the extcap program: %s.",
-			init_progfile_dir_error);
-		g_free(init_progfile_dir_error);
+			configuration_init_error);
+		g_free(configuration_init_error);
 	}
 
 	help_url = data_file_url("sdjournal.html");
diff --git a/extcap/sshdump.c b/extcap/sshdump.c
index 13cc1f69a2..5e384303cf 100644
--- a/extcap/sshdump.c
+++ b/extcap/sshdump.c
@@ -376,7 +376,7 @@ int main(int argc, char *argv[])
 	 * Attempt to get the pathname of the directory containing the
 	 * executable file.
 	 */
-	err_msg = init_progfile_dir(argv[0]);
+	err_msg = configuration_init(argv[0], NULL);
 	if (err_msg != NULL) {
 		ws_warning("Can't get pathname of directory containing the extcap program: %s.",
 			err_msg);
diff --git a/extcap/udpdump.c b/extcap/udpdump.c
index 0113c73156..39eb737beb 100644
--- a/extcap/udpdump.c
+++ b/extcap/udpdump.c
@@ -369,7 +369,7 @@ int main(int argc, char *argv[])
 	 * Attempt to get the pathname of the directory containing the
 	 * executable file.
 	 */
-	err_msg = init_progfile_dir(argv[0]);
+	err_msg = configuration_init(argv[0], NULL);
 	if (err_msg != NULL) {
 		ws_warning("Can't get pathname of directory containing the extcap program: %s.",
 			err_msg);
diff --git a/extcap/wifidump.c b/extcap/wifidump.c
index 1f4fd341a4..212f4d0205 100644
--- a/extcap/wifidump.c
+++ b/extcap/wifidump.c
@@ -539,7 +539,7 @@ int main(int argc, char *argv[])
 	 * Attempt to get the pathname of the directory containing the
 	 * executable file.
 	 */
-	err_msg = init_progfile_dir(argv[0]);
+	err_msg = configuration_init(argv[0], NULL);
 	if (err_msg != NULL) {
 		ws_warning("Can't get pathname of directory containing the extcap program: %s.",
 			err_msg);