From 88e38fa1483891f273f063f92ef71a5c33fe5406 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Wed, 27 Sep 2006 10:58:14 +0000 Subject: [PATCH] We don't actually have a stdio.h header file. Our printf() functions are defined in vsprintf.h. (This may change, since vsprintf.h is a non-standard name, but for now it's the one to use.) There should be no need to include vsprintf.h just for DBG() statements, since include/compiler.h forces it in for a debug build anyway. --- src/arch/i386/core/load_buffer.c | 1 - src/arch/i386/core/relocate.c | 1 - src/arch/i386/firmware/pcbios/hidemem.c | 1 - src/arch/i386/firmware/pcbios/memmap.c | 1 - src/arch/i386/interface/pcbios/int13.c | 1 - src/arch/i386/interface/pxe/pxe_call.c | 1 - src/core/buffer.c | 1 - src/core/device.c | 1 - src/core/malloc.c | 1 - src/core/osloader.c | 1 - src/core/resolv.c | 1 - src/crypto/framework.c | 1 - src/crypto/ssl.c | 1 - src/drivers/bitbash/i2c_bit.c | 1 - src/drivers/bitbash/spi_bit.c | 1 - src/drivers/block/ata.c | 1 - src/drivers/bus/pci.c | 1 - src/drivers/bus/pciextra.c | 1 - src/interface/pxe/pxe_loader.c | 1 - src/interface/pxe/pxe_tftp.c | 1 - src/interface/pxe/pxe_udp.c | 1 - src/interface/pxe/pxe_undi.c | 1 - src/net/arp.c | 1 - src/net/icmpv6.c | 1 - src/net/ndp.c | 1 - src/net/netdevice.c | 1 - src/net/retry.c | 1 - src/net/tcpip.c | 1 - src/net/udp.c | 1 - src/net/udp/dhcp.c | 1 - src/net/uip/uip.c | 1 - src/proto/nmb.c | 1 - 32 files changed, 32 deletions(-) diff --git a/src/arch/i386/core/load_buffer.c b/src/arch/i386/core/load_buffer.c index 4f19a3ce..3e34d2b5 100644 --- a/src/arch/i386/core/load_buffer.c +++ b/src/arch/i386/core/load_buffer.c @@ -1,4 +1,3 @@ -#include #include "io.h" #include "load_buffer.h" diff --git a/src/arch/i386/core/relocate.c b/src/arch/i386/core/relocate.c index 1e9332ee..c9ac7ee1 100644 --- a/src/arch/i386/core/relocate.c +++ b/src/arch/i386/core/relocate.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/src/arch/i386/firmware/pcbios/hidemem.c b/src/arch/i386/firmware/pcbios/hidemem.c index 2225787e..276f9c92 100644 --- a/src/arch/i386/firmware/pcbios/hidemem.c +++ b/src/arch/i386/firmware/pcbios/hidemem.c @@ -15,7 +15,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include diff --git a/src/arch/i386/firmware/pcbios/memmap.c b/src/arch/i386/firmware/pcbios/memmap.c index 1995dfd6..daa1d99c 100644 --- a/src/arch/i386/firmware/pcbios/memmap.c +++ b/src/arch/i386/firmware/pcbios/memmap.c @@ -16,7 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include diff --git a/src/arch/i386/interface/pcbios/int13.c b/src/arch/i386/interface/pcbios/int13.c index 790dda97..798fb6df 100644 --- a/src/arch/i386/interface/pcbios/int13.c +++ b/src/arch/i386/interface/pcbios/int13.c @@ -16,7 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include diff --git a/src/arch/i386/interface/pxe/pxe_call.c b/src/arch/i386/interface/pxe/pxe_call.c index 0e7c09a4..df32dd7d 100644 --- a/src/arch/i386/interface/pxe/pxe_call.c +++ b/src/arch/i386/interface/pxe/pxe_call.c @@ -16,7 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include diff --git a/src/core/buffer.c b/src/core/buffer.c index df08b66d..5c31ff8d 100644 --- a/src/core/buffer.c +++ b/src/core/buffer.c @@ -38,7 +38,6 @@ * */ -#include "stdio.h" #include "stddef.h" #include "string.h" #include "io.h" diff --git a/src/core/device.c b/src/core/device.c index dfbb997e..e54ab297 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -19,7 +19,6 @@ #include #include #include -#include "stdio.h" /** * @file diff --git a/src/core/malloc.c b/src/core/malloc.c index 14e54976..cff2a431 100644 --- a/src/core/malloc.c +++ b/src/core/malloc.c @@ -16,7 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include diff --git a/src/core/osloader.c b/src/core/osloader.c index 09d671a0..ddbe68a3 100644 --- a/src/core/osloader.c +++ b/src/core/osloader.c @@ -29,7 +29,6 @@ Modifications: Ken Yap (for Etherboot/16) * your option) any later version. */ -#include "stdio.h" #include "io.h" #include "memsizes.h" diff --git a/src/core/resolv.c b/src/core/resolv.c index f13ab152..0737294a 100644 --- a/src/core/resolv.c +++ b/src/core/resolv.c @@ -1,5 +1,4 @@ #include "resolv.h" -#include "stdio.h" static struct resolver resolvers[0] __table_start(resolver); static struct resolver resolvers_end[0] __table_end(resolver); diff --git a/src/crypto/framework.c b/src/crypto/framework.c index c09490d3..0da2cbe3 100644 --- a/src/crypto/framework.c +++ b/src/crypto/framework.c @@ -1,7 +1,6 @@ /* mcb - this file breaks the build process; temporarily deactivating */ #if 0 -#include #include #include #include diff --git a/src/crypto/ssl.c b/src/crypto/ssl.c index 823c926a..00651bd4 100644 --- a/src/crypto/ssl.c +++ b/src/crypto/ssl.c @@ -1,4 +1,3 @@ -#include #include "ssl.h" #include "ssl_constructs.h" #include // for bcopy() diff --git a/src/drivers/bitbash/i2c_bit.c b/src/drivers/bitbash/i2c_bit.c index 1cf78c22..f0a9b936 100644 --- a/src/drivers/bitbash/i2c_bit.c +++ b/src/drivers/bitbash/i2c_bit.c @@ -16,7 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include diff --git a/src/drivers/bitbash/spi_bit.c b/src/drivers/bitbash/spi_bit.c index add884a3..20ad412c 100644 --- a/src/drivers/bitbash/spi_bit.c +++ b/src/drivers/bitbash/spi_bit.c @@ -16,7 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include diff --git a/src/drivers/block/ata.c b/src/drivers/block/ata.c index 84191257..555a5f6e 100644 --- a/src/drivers/block/ata.c +++ b/src/drivers/block/ata.c @@ -16,7 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c index 6f72bb90..222f3eea 100644 --- a/src/drivers/bus/pci.c +++ b/src/drivers/bus/pci.c @@ -19,7 +19,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include diff --git a/src/drivers/bus/pciextra.c b/src/drivers/bus/pciextra.c index 5d815000..4603bcb9 100644 --- a/src/drivers/bus/pciextra.c +++ b/src/drivers/bus/pciextra.c @@ -1,4 +1,3 @@ -#include #include #include diff --git a/src/interface/pxe/pxe_loader.c b/src/interface/pxe/pxe_loader.c index b8dc06bd..2539aaeb 100644 --- a/src/interface/pxe/pxe_loader.c +++ b/src/interface/pxe/pxe_loader.c @@ -22,7 +22,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include "pxe.h" /* PXENV_UNDI_LOADER diff --git a/src/interface/pxe/pxe_tftp.c b/src/interface/pxe/pxe_tftp.c index dbaf601b..a834be09 100644 --- a/src/interface/pxe/pxe_tftp.c +++ b/src/interface/pxe/pxe_tftp.c @@ -22,7 +22,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include "pxe.h" static int pxe_tftp_read_block ( unsigned char *data, unsigned int block, diff --git a/src/interface/pxe/pxe_udp.c b/src/interface/pxe/pxe_udp.c index 453d5b6c..5f94e8c0 100644 --- a/src/interface/pxe/pxe_udp.c +++ b/src/interface/pxe/pxe_udp.c @@ -4,7 +4,6 @@ * */ -#include #include #include #include diff --git a/src/interface/pxe/pxe_undi.c b/src/interface/pxe/pxe_undi.c index f9bf2a9a..6d30d1b6 100644 --- a/src/interface/pxe/pxe_undi.c +++ b/src/interface/pxe/pxe_undi.c @@ -22,7 +22,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include "pxe.h" /* PXENV_UNDI_STARTUP diff --git a/src/net/arp.c b/src/net/arp.c index 8ca30245..fea81d71 100644 --- a/src/net/arp.c +++ b/src/net/arp.c @@ -16,7 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "stdio.h" #include #include #include diff --git a/src/net/icmpv6.c b/src/net/icmpv6.c index c48bf127..d1f58bd1 100644 --- a/src/net/icmpv6.c +++ b/src/net/icmpv6.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/src/net/ndp.c b/src/net/ndp.c index d99a9569..11085a43 100644 --- a/src/net/ndp.c +++ b/src/net/ndp.c @@ -1,4 +1,3 @@ -#include "stdio.h" #include #include #include diff --git a/src/net/netdevice.c b/src/net/netdevice.c index 2ee14090..634977f7 100644 --- a/src/net/netdevice.c +++ b/src/net/netdevice.c @@ -16,7 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include diff --git a/src/net/retry.c b/src/net/retry.c index ac98dcfa..0fb47952 100644 --- a/src/net/retry.c +++ b/src/net/retry.c @@ -16,7 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include diff --git a/src/net/tcpip.c b/src/net/tcpip.c index 7476628e..33c9872c 100644 --- a/src/net/tcpip.c +++ b/src/net/tcpip.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/src/net/udp.c b/src/net/udp.c index e46c772e..21bfebcd 100644 --- a/src/net/udp.c +++ b/src/net/udp.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index 9c36516d..af32f213 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -16,7 +16,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include diff --git a/src/net/uip/uip.c b/src/net/uip/uip.c index cde69fef..d2f0e0c0 100644 --- a/src/net/uip/uip.c +++ b/src/net/uip/uip.c @@ -168,7 +168,6 @@ struct uip_stats uip_stat; #endif /* UIP_STATISTICS == 1 */ #if UIP_LOGGING == 1 -#include void uip_log(char *msg); #define UIP_LOG(m) uip_log(m) #else diff --git a/src/proto/nmb.c b/src/proto/nmb.c index 9fa17d9c..d2944031 100644 --- a/src/proto/nmb.c +++ b/src/proto/nmb.c @@ -1,4 +1,3 @@ -#include "stdio.h" #include "resolv.h" #include "string.h" #include "dns.h"