(FWIW) One step towards including stdio.h & stdlib.h only when req'd.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29568 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/capture.c b/capture.c
index 4471b411474bcca198a294648f54f4445bb11f58..d6461eec7d87f5838ce492bc211b1ba2d6743414 100644 (file)
--- a/capture.c
+++ b/capture.c
@@ -32,6 +32,7 @@
 #include <unistd.h>
 #endif
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>

diff --git a/color_filters.c b/color_filters.c
index c30369121d079a72c3b7bfcd10584d2f83f718fd..eee30e172c4d150deee68d146a455ff6e3d42589 100644 (file)
--- a/color_filters.c
+++ b/color_filters.c
@@ -30,6 +30,8 @@
 #endif
 
 #include <glib.h>
+
+#include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 

diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 96beacdd96f3c0df49b37a51e425c6f25a8cbce2..396de3ea76cadf9fa434cf2dc9296caeeb24995d 100644 (file)
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -76,6 +76,8 @@
 # include "config.h"
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <ctype.h>

diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 4ab35fe31bf4c23eac5b97b96487fdbc15373286..94f2ae79118bc0ed69c6f51b70fbddccdf118fae 100644 (file)
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -28,6 +28,7 @@
 
 #include <glib.h>
 
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <epan/packet.h>

diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index e7d0b41fa8f5036ff093b2719c963edfc27660e0..07f1cc395becb7c17847698e1292832524e2a3e5 100644 (file)
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -31,6 +31,7 @@
 # include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/expert.h>

diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index d848f814f5e266efe331b29275cf78620a5009d2..6495df01524c25fa9f1e15df5e54a7d9a8ac4fce 100644 (file)
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -34,6 +34,7 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 

diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c
index 56c0510800138c0158d04ef65a37dfd6f916b775..3e88a2b1e0d1bd378fb5b0f37e3ab42d5b116b93 100644 (file)
--- a/epan/dissectors/packet-kismet.c
+++ b/epan/dissectors/packet-kismet.c
@@ -29,8 +29,7 @@
 # include "config.h"
 #endif
 
-#include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>

diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c
index f4328bf59f7c85664c1fc0b0766275e1e781e7b9..5bc5f4bb52995db11443175a37e3cf601a667606 100644 (file)
--- a/epan/dissectors/packet-ldss.c
+++ b/epan/dissectors/packet-ldss.c
@@ -40,8 +40,10 @@
 #include "config.h"
 #endif
 
-#include <math.h>
 #include <glib.h>
+
+#include <stdlib.h>
+#include <math.h>
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>

diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c
index 9b2c7f6f5462174c91edac396ce47905590a73b5..870eee244a44017086f843e0e37bfd4879ca4c2b 100644 (file)
--- a/epan/dissectors/packet-memcache.c
+++ b/epan/dissectors/packet-memcache.c
@@ -34,6 +34,8 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 

diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index 6c680ad4a922bc521ff5a79ba33fdb69a2131131..f804c519bd47fe130ad5188401c7f5bddd831302 100644 (file)
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -37,6 +37,7 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
 #include <epan/packet.h>

diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index f7f19ef39b26df8809827693261b60aefc02a48b..db04ea401ae06e772e6bd2bb95ed6c92a0d550d0 100644 (file)
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -30,10 +30,9 @@
 #include "config.h"
 #endif
 
-
+#include <stdlib.h>
 #include <string.h>
 
-
 #include "packet-rpc.h"
 #include "packet-nfs.h"
 #include <epan/prefs.h>

diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c
index dd2c637af3566bf8646e7b74220a9a243638cef7..4f766fcdc3c3239e3df95ddb97666b3302b622d4 100644 (file)
--- a/epan/dissectors/packet-pop.c
+++ b/epan/dissectors/packet-pop.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <stdio.h>
+#include <stdlib.h>
 
 #include <string.h>
 #include <glib.h>

diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c
index 446c9d5e064b22e76db0e67655de3fe1eda773ef..9040490a00b8380a25f9e3077e163350458bec36 100644 (file)
--- a/epan/dissectors/packet-quakeworld.c
+++ b/epan/dissectors/packet-quakeworld.c
@@ -32,6 +32,8 @@
 #endif
 
 #include <glib.h>
+
+#include <stdlib.h>
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/prefs.h>

diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index f158eaaaa0daea8e40fcb7620aed14d5140bc359..d6ea5d2ecd9d5f0c87ec6074ac34d00cec698914 100644 (file)
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -51,6 +51,7 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>

diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c
index c3008116a4e4ced9b47f0c6524b479712ba8a295..124d303da05ca711e078b12b581139fbf52d9b86 100644 (file)
--- a/epan/dissectors/packet-rlogin.c
+++ b/epan/dissectors/packet-rlogin.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 

diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index 9f047e2209da9b325c2811912b284153ae51b9b6..dcb5d30d5bced667bb260b603a67aac8804e8e61 100644 (file)
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -55,7 +55,7 @@
 #include <glib.h>
 #include <epan/packet.h>
 
-#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "packet-rtcp.h"

diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c
index ec7870a790e76b240c61d1d36265192c3de9c90a..092f25d945ebe56887dc874e79a2945c210e27d4 100644 (file)
--- a/epan/dissectors/packet-rtsp.c
+++ b/epan/dissectors/packet-rtsp.c
@@ -31,9 +31,9 @@
 
 #include "config.h"
 
+#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
-#include <stdlib.h>
 
 #include <epan/prefs.h>
 

diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index ef0a02772fb9be9d7a59866617947c2474523493..caa91e0edf1939c54d2f8639ffb3fe4549bf26a6 100644 (file)
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -28,6 +28,7 @@
 
 #include "config.h"
 
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 

diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c
index cce7b34aad6746517defdc3e734c05d9bfc52d74..de1955f7f7dc402ad4c45e7b614392e13e8b460c 100644 (file)
--- a/epan/dissectors/packet-ssh.c
+++ b/epan/dissectors/packet-ssh.c
@@ -35,9 +35,7 @@
 # include "config.h"
 #endif
 
-#if HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>

diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c
index 6183b2507343aac9988378984bf0dac9255364a1..d3bb5df1d8e01179c69afaa2928dd4fba9d1285a 100644 (file)
--- a/epan/dissectors/packet-tftp.c
+++ b/epan/dissectors/packet-tftp.c
@@ -45,6 +45,7 @@
 #endif
 
 #include <glib.h>
+#include <stdlib.h>
 #include <string.h>
 #include <epan/packet.h>
 #include <epan/conversation.h>

diff --git a/epan/dissectors/packet-user_encap.c b/epan/dissectors/packet-user_encap.c
index baa385e4f79bc6f4e88e2539416b2ea501cf58e0..6f3a0d13a14f44ae3596e1509f85c5ad261d22d7 100644 (file)
--- a/epan/dissectors/packet-user_encap.c
+++ b/epan/dissectors/packet-user_encap.c
@@ -28,6 +28,7 @@
 # include "config.h"
 #endif
 
+#include <stdlib.h>
 #include <string.h>
 #include <glib.h>
 #include <epan/packet.h>

diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c
index c8d33a16d938fc4522ea733e1973d74dc800c212..c5cf88d4be62e77dead73ded961388531b009f5b 100644 (file)
--- a/epan/ftypes/ftype-bytes.c
+++ b/epan/ftypes/ftype-bytes.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
 #include <ftypes-int.h>
 #include <string.h>
 #include <ctype.h>

diff --git a/epan/ftypes/ftype-double.c b/epan/ftypes/ftype-double.c
index ff2f4b77d55ea168c6537c1dc5e64e5408fd9048..537a1b27fe4eab6fa2b95b6a413645a01c82216b 100644 (file)
--- a/epan/ftypes/ftype-double.c
+++ b/epan/ftypes/ftype-double.c
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
 #include <ftypes-int.h>
-#include <stdlib.h>
 #include <math.h>
 #include <errno.h>
 #include <float.h>

diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index d12b38e4d511b85551a0ca8403574a1de3724ae1..a45169e10f5542fad53e96eefb36492bf8b35027 100644 (file)
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
 #include "ftypes-int.h"
 #include <epan/addr_resolv.h>

diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c
index 742400fe264accb69c713d1575476e65ad114eac..18754d7cc068d9b33a2ef26eff05c6a8e64fd153 100644 (file)
--- a/epan/ftypes/ftype-string.c
+++ b/epan/ftypes/ftype-string.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
 #include <ftypes-int.h>
 #include <string.h>
 

diff --git a/epan/ftypes/ftype-time.c b/epan/ftypes/ftype-time.c
index ed06b47ba7d0de6de1086a6e9aa448ec2ed37403..15b33d2ca9ab7203f9b12e356373834870bc0870 100644 (file)
--- a/epan/ftypes/ftype-time.c
+++ b/epan/ftypes/ftype-time.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 

diff --git a/epan/ftypes/ftype-tvbuff.c b/epan/ftypes/ftype-tvbuff.c
index bd81508bd120b329e9d1b25e77f3a06fcfb04e66..418961dd1e36d91dcbe5dfd9d9fae959baba9854 100644 (file)
--- a/epan/ftypes/ftype-tvbuff.c
+++ b/epan/ftypes/ftype-tvbuff.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
 #include <ftypes-int.h>
 #include <string.h>
 

diff --git a/epan/plugins.c b/epan/plugins.c
index 06f5e9b061831cebbbb998dcb4c10aee1d07cd75..ac7f7ece271f20cfec8a95a02c4b572eb37b4867 100644 (file)
--- a/epan/plugins.c
+++ b/epan/plugins.c
@@ -40,8 +40,9 @@
 #include <direct.h>
 #endif
 
-#include <string.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #ifdef HAVE_UNISTD_H

diff --git a/epan/prefs.c b/epan/prefs.c
index b80ac4989a3fc1c6bfee714528f199bfafb28466..85b73e6ea6fff20788d8c7426464a4481999b932 100644 (file)
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -37,6 +37,7 @@
 
 #include <glib.h>
 
+#include <stdio.h>
 #include <epan/filesystem.h>
 #include <epan/address.h>
 #include <epan/addr_resolv.h>

diff --git a/epan/req_resp_hdrs.c b/epan/req_resp_hdrs.c
index 8e548d187394ac7acb603deeb3396004bcf01a84..d6f13293a2d48a0ae329ee2fd0d10b7569910a00 100644 (file)
--- a/epan/req_resp_hdrs.c
+++ b/epan/req_resp_hdrs.c
@@ -28,9 +28,11 @@
 #endif
 
 #include <glib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include <epan/packet.h>
 #include <epan/strutil.h>
-#include <string.h>
 
 #include <epan/req_resp_hdrs.h>
 

diff --git a/fileset.c b/fileset.c
index f3697e8390daaeef8ff01b1599955bc94e36e1c5..55e227627a0a17e22b1afa6a376d7c5c5e68a884 100644 (file)
--- a/fileset.c
+++ b/fileset.c
@@ -46,6 +46,7 @@
 # include <sys/wait.h>
 #endif
 
+#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 

diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c
index 8256590d4d53b81a751f97720f5637b37c58672b..dd4d135695b742d07c6a97c06d1b7529e50872e9 100644 (file)
--- a/gtk/rtp_stream.c
+++ b/gtk/rtp_stream.c
@@ -28,6 +28,8 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+
+#include <stdio.h>
 #include <string.h>
 
 #ifdef HAVE_FCNTL_H

diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c
index 4eeb0b25c2995119edf3dcfb4b670ddd9e596a7f..27e86e3b96d8457eaed518203473fc677c6d89d1 100644 (file)
--- a/gtk/rtp_stream_dlg.c
+++ b/gtk/rtp_stream_dlg.c
@@ -28,6 +28,8 @@
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
+
+#include <stdio.h>
 #include <string.h>
 #include <locale.h>
 

diff --git a/packet-range.c b/packet-range.c
index 6d98b121e18a673cabff80c6232c9161ab768d22..2938539a4325607c9d823761c72e8affb96e1e88 100644 (file)
--- a/packet-range.c
+++ b/packet-range.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 

diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c
index 2299d2fbc8d863ba88808845f6a2462247598397..135d5877d16ef81367fb17617c1efccb2070bf87 100644 (file)
--- a/plugins/wimaxasncp/packet-wimaxasncp.c
+++ b/plugins/wimaxasncp/packet-wimaxasncp.c
@@ -32,6 +32,7 @@
 # include "config.h"
 #endif
 
+#include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 

diff --git a/proto_hier_stats.c b/proto_hier_stats.c
index de8510e67cd386b4d9be4b919f3cb3d211098d20..724caf5959dc83b60aceb7ca3a79c13c03139c3d 100644 (file)
--- a/proto_hier_stats.c
+++ b/proto_hier_stats.c
@@ -26,6 +26,8 @@
 # include "config.h"
 #endif
 
+#include <stdio.h>
+
 #include "globals.h"
 #include "proto_hier_stats.h"
 #include "progress_dlg.h"

diff --git a/tap-rtp-common.c b/tap-rtp-common.c
index 43f87ffba33340584657ea800ec69988fbab89af..a57c7c3ec87be4c7518ca2e6e8836d6ea4cd6b61 100644 (file)
--- a/tap-rtp-common.c
+++ b/tap-rtp-common.c
@@ -33,6 +33,7 @@
 # include "config.h"
 #endif
 
+#include <stdio.h>
 #include <math.h>
 #include "globals.h"