Dissectors should not include stdio.h, unless needed

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>

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>

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>

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>

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>

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>

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"
 

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>

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

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>

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>

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"

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);

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>

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>

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>

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"
 

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);

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>

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>

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>

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>

epan/dissectors/packet-giop.c

@@ -266,7 +266,6 @@
 
 #include "config.h"
 
-#include <stdio.h>
 #include <errno.h>
 #include <math.h>
 

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>

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>

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);

epan/dissectors/packet-ieee1905.c

@@ -21,7 +21,6 @@
  */
 
 #include <config.h>
-#include <stdio.h>
 
 #include <epan/packet.h>
 #include <epan/etypes.h>

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);

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>

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>

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>

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>

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"

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>

epan/dissectors/packet-mdp.c

@@ -9,7 +9,6 @@
  */
 
 #include "config.h"
-#include <stdio.h>
 #include <epan/packet.h>
 
 #define MDP_TLV_TYPE            0

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>

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);

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>

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"

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>

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

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

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>

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 */

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>

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(...)

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>

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>

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>

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>

epan/dissectors/packet-ubdp.c

@@ -9,7 +9,6 @@
  */
 
 #include "config.h"
-#include <stdio.h>
 #include <epan/packet.h>
 #include <epan/expert.h>
 

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);

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"