osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Windows: Fix build 

For some reason this was not caught by the CI.
This commit is contained in:
João Valverde 2022-02-24 20:23:05 +00:00
parent e2fab18853
commit ac6cbbcda3
4 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
capture/airpcap_loader.c
View File

@ -1192,28 +1192,27 @@ int load_airpcap(void)
* Append the version of AirPcap with which we were compiled to a GString. * Append the version of AirPcap with which we were compiled to a GString.
*/ */
void void
get_compiled_airpcap_version(GString *str) gather_airpcap_compile_info(feature_list l)
{ {
g_string_append(str, "with AirPcap"); with_feature(l, "AirPcap");
} }
/* /*
* Append the version of AirPcap with which we're running to a GString. * Append the version of AirPcap with which we're running to a GString.
*/ */
void void
get_runtime_airpcap_version(GString *str) gather_airpcap_runtime_info(feature_list l)
{ {
guint vmaj, vmin, vrev, build; guint vmaj, vmin, vrev, build;
/* See if the DLL has been loaded successfully. Bail if it hasn't */ /* See if the DLL has been loaded successfully. Bail if it hasn't */
if (AirpcapLoaded == FALSE) { if (AirpcapLoaded == FALSE) {
g_string_append(str, "without AirPcap"); without_feature(l, "AirPcap");
return; return;
} }
g_PAirpcapGetVersion(&vmaj, &vmin, &vrev, &build); g_PAirpcapGetVersion(&vmaj, &vmin, &vrev, &build);
g_string_append_printf(str, "with AirPcap %d.%d.%d build %d", vmaj, vmin, with_feature(l, "AirPcap %d.%d.%d build %d", vmaj, vmin, vrev, build);
vrev, build);
} }
/* /*

5
capture/airpcap_loader.h
View File

@ -16,6 +16,7 @@
#define __AIRPCAP_LOADER_H__ #define __AIRPCAP_LOADER_H__
#include <epan/crypt/dot11decrypt_system.h> #include <epan/crypt/dot11decrypt_system.h>
#include <wsutil/feature_list.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -396,10 +397,10 @@ airpcap_if_clear_decryption_settings(airpcap_if_info_t* info_if);
* Adds compiled version string to str * Adds compiled version string to str
*/ */
void void
get_compiled_airpcap_version(GString *str); gather_airpcap_compile_info(feature_list l);
void void
get_runtime_airpcap_version(GString *str); gather_airpcap_runtime_info(feature_list l);
#ifdef __cplusplus #ifdef __cplusplus
} }

11
ui/qt/main.cpp
View File

@ -231,7 +231,7 @@ gather_wireshark_qt_compiled_info(feature_list l)
} }
#ifdef _WIN32 #ifdef _WIN32
#ifdef HAVE_AIRPCAP #ifdef HAVE_AIRPCAP
with_feature(l, "AirPcap"); gather_airpcap_compile_info(l);
#else #else
without_feature(l, "AirPcap"); without_feature(l, "AirPcap");
#endif #endif
@ -259,14 +259,7 @@ gather_wireshark_runtime_info(feature_list l)
epan_gather_runtime_info(l); epan_gather_runtime_info(l);
#ifdef HAVE_AIRPCAP #ifdef HAVE_AIRPCAP
/* See if the DLL has been loaded successfully. Bail if it hasn't */ gather_airpcap_runtime_info(l);
if (AirpcapLoaded == FALSE) {
without_feature(l, "AirPcap");
}
else {
g_PAirpcapGetVersion(&vmaj, &vmin, &vrev, &build);
with_feature(l, "AirPcap %d.%d.%d build %d", vmaj, vmin, vrev, build);
}
#endif #endif
if (wsApp) { if (wsApp) {

2
wsutil/feature_list.c
View File

@ -37,7 +37,7 @@ without_feature(feature_list l, const char *fmt, ...)
static gint static gint
feature_sort_alpha(gconstpointer a, gconstpointer b) feature_sort_alpha(gconstpointer a, gconstpointer b)
{ {
return strcasecmp((gchar *)a + 1, (gchar *)b + 1); return g_ascii_strcasecmp((gchar *)a + 1, (gchar *)b + 1);
} }
void void