diff options
53 files changed, 22 insertions, 60 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 8a76656a98..68b2a88c4d 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -16,7 +16,9 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" -#include <stdio.h> + +#include <stdio.h> /* for sscanf() */ + #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index 126e870c60..f6daa5c070 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -19,7 +19,7 @@ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <epan/packet.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-amp.c b/epan/dissectors/packet-amp.c index a8a22ec5db..130142c316 100644 --- a/epan/dissectors/packet-amp.c +++ b/epan/dissectors/packet-amp.c @@ -10,7 +10,6 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "config.h" -#include <stdio.h> #include <epan/exceptions.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-at.c b/epan/dissectors/packet-at.c index e78fa74897..e406885d09 100644 --- a/epan/dissectors/packet-at.c +++ b/epan/dissectors/packet-at.c @@ -12,8 +12,8 @@ */ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index 15163865c8..354ca9ce92 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -16,7 +16,6 @@ #include "config.h" -#include <stdio.h> #include <stdlib.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 60e9d850da..428c84c817 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -45,8 +45,6 @@ #include "config.h" -#include <stdio.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-bpsec.c b/epan/dissectors/packet-bpsec.c index c7f04d3c73..141c0dc817 100644 --- a/epan/dissectors/packet-bpsec.c +++ b/epan/dissectors/packet-bpsec.c @@ -22,7 +22,6 @@ #include <epan/to_str.h> #include <wsutil/crc16.h> #include <wsutil/crc32.h> -#include <stdio.h> #include <inttypes.h> #include "epan/wscbor.h" diff --git a/epan/dissectors/packet-bpv6.c b/epan/dissectors/packet-bpv6.c index 27175d314a..3d9ef449ea 100644 --- a/epan/dissectors/packet-bpv6.c +++ b/epan/dissectors/packet-bpv6.c @@ -40,7 +40,6 @@ #include "config.h" -#include <stdio.h> #include <epan/packet.h> #include <epan/reassemble.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-bpv7.c b/epan/dissectors/packet-bpv7.c index ca7c0b4391..8ad8c1ef38 100644 --- a/epan/dissectors/packet-bpv7.c +++ b/epan/dissectors/packet-bpv7.c @@ -26,7 +26,6 @@ #include <wsutil/crc16.h> #include <wsutil/crc32.h> #include <wsutil/utf8_entities.h> -#include <stdio.h> #include <inttypes.h> /// Glib logging "domain" name diff --git a/epan/dissectors/packet-btmesh.c b/epan/dissectors/packet-btmesh.c index af2bd2e00a..6c325f0262 100644 --- a/epan/dissectors/packet-btmesh.c +++ b/epan/dissectors/packet-btmesh.c @@ -22,7 +22,6 @@ #include <epan/prefs.h> #include <wsutil/wsgcrypt.h> #include <epan/expert.h> -#include <stdio.h> #include <math.h> #include <epan/uat.h> #include <epan/reassemble.h> diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index b481fca7c8..da9dfa84a4 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -10,7 +10,7 @@ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <epan/packet.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-cfdp.c b/epan/dissectors/packet-cfdp.c index 80db3b45f0..3d965d585f 100644 --- a/epan/dissectors/packet-cfdp.c +++ b/epan/dissectors/packet-cfdp.c @@ -15,8 +15,6 @@ */ #include "config.h" -#include <stdio.h> - #include <epan/packet.h> #include <epan/expert.h> #include "packet-cfdp.h" diff --git a/epan/dissectors/packet-cose.c b/epan/dissectors/packet-cose.c index 162f5b128b..a8152ccae8 100644 --- a/epan/dissectors/packet-cose.c +++ b/epan/dissectors/packet-cose.c @@ -22,7 +22,6 @@ #include <epan/proto.h> #include <epan/expert.h> #include <epan/exceptions.h> -#include <stdio.h> #include <inttypes.h> void proto_register_cose(void); diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 67f147dca8..7bb8b03bf0 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -26,7 +26,7 @@ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-dhcp.c b/epan/dissectors/packet-dhcp.c index 62d49b530a..b5c26c31e6 100644 --- a/epan/dissectors/packet-dhcp.c +++ b/epan/dissectors/packet-dhcp.c @@ -107,7 +107,7 @@ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <epan/packet.h> #include <epan/exceptions.h> diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 78e4b87924..3408e8501f 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -36,8 +36,6 @@ #include "config.h" -#include <stdio.h> - #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-dlep.c b/epan/dissectors/packet-dlep.c index e1febf4962..ae7fd4cbbe 100644 --- a/epan/dissectors/packet-dlep.c +++ b/epan/dissectors/packet-dlep.c @@ -28,7 +28,6 @@ #include <epan/tvbuff.h> #include <epan/to_str.h> #include <epan/tfs.h> -#include <glib.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-dvb-s2-table.c b/epan/dissectors/packet-dvb-s2-table.c index 9367d867c0..4f8a6a07a3 100644 --- a/epan/dissectors/packet-dvb-s2-table.c +++ b/epan/dissectors/packet-dvb-s2-table.c @@ -28,7 +28,6 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/etypes.h> -#include <stdio.h> #include "packet-snmp.h" void proto_register_dvb_s2_table(void); diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index 8cda6fc71c..e16c7d40b4 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -11,7 +11,7 @@ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <epan/packet.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-ecp.c b/epan/dissectors/packet-ecp.c index 2fd6098b4a..e621bbe297 100644 --- a/epan/dissectors/packet-ecp.c +++ b/epan/dissectors/packet-ecp.c @@ -10,7 +10,6 @@ #include "config.h" -#include <stdio.h> #include <epan/packet.h> #include <epan/etypes.h> #include <epan/to_str.h> diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 69f31dce68..36a7d532f9 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -14,7 +14,7 @@ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <wsutil/strtoi.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-geonw.c b/epan/dissectors/packet-geonw.c index 3df6dcb0e4..57c628a79e 100644 --- a/epan/dissectors/packet-geonw.c +++ b/epan/dissectors/packet-geonw.c @@ -54,7 +54,6 @@ #include <config.h> #include <stdlib.h> -#include <stdio.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 86c371bb29..b85893e8d3 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -266,7 +266,6 @@ #include "config.h" -#include <stdio.h> #include <errno.h> #include <math.h> diff --git a/epan/dissectors/packet-git.c b/epan/dissectors/packet-git.c index 3b216a3cb6..a9644ac1e6 100644 --- a/epan/dissectors/packet-git.c +++ b/epan/dissectors/packet-git.c @@ -16,7 +16,7 @@ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-gsm_osmux.c b/epan/dissectors/packet-gsm_osmux.c index 35621f2b25..a187bc1b9d 100644 --- a/epan/dissectors/packet-gsm_osmux.c +++ b/epan/dissectors/packet-gsm_osmux.c @@ -19,7 +19,6 @@ #include "config.h" #include <string.h> -#include <stdio.h> #include <epan/packet.h> #include <epan/stats_tree.h> diff --git a/epan/dissectors/packet-hl7.c b/epan/dissectors/packet-hl7.c index 7140a02b2d..398b93547a 100644 --- a/epan/dissectors/packet-hl7.c +++ b/epan/dissectors/packet-hl7.c @@ -32,7 +32,6 @@ #include <epan/expert.h> #include <epan/prefs.h> -#include <stdio.h> void proto_register_hl7(void); void proto_reg_handoff_hl7(void); diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c index 946dfa51a3..0d2a71d991 100644 --- a/epan/dissectors/packet-ieee1905.c +++ b/epan/dissectors/packet-ieee1905.c @@ -21,7 +21,6 @@ */ #include <config.h> -#include <stdio.h> #include <epan/packet.h> #include <epan/etypes.h> diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index c2f5864d61..9005d7aa1a 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -21,7 +21,6 @@ #include <epan/conversation.h> #include <epan/wmem_scopes.h> #include "packet-http.h" -#include <stdio.h> void proto_register_ipp(void); void proto_reg_handoff_ipp(void); diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 1d905c22d7..98bfbc78a6 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -69,7 +69,7 @@ ADD: Additional generic (non-checked) ICV length of 128, 192 and 256. #include <epan/decode_as.h> #include <epan/capture_dissectors.h> -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <epan/uat.h> #include <wsutil/str_util.h> #include <wsutil/wsgcrypt.h> diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 42ec25c81a..e3d534aa02 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -20,7 +20,7 @@ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-jdwp.c b/epan/dissectors/packet-jdwp.c index 28ae82a6b3..178fc77564 100644 --- a/epan/dissectors/packet-jdwp.c +++ b/epan/dissectors/packet-jdwp.c @@ -11,8 +11,6 @@ #include "config.h" -#include <stdio.h> - #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-log3gpp.c b/epan/dissectors/packet-log3gpp.c index 44a227f398..13e1b2e607 100644 --- a/epan/dissectors/packet-log3gpp.c +++ b/epan/dissectors/packet-log3gpp.c @@ -12,7 +12,6 @@ #include "config.h" #include <stdlib.h> -#include <stdio.h> #include <epan/packet.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-logcat-text.c b/epan/dissectors/packet-logcat-text.c index 613b8c59c1..0c27c8f858 100644 --- a/epan/dissectors/packet-logcat-text.c +++ b/epan/dissectors/packet-logcat-text.c @@ -12,7 +12,7 @@ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include "epan/packet.h" #include "epan/expert.h" diff --git a/epan/dissectors/packet-mac-nr.c b/epan/dissectors/packet-mac-nr.c index 781d413a52..0a9b36bc01 100644 --- a/epan/dissectors/packet-mac-nr.c +++ b/epan/dissectors/packet-mac-nr.c @@ -11,7 +11,6 @@ #include "config.h" -#include <stdio.h> #include <epan/packet.h> #include <epan/exceptions.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-mdp.c b/epan/dissectors/packet-mdp.c index ad3b1471c2..c1e2b564a0 100644 --- a/epan/dissectors/packet-mdp.c +++ b/epan/dissectors/packet-mdp.c @@ -9,7 +9,6 @@ */ #include "config.h" -#include <stdio.h> #include <epan/packet.h> #define MDP_TLV_TYPE 0 diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 0f478c308f..dce8a64fd8 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -24,7 +24,7 @@ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <epan/packet.h> #include <epan/conversation.h> diff --git a/epan/dissectors/packet-ncsi.c b/epan/dissectors/packet-ncsi.c index f887292ffe..6f83ed6517 100644 --- a/epan/dissectors/packet-ncsi.c +++ b/epan/dissectors/packet-ncsi.c @@ -26,7 +26,6 @@ #include <epan/expert.h> #include <epan/addr_resolv.h> #include <epan/pci-ids.h> -#include <stdio.h> void proto_reg_handoff_ncsi(void); void proto_register_ncsi(void); diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 496a75030c..5d79eb7911 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -14,7 +14,7 @@ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <stdbool.h> #include <epan/packet.h> diff --git a/epan/dissectors/packet-rdpudp.c b/epan/dissectors/packet-rdpudp.c index 1872242538..9fec44e75b 100644 --- a/epan/dissectors/packet-rdpudp.c +++ b/epan/dissectors/packet-rdpudp.c @@ -15,7 +15,6 @@ #include <epan/prefs.h> #include <epan/expert.h> #include <epan/conversation.h> -#include <stdio.h> #include "packet-rdp.h" #include "packet-rdpudp.h" diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 0c8d118e28..036c5b855e 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -13,7 +13,7 @@ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* fprintf() */ #include <epan/packet.h> #include <epan/expert.h> #include <epan/exceptions.h> diff --git a/epan/dissectors/packet-rtps-processed.c b/epan/dissectors/packet-rtps-processed.c index 4e23ee0e8f..74bf9413aa 100644 --- a/epan/dissectors/packet-rtps-processed.c +++ b/epan/dissectors/packet-rtps-processed.c @@ -53,7 +53,6 @@ */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> @@ -65,7 +64,6 @@ #include <epan/dissectors/packet-tcp.h> #include <epan/dissectors/packet-rtps.h> -#include <stdio.h> #define PARAM_ID_ADVANCED_FRAME0 0x000C1 #define PARAM_ID_ADVANCED_FRAME1 0x000C2 diff --git a/epan/dissectors/packet-rtps-virtual-transport.c b/epan/dissectors/packet-rtps-virtual-transport.c index 16d6f0dd14..fdd98b8c1f 100644 --- a/epan/dissectors/packet-rtps-virtual-transport.c +++ b/epan/dissectors/packet-rtps-virtual-transport.c @@ -53,7 +53,6 @@ * numbers). */ #include "config.h" -#include <glib.h> #include <epan/packet.h> #include <epan/expert.h> @@ -65,7 +64,6 @@ #include <epan/dissectors/packet-tcp.h> #include <epan/dissectors/packet-rtps.h> -#include <stdio.h> #define CONTENT_KIND_RTPS 0x01 #define CONTENT_KIND_LOSS_INFO 0x02 diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c index c93a842307..7d0455b3b3 100644 --- a/epan/dissectors/packet-scsi.c +++ b/epan/dissectors/packet-scsi.c @@ -67,7 +67,7 @@ */ #include "config.h" -#include <stdio.h> +#include <stdio.h> /* for sscanf() */ #include <epan/packet.h> #include <epan/to_str.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-selfm.c b/epan/dissectors/packet-selfm.c index 8127f6c291..c56786e697 100644 --- a/epan/dissectors/packet-selfm.c +++ b/epan/dissectors/packet-selfm.c @@ -58,9 +58,7 @@ #include <epan/expert.h> #include <epan/crc16-tvb.h> #include <epan/proto_data.h> -#if 0 -#include <stdio.h> -#endif + void proto_register_selfm(void); /* Initialize the protocol and registered fields */ diff --git a/epan/dissectors/packet-snort-config.c b/epan/dissectors/packet-snort-config.c index 928087f332..86a4e46276 100644 --- a/epan/dissectors/packet-snort-config.c +++ b/epan/dissectors/packet-snort-config.c @@ -11,7 +11,6 @@ #include "config.h" -#include <stdio.h> #include <stdlib.h> #include <string.h> #include <ctype.h> diff --git a/epan/dissectors/packet-snort-config.h b/epan/dissectors/packet-snort-config.h index c659cbd2b7..619e98115c 100644 --- a/epan/dissectors/packet-snort-config.h +++ b/epan/dissectors/packet-snort-config.h @@ -16,6 +16,7 @@ /* #define SNORT_CONFIG_DEBUG */ #ifdef SNORT_CONFIG_DEBUG +#include <stdio.h> #define snort_debug_printf printf #else #define snort_debug_printf(...) diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index ae8150a377..7db93cc46e 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -15,7 +15,6 @@ #include "config.h" #include <math.h> -#include <stdio.h> #include <epan/packet.h> #include <epan/crc16-tvb.h> diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 8fc7238781..613ac5c03c 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -10,7 +10,6 @@ #include "config.h" -#include <stdio.h> #include <epan/packet.h> #include <epan/capture_dissectors.h> #include <epan/exceptions.h> diff --git a/epan/dissectors/packet-tcpcl.c b/epan/dissectors/packet-tcpcl.c index a25efc2097..365a3971bf 100644 --- a/epan/dissectors/packet-tcpcl.c +++ b/epan/dissectors/packet-tcpcl.c @@ -43,7 +43,6 @@ #include "config.h" #include <inttypes.h> -#include <stdio.h> #include <epan/packet.h> #include <epan/reassemble.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-teap.c b/epan/dissectors/packet-teap.c index 04a6380e94..10c7802680 100644 --- a/epan/dissectors/packet-teap.c +++ b/epan/dissectors/packet-teap.c @@ -11,8 +11,6 @@ #include "config.h" -#include <stdio.h> - #include <epan/packet.h> #include <epan/expert.h> #include <epan/proto_data.h> diff --git a/epan/dissectors/packet-ubdp.c b/epan/dissectors/packet-ubdp.c index 2da94a4736..e9a97e8afa 100644 --- a/epan/dissectors/packet-ubdp.c +++ b/epan/dissectors/packet-ubdp.c @@ -9,7 +9,6 @@ */ #include "config.h" -#include <stdio.h> #include <epan/packet.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-vpp.c b/epan/dissectors/packet-vpp.c index e1c9e41d12..149464ada9 100644 --- a/epan/dissectors/packet-vpp.c +++ b/epan/dissectors/packet-vpp.c @@ -19,7 +19,6 @@ #include <epan/to_str.h> #include <epan/nlpid.h> #include <epan/etypes.h> -#include <stdio.h> #include <epan/ws_printf.h> void proto_register_vpp(void); diff --git a/epan/dissectors/packet-wap.c b/epan/dissectors/packet-wap.c index c099d61805..832c38918a 100644 --- a/epan/dissectors/packet-wap.c +++ b/epan/dissectors/packet-wap.c @@ -15,7 +15,9 @@ #include "config.h" +#ifdef DEBUG #include <stdio.h> +#endif #include <epan/packet.h> #include "packet-wap.h" |