diff options
| author | Gerald Combs <gerald@wireshark.org> | 2022-02-20 12:09:34 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2022-04-04 09:39:27 -0700 |
| commit | 3086774fa69b1732ccc737951e87d68c81fef108 (patch) | |
| tree | c7afb76cb90072cad685d6e465e80d290960dc89 /ui | |
| parent | 6d2ab6900ff68726e1b59fe3c2056f814f386f9c (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 'ui')
| -rw-r--r-- | ui/qt/main.cpp | 2 | ||||
| -rw-r--r-- | ui/qt_logshark/ls_main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index cdbc1451a4..c4f6b13865 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -560,7 +560,7 @@ int main(int argc, char *qt_argv[]) * Attempt to get the pathname of the directory containing the * executable file. */ - /* init_progfile_dir_error = */ init_progfile_dir(argv[0]); + /* configuration_init_error = */ configuration_init(argv[0], NULL); /* ws_log(NULL, LOG_LEVEL_DEBUG, "progfile_dir: %s", get_progfile_dir()); */ #ifdef _WIN32 diff --git a/ui/qt_logshark/ls_main.cpp b/ui/qt_logshark/ls_main.cpp index abc141ed87..3350e07863 100644 --- a/ui/qt_logshark/ls_main.cpp +++ b/ui/qt_logshark/ls_main.cpp @@ -560,7 +560,7 @@ int main(int argc, char *qt_argv[]) * Attempt to get the pathname of the directory containing the * executable file. */ - /* init_progfile_dir_error = */ init_progfile_dir(argv[0]); + /* configuration_init_error = */ configuration_init(argv[0], "Logwolf"); /* ws_log(NULL, LOG_LEVEL_DEBUG, "progfile_dir: %s", get_progfile_dir()); */ #ifdef _WIN32 @@ -613,7 +613,7 @@ int main(int argc, char *qt_argv[]) #endif /* _WIN32 */ /* Get the compile-time version information string */ - ws_init_version_info("Logshark", gather_wireshark_qt_compiled_info, + ws_init_version_info("Logwolf", gather_wireshark_qt_compiled_info, gather_wireshark_runtime_info); /* Create the user profiles directory */ |