aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/CMakeLists.txt4
-rw-r--r--epan/dissectors/asn1/nbap/packet-nbap-template.c4
-rw-r--r--epan/dissectors/packet-btmesh.c9
-rw-r--r--epan/dissectors/packet-dcerpc-nt.c3
-rw-r--r--epan/dissectors/packet-f5ethtrailer.c7
-rw-r--r--epan/dissectors/packet-nbap.c4
-rw-r--r--epan/dissectors/packet-wireguard.c5
7 files changed, 15 insertions, 21 deletions
diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index 4b42de4648..1861079c0f 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -1971,7 +1971,9 @@ CHECKAPI(
NAME
dissectors
SWITCHES
- -g abort -g termoutput -build --file ${CHECKAPI_FILE_LIST}
+ --group abort
+ --group termoutput:5 --summary-group termoutput
+ --build --file ${CHECKAPI_FILE_LIST}
SOURCES
${DISSECTOR_SUPPORT_SRC}
${DISSECTOR_HEADERS}
diff --git a/epan/dissectors/asn1/nbap/packet-nbap-template.c b/epan/dissectors/asn1/nbap/packet-nbap-template.c
index 102166d945..9b01e8c6ed 100644
--- a/epan/dissectors/asn1/nbap/packet-nbap-template.c
+++ b/epan/dissectors/asn1/nbap/packet-nbap-template.c
@@ -22,8 +22,6 @@
#include <epan/proto_data.h>
#include <epan/uat.h>
-#include <wsutil/ws_printf.h> /* ws_g_warning */
-
#include "packet-per.h"
#include "packet-isup.h"
#include "packet-umts_fp.h"
@@ -48,7 +46,7 @@
#define DEBUG_NBAP 0
#if DEBUG_NBAP
#include <epan/to_str.h>
-#define nbap_debug(...) ws_g_warning(__VA_ARGS__)
+#define nbap_debug(...) g_warning(__VA_ARGS__)
#else
#define nbap_debug(...)
#endif
diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c
index 14583ee70e..0d97dc9e02 100644
--- a/epan/dissectors/packet-btmesh.c
+++ b/epan/dissectors/packet-btmesh.c
@@ -16,7 +16,6 @@
#include <epan/packet.h>
#include <epan/prefs.h>
-#include <wsutil/ws_printf.h> /* ws_g_warning */
#include <wsutil/wsgcrypt.h>
#include <epan/expert.h>
#include <stdio.h>
@@ -787,7 +786,7 @@ dissect_btmesh_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
cry_error = gcry_cipher_setkey(cipher_hd, record->encryptionkey, 16);
if (cry_error) {
- ws_g_warning("gcry_cipher_setkey failed\n");
+ g_warning("gcry_cipher_setkey failed\n");
gcry_cipher_close(cipher_hd);
return offset;
}
@@ -795,7 +794,7 @@ dissect_btmesh_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
/* Load nonce */
cry_error = gcry_cipher_setiv(cipher_hd, &networknonce, 13);
if (cry_error) {
- ws_g_warning("gcry_cipher_setiv failed\n");
+ g_warning("gcry_cipher_setiv failed\n");
gcry_cipher_close(cipher_hd);
return offset;
}
@@ -807,7 +806,7 @@ dissect_btmesh_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
cry_error = gcry_cipher_ctl(cipher_hd, GCRYCTL_SET_CCM_LENGTHS, ccm_lengths, sizeof(ccm_lengths));
if (cry_error) {
- ws_g_warning("gcry_cipher_ctl failed %s enc_data_len %u\n",
+ g_warning("gcry_cipher_ctl failed %s enc_data_len %u\n",
gcry_strerror(cry_error),
enc_data_len);
gcry_cipher_close(cipher_hd);
@@ -819,7 +818,7 @@ dissect_btmesh_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *da
cry_error = gcry_cipher_decrypt(cipher_hd, decrypted_data, enc_data_len, tvb_get_ptr(tvb, enc_offset, enc_data_len), enc_data_len);
if (cry_error) {
expert_add_info(pinfo, item, &ei_btmesh_decrypt_failed);
- ws_g_warning("gcry_cipher_decrypt failed %s\n", gcry_strerror(cry_error));
+ g_warning("gcry_cipher_decrypt failed %s\n", gcry_strerror(cry_error));
gcry_cipher_close(cipher_hd);
return offset;
}
diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c
index 5978a74c7b..8dd7b43096 100644
--- a/epan/dissectors/packet-dcerpc-nt.c
+++ b/epan/dissectors/packet-dcerpc-nt.c
@@ -21,7 +21,6 @@
#include "packet-dcerpc.h"
#include "packet-dcerpc-nt.h"
#include "packet-windows-common.h"
-#include <wsutil/ws_printf.h> /* ws_g_warning */
int hf_nt_cs_len = -1;
@@ -778,7 +777,7 @@ void dcerpc_store_polhnd_name(e_ctx_hnd *policy_hnd, packet_info *pinfo,
if (pol->name && name) {
#ifdef DEBUG_HASH_COLL
if (strcmp(pol->name, name) != 0)
- ws_g_warning("dcerpc_smb: pol_hash name collision %s/%s\n", value->name, name);
+ g_warning("dcerpc_smb: pol_hash name collision %s/%s\n", value->name, name);
#endif
/* pol->name is wmem_file_scope() allocated, don't free it now */
}
diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c
index bf67639918..efc5589b38 100644
--- a/epan/dissectors/packet-f5ethtrailer.c
+++ b/epan/dissectors/packet-f5ethtrailer.c
@@ -229,7 +229,6 @@ Notes:
#include <epan/etypes.h>
#include <epan/to_str.h>
#include <epan/stats_tree.h>
-#include <wsutil/ws_printf.h> /* for ws_g_warning */
#define F5FILEINFOTAP_SRC
#include "packet-f5ethtrailer.h"
#undef F5FILEINFOTAP_SRC
@@ -2206,17 +2205,17 @@ static void proto_init_f5ethtrailer(void)
error_string = register_tap_listener("ip", &tap_ip_enabled, NULL, TL_REQUIRES_NOTHING, NULL, ip_tap_pkt, NULL, NULL);
if (error_string) {
- ws_g_warning("Unable to register tap \"ip\" for f5ethtrailer: %s", error_string->str);
+ g_warning("Unable to register tap \"ip\" for f5ethtrailer: %s", error_string->str);
g_string_free(error_string, TRUE);
}
error_string = register_tap_listener("ipv6", &tap_ipv6_enabled, NULL, TL_REQUIRES_NOTHING, NULL, ipv6_tap_pkt, NULL, NULL);
if (error_string) {
- ws_g_warning("Unable to register tap \"ipv6\" for f5ethtrailer: %s", error_string->str);
+ g_warning("Unable to register tap \"ipv6\" for f5ethtrailer: %s", error_string->str);
g_string_free(error_string, TRUE);
}
error_string = register_tap_listener("tcp", &tap_tcp_enabled, NULL, TL_REQUIRES_NOTHING, NULL, tcp_tap_pkt, NULL, NULL);
if (error_string) {
- ws_g_warning("Unable to register tap \"tcp\" for f5ethtrailer: %s", error_string->str);
+ g_warning("Unable to register tap \"tcp\" for f5ethtrailer: %s", error_string->str);
g_string_free(error_string, TRUE);
}
}
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index b4b7373148..467d0a5ecc 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -30,8 +30,6 @@
#include <epan/proto_data.h>
#include <epan/uat.h>
-#include <wsutil/ws_printf.h> /* ws_g_warning */
-
#include "packet-per.h"
#include "packet-isup.h"
#include "packet-umts_fp.h"
@@ -56,7 +54,7 @@
#define DEBUG_NBAP 0
#if DEBUG_NBAP
#include <epan/to_str.h>
-#define nbap_debug(...) ws_g_warning(__VA_ARGS__)
+#define nbap_debug(...) g_warning(__VA_ARGS__)
#else
#define nbap_debug(...)
#endif
diff --git a/epan/dissectors/packet-wireguard.c b/epan/dissectors/packet-wireguard.c
index 60fbe450a7..fc6a56a07e 100644
--- a/epan/dissectors/packet-wireguard.c
+++ b/epan/dissectors/packet-wireguard.c
@@ -26,7 +26,6 @@
#include <epan/proto_data.h>
#include <epan/uat.h>
#include <wsutil/file_util.h>
-#include <wsutil/ws_printf.h> /* ws_g_warning */
#include <wsutil/wsgcrypt.h>
#include <wsutil/curve25519.h>
@@ -912,7 +911,7 @@ wg_process_response(tvbuff_t *tvb, wg_handshake_state_t *hs)
// XXX when multiple responses are linkable to a single handshake state,
// they should probably fork into a new state or be discarded when equal.
if (hs->initiator_recv_cipher || hs->responder_recv_cipher) {
- ws_g_warning("%s FIXME multiple responses linked to a single session", G_STRFUNC);
+ g_warning("%s FIXME multiple responses linked to a single session", G_STRFUNC);
return;
}
DISSECTOR_ASSERT(!hs->initiator_recv_cipher);
@@ -1836,7 +1835,7 @@ proto_register_wg(void)
&pref_keylog_file, FALSE);
if (!wg_decrypt_init()) {
- ws_g_warning("%s: decryption will not be possible due to lack of algorithms support", G_STRFUNC);
+ g_warning("%s: decryption will not be possible due to lack of algorithms support", G_STRFUNC);
}
wg_ephemeral_keys = wmem_map_new_autoreset(wmem_epan_scope(), wmem_file_scope(), g_int_hash, wg_pubkey_equal);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 10:59:34 +0000