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

svn path=/trunk/; revision=29568

37 files changed, 48 insertions, 15 deletions

diff --git a/capture.c b/capture.c
index 4471b41147..d6461eec7d 100644
--- 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 c30369121d..eee30e172c 100644
--- 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 96beacdd96..396de3ea76 100644
--- 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 4ab35fe31b..94f2ae7911 100644
--- 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 e7d0b41fa8..07f1cc395b 100644
--- 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 d848f814f5..6495df0152 100644
--- 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 56c0510800..3e88a2b1e0 100644
--- 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 f4328bf59f..5bc5f4bb52 100644
--- 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 9b2c7f6f54..870eee244a 100644
--- 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 6c680ad4a9..f804c519bd 100644
--- 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 f7f19ef39b..db04ea401a 100644
--- 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 dd2c637af3..4f766fcdc3 100644
--- 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 446c9d5e06..9040490a00 100644
--- 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 f158eaaaa0..d6ea5d2ecd 100644
--- 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 c3008116a4..124d303da0 100644
--- 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 9f047e2209..dcb5d30d5b 100644
--- 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 ec7870a790..092f25d945 100644
--- 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 ef0a02772f..caa91e0edf 100644
--- 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 cce7b34aad..de1955f7f7 100644
--- 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 6183b25073..d3bb5df1d8 100644
--- 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 baa385e4f7..6f3a0d13a1 100644
--- 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 c8d33a16d9..c5cf88d4be 100644
--- 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 ff2f4b77d5..537a1b27fe 100644
--- 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 d12b38e4d5..a45169e10f 100644
--- 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 742400fe26..18754d7cc0 100644
--- 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 ed06b47ba7..15b33d2ca9 100644
--- 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 bd81508bd1..418961dd1e 100644
--- 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 06f5e9b061..ac7f7ece27 100644
--- 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 b80ac4989a..85b73e6ea6 100644
--- 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 8e548d1873..d6f13293a2 100644
--- 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 f3697e8390..55e227627a 100644
--- 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 8256590d4d..dd4d135695 100644
--- 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 4eeb0b25c2..27e86e3b96 100644
--- 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 6d98b121e1..2938539a43 100644
--- 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 2299d2fbc8..135d5877d1 100644
--- 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 de8510e67c..724caf5959 100644
--- 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 43f87ffba3..a57c7c3ec8 100644
--- 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"