osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Version info: Do not show plugin count 

Plugin count is dependant on initialization order and showing
zero plugins loaded can be misleading.
This commit is contained in:
João Valverde 2022-06-04 22:28:45 +01:00 committed by A Wireshark GitLab Utility
parent 2ac2b0670a
commit 2939c6d0dc
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/fixtures_ws.py
View File

@ -182,7 +182,7 @@ def features(cmd_tshark, make_env):
have_gnutls='with GnuTLS' in tshark_v,
have_pkcs11='and PKCS #11 support' in tshark_v,
have_brotli='with brotli' in tshark_v,
have_plugins='with binary plugins' in tshark_v,
have_plugins='binary plugins supported' in tshark_v,
)

25
ui/version_info.c
View File

@ -188,12 +188,21 @@ get_compiled_version_info(gather_feature_func gather_compile)
l = g_list_reverse(l);
g_list_foreach(l, feature_to_gstring, str);
#ifdef HAVE_PLUGINS
g_string_append(str, ", with binary plugins");
#else
g_string_append(str, ", without binary plugins");
#endif
#ifdef WS_DISABLE_DEBUG
g_string_append(str, ", release build");
#endif
#ifdef WS_DISABLE_ASSERT
g_string_append(str, ", without assertions");
#endif
g_string_append(str, ".");
end_string(str);
free_features(&l);
@ -453,27 +462,25 @@ get_runtime_version_info(gather_feature_func gather_runtime)
if (gather_runtime != NULL) {
gather_runtime(&l);
}
l = g_list_reverse(l);
g_list_foreach(l, feature_to_gstring, str);
/*
* Display LC_CTYPE as a relevant, portable and sort of representative
* locale configuration without being exceedingly verbose and including
* the whole shebang of categories using LC_ALL.
*/
if ((lc = setlocale(LC_CTYPE, NULL)) != NULL) {
with_feature(&l, "LC_TYPE=%s", lc);
g_string_append_printf(str, ", with LC_TYPE=%s", lc);
}
#ifdef HAVE_PLUGINS
if (g_module_supported()) {
with_feature(&l, "binary plugins (%d loaded)", plugins_get_count());
g_string_append(str, ", binary plugins supported");
}
else {
without_feature(&l, "binary plugins (not supported by the platform)");
}
#else
without_feature(&l, "binary plugins");
#endif
l = g_list_reverse(l);
g_list_foreach(l, feature_to_gstring, str);
g_string_append_c(str, '.');
end_string(str);
free_features(&l);