diff options
45 files changed, 45 insertions, 45 deletions
diff --git a/src/arch/i386/core/nulltrap.c b/src/arch/i386/core/nulltrap.c index bd4b757..61fe556 100644 --- a/src/arch/i386/core/nulltrap.c +++ b/src/arch/i386/core/nulltrap.c @@ -1,5 +1,5 @@ #include <stdint.h> -#include <vsprintf.h> +#include <stdio.h> __attribute__ (( noreturn, section ( ".text.null_trap" ) )) void null_function_trap ( void ) { diff --git a/src/arch/i386/drivers/net/undi.c b/src/arch/i386/drivers/net/undi.c index c93ad24..648835c 100644 --- a/src/arch/i386/drivers/net/undi.c +++ b/src/arch/i386/drivers/net/undi.c @@ -18,8 +18,8 @@ #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <string.h> -#include <vsprintf.h> #include <gpxe/pci.h> #include <undi.h> #include <undirom.h> diff --git a/src/core/exec.c b/src/core/exec.c index 8f1ef33..a1c073e 100644 --- a/src/core/exec.c +++ b/src/core/exec.c @@ -19,11 +19,11 @@ #include <stdint.h> #include <string.h> #include <stdlib.h> +#include <stdio.h> #include <unistd.h> #include <getopt.h> #include <errno.h> #include <assert.h> -#include <vsprintf.h> #include <gpxe/tables.h> #include <gpxe/command.h> diff --git a/src/core/getopt.c b/src/core/getopt.c index 547aa69..6de412b 100644 --- a/src/core/getopt.c +++ b/src/core/getopt.c @@ -18,7 +18,7 @@ #include <stdint.h> #include <string.h> -#include <vsprintf.h> +#include <stdio.h> #include <getopt.h> /** @file diff --git a/src/core/image.c b/src/core/image.c index 0ff0a70..5a2ee82 100644 --- a/src/core/image.c +++ b/src/core/image.c @@ -19,9 +19,9 @@ #include <stddef.h> #include <string.h> #include <stdlib.h> +#include <stdio.h> #include <errno.h> #include <assert.h> -#include <vsprintf.h> #include <gpxe/list.h> #include <gpxe/image.h> diff --git a/src/core/malloc.c b/src/core/malloc.c index 448080b..6dfdd63 100644 --- a/src/core/malloc.c +++ b/src/core/malloc.c @@ -340,7 +340,7 @@ void mpopulate ( void *start, size_t len ) { } #if 0 -#include <vsprintf.h> +#include <stdio.h> /** * Dump free block list * diff --git a/src/core/settings.c b/src/core/settings.c index a1f4044..42029fd 100644 --- a/src/core/settings.c +++ b/src/core/settings.c @@ -18,12 +18,12 @@ #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <string.h> #include <strings.h> #include <byteswap.h> #include <errno.h> #include <assert.h> -#include <vsprintf.h> #include <gpxe/in.h> #include <gpxe/settings.h> diff --git a/src/core/vsprintf.c b/src/core/vsprintf.c index e225d48..ca22ae8 100644 --- a/src/core/vsprintf.c +++ b/src/core/vsprintf.c @@ -18,6 +18,7 @@ #include <stddef.h> #include <stdarg.h> +#include <stdio.h> #include <console.h> #include <errno.h> #include <vsprintf.h> diff --git a/src/drivers/bus/pci.c b/src/drivers/bus/pci.c index 56436b7..e8f34fb 100644 --- a/src/drivers/bus/pci.c +++ b/src/drivers/bus/pci.c @@ -21,9 +21,9 @@ #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <string.h> #include <errno.h> -#include <vsprintf.h> #include <gpxe/tables.h> #include <gpxe/device.h> #include <gpxe/pci.h> diff --git a/src/drivers/net/legacy.c b/src/drivers/net/legacy.c index 73d1d78..1719c82 100644 --- a/src/drivers/net/legacy.c +++ b/src/drivers/net/legacy.c @@ -1,6 +1,6 @@ #include <stdint.h> +#include <stdio.h> #include <errno.h> -#include <vsprintf.h> #include <gpxe/if_ether.h> #include <gpxe/netdevice.h> #include <gpxe/ethernet.h> diff --git a/src/drivers/net/pnic.c b/src/drivers/net/pnic.c index 21097d2..7f44242 100644 --- a/src/drivers/net/pnic.c +++ b/src/drivers/net/pnic.c @@ -13,8 +13,8 @@ Bochs Pseudo NIC driver for Etherboot */ #include <stdint.h> +#include <stdio.h> #include <io.h> -#include <vsprintf.h> #include <errno.h> #include <gpxe/pci.h> #include <gpxe/if_ether.h> diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c index ff1fa64..d3b8922 100644 --- a/src/drivers/net/rtl8139.c +++ b/src/drivers/net/rtl8139.c @@ -68,9 +68,9 @@ #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <io.h> #include <errno.h> -#include <vsprintf.h> #include <timer.h> #include <byteswap.h> #include <gpxe/pci.h> diff --git a/src/hci/commands/autoboot_cmd.c b/src/hci/commands/autoboot_cmd.c index d7fb2e1..0e6f294 100644 --- a/src/hci/commands/autoboot_cmd.c +++ b/src/hci/commands/autoboot_cmd.c @@ -1,4 +1,4 @@ -#include <vsprintf.h> +#include <stdio.h> #include <gpxe/command.h> #include <usr/autoboot.h> diff --git a/src/hci/commands/config_cmd.c b/src/hci/commands/config_cmd.c index a155939..368a6ca 100644 --- a/src/hci/commands/config_cmd.c +++ b/src/hci/commands/config_cmd.c @@ -1,5 +1,5 @@ #include <string.h> -#include <vsprintf.h> +#include <stdio.h> #include <gpxe/command.h> #include <gpxe/settings.h> #include <gpxe/settings_ui.h> diff --git a/src/hci/commands/dhcp_cmd.c b/src/hci/commands/dhcp_cmd.c index 8cfd428..208f355 100644 --- a/src/hci/commands/dhcp_cmd.c +++ b/src/hci/commands/dhcp_cmd.c @@ -18,8 +18,8 @@ #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <getopt.h> -#include <vsprintf.h> #include <gpxe/netdevice.h> #include <gpxe/command.h> #include <usr/dhcpmgmt.h> diff --git a/src/hci/commands/ifmgmt_cmd.c b/src/hci/commands/ifmgmt_cmd.c index dc255e1..f2508e5 100644 --- a/src/hci/commands/ifmgmt_cmd.c +++ b/src/hci/commands/ifmgmt_cmd.c @@ -16,8 +16,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <stdio.h> #include <getopt.h> -#include <vsprintf.h> #include <gpxe/netdevice.h> #include <gpxe/command.h> #include <usr/ifmgmt.h> diff --git a/src/hci/commands/image_cmd.c b/src/hci/commands/image_cmd.c index 900886f..98de50e 100644 --- a/src/hci/commands/image_cmd.c +++ b/src/hci/commands/image_cmd.c @@ -18,10 +18,10 @@ #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <errno.h> #include <libgen.h> #include <getopt.h> -#include <vsprintf.h> #include <gpxe/image.h> #include <gpxe/command.h> #include <gpxe/initrd.h> diff --git a/src/hci/commands/nvo_cmd.c b/src/hci/commands/nvo_cmd.c index 91c1320..4392787 100644 --- a/src/hci/commands/nvo_cmd.c +++ b/src/hci/commands/nvo_cmd.c @@ -1,8 +1,8 @@ #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <string.h> #include <errno.h> -#include <vsprintf.h> #include <getopt.h> #include <gpxe/nvo.h> #include <gpxe/dhcp.h> diff --git a/src/hci/commands/route_cmd.c b/src/hci/commands/route_cmd.c index 2e9de56..227682c 100644 --- a/src/hci/commands/route_cmd.c +++ b/src/hci/commands/route_cmd.c @@ -16,8 +16,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <stdio.h> #include <getopt.h> -#include <vsprintf.h> #include <gpxe/command.h> #include <usr/route.h> diff --git a/src/hci/mucurses/alert.c b/src/hci/mucurses/alert.c index 4e88b82..00e959a 100644 --- a/src/hci/mucurses/alert.c +++ b/src/hci/mucurses/alert.c @@ -1,5 +1,5 @@ #include <curses.h> -#include <vsprintf.h> +#include <stdio.h> /** @file * diff --git a/src/hci/mucurses/print.c b/src/hci/mucurses/print.c index fc14e67..80766bc 100644 --- a/src/hci/mucurses/print.c +++ b/src/hci/mucurses/print.c @@ -1,6 +1,7 @@ #include <curses.h> -#include <vsprintf.h> +#include <stdio.h> #include <stddef.h> +#include <vsprintf.h> #include "mucurses.h" /** @file diff --git a/src/hci/shell.c b/src/hci/shell.c index 95662b5..b14af54 100644 --- a/src/hci/shell.c +++ b/src/hci/shell.c @@ -18,7 +18,7 @@ #include <stdint.h> #include <stdlib.h> -#include <vsprintf.h> +#include <stdio.h> #include <readline/readline.h> #include <gpxe/command.h> #include <gpxe/shell.h> diff --git a/src/hci/strerror.c b/src/hci/strerror.c index e407d30..56b07e8 100644 --- a/src/hci/strerror.c +++ b/src/hci/strerror.c @@ -1,6 +1,6 @@ #include <errno.h> #include <string.h> -#include <vsprintf.h> +#include <stdio.h> #include <gpxe/errortab.h> /** @file diff --git a/src/include/console.h b/src/include/console.h index f38d4ec..b1fe955 100644 --- a/src/include/console.h +++ b/src/include/console.h @@ -1,8 +1,6 @@ #ifndef CONSOLE_H #define CONSOLE_H -#include "stdint.h" -#include "vsprintf.h" #include <gpxe/tables.h> /** @file diff --git a/src/net/aoe.c b/src/net/aoe.c index 1c3cd1d..58579e2 100644 --- a/src/net/aoe.c +++ b/src/net/aoe.c @@ -18,7 +18,7 @@ #include <stddef.h> #include <string.h> -#include <vsprintf.h> +#include <stdio.h> #include <errno.h> #include <assert.h> #include <byteswap.h> diff --git a/src/net/dhcpopts.c b/src/net/dhcpopts.c index 3013b66..b2a2266 100644 --- a/src/net/dhcpopts.c +++ b/src/net/dhcpopts.c @@ -18,11 +18,11 @@ #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <byteswap.h> #include <errno.h> #include <string.h> #include <assert.h> -#include <vsprintf.h> #include <gpxe/list.h> #include <gpxe/in.h> #include <gpxe/dhcp.h> diff --git a/src/net/ethernet.c b/src/net/ethernet.c index 690b221..cee67d4 100644 --- a/src/net/ethernet.c +++ b/src/net/ethernet.c @@ -17,11 +17,11 @@ */ #include <stdint.h> +#include <stdio.h> #include <string.h> #include <byteswap.h> #include <errno.h> #include <assert.h> -#include <vsprintf.h> #include <gpxe/if_arp.h> #include <gpxe/if_ether.h> #include <gpxe/netdevice.h> diff --git a/src/net/ipv4.c b/src/net/ipv4.c index 065bf61..8bbcff1 100644 --- a/src/net/ipv4.c +++ b/src/net/ipv4.c @@ -1,9 +1,9 @@ #include <string.h> #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <errno.h> #include <byteswap.h> -#include <vsprintf.h> #include <gpxe/list.h> #include <gpxe/in.h> #include <gpxe/arp.h> diff --git a/src/net/ipv6.c b/src/net/ipv6.c index 26c43dd..458a937 100644 --- a/src/net/ipv6.c +++ b/src/net/ipv6.c @@ -2,7 +2,7 @@ #include <stdint.h> #include <string.h> #include <stdlib.h> -#include <vsprintf.h> +#include <stdio.h> #include <byteswap.h> #include <gpxe/in.h> #include <gpxe/ip6.h> diff --git a/src/net/netdevice.c b/src/net/netdevice.c index c508591..af2bbf5 100644 --- a/src/net/netdevice.c +++ b/src/net/netdevice.c @@ -18,10 +18,10 @@ #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <byteswap.h> #include <string.h> #include <errno.h> -#include <vsprintf.h> #include <gpxe/if_ether.h> #include <gpxe/pkbuff.h> #include <gpxe/tables.h> diff --git a/src/net/tcp.c b/src/net/tcp.c index 2311881..2c2f0b3 100644 --- a/src/net/tcp.c +++ b/src/net/tcp.c @@ -1,10 +1,10 @@ #include <string.h> #include <stdlib.h> +#include <stdio.h> #include <assert.h> #include <errno.h> #include <byteswap.h> #include <timer.h> -#include <vsprintf.h> #include <gpxe/pkbuff.h> #include <gpxe/malloc.h> #include <gpxe/retry.h> diff --git a/src/net/tcp/ftp.c b/src/net/tcp/ftp.c index 7d10d85..7856788 100644 --- a/src/net/tcp/ftp.c +++ b/src/net/tcp/ftp.c @@ -1,7 +1,7 @@ #include <stddef.h> #include <stdlib.h> +#include <stdio.h> #include <string.h> -#include <vsprintf.h> #include <assert.h> #include <errno.h> #include <gpxe/async.h> diff --git a/src/net/tcp/http.c b/src/net/tcp/http.c index 87f6eee..3293244 100644 --- a/src/net/tcp/http.c +++ b/src/net/tcp/http.c @@ -25,12 +25,12 @@ #include <stddef.h> #include <stdlib.h> +#include <stdio.h> #include <string.h> #include <strings.h> #include <byteswap.h> #include <errno.h> #include <assert.h> -#include <vsprintf.h> #include <gpxe/async.h> #include <gpxe/uri.h> #include <gpxe/buffer.h> diff --git a/src/net/tcp/iscsi.c b/src/net/tcp/iscsi.c index 09edf69..4d95c0b 100644 --- a/src/net/tcp/iscsi.c +++ b/src/net/tcp/iscsi.c @@ -19,7 +19,7 @@ #include <stddef.h> #include <string.h> #include <stdlib.h> -#include <vsprintf.h> +#include <stdio.h> #include <errno.h> #include <assert.h> #include <byteswap.h> diff --git a/src/net/udp/tftp.c b/src/net/udp/tftp.c index 992b82b..b07c150 100644 --- a/src/net/udp/tftp.c +++ b/src/net/udp/tftp.c @@ -18,12 +18,12 @@ #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <string.h> #include <strings.h> #include <byteswap.h> #include <errno.h> #include <assert.h> -#include <vsprintf.h> #include <gpxe/async.h> #include <gpxe/tftp.h> #include <gpxe/uri.h> diff --git a/src/tests/aoeboot.c b/src/tests/aoeboot.c index 0fa9ba8..17fda2c 100644 --- a/src/tests/aoeboot.c +++ b/src/tests/aoeboot.c @@ -1,7 +1,7 @@ #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <errno.h> -#include <vsprintf.h> #include <console.h> #include <gpxe/netdevice.h> #include <gpxe/aoe.h> diff --git a/src/tests/dhcptest.c b/src/tests/dhcptest.c index f35a347..7e4bedb 100644 --- a/src/tests/dhcptest.c +++ b/src/tests/dhcptest.c @@ -1,7 +1,7 @@ #include <string.h> #include <stdlib.h> +#include <stdio.h> #include <errno.h> -#include <vsprintf.h> #include <byteswap.h> #include <gpxe/ip.h> #include <gpxe/dhcp.h> diff --git a/src/tests/iscsiboot.c b/src/tests/iscsiboot.c index ce84785..bb20a5f 100644 --- a/src/tests/iscsiboot.c +++ b/src/tests/iscsiboot.c @@ -1,7 +1,7 @@ #include <stdint.h> #include <string.h> +#include <stdio.h> #include <byteswap.h> -#include <vsprintf.h> #include <gpxe/netdevice.h> #include <gpxe/iscsi.h> #include <gpxe/ibft.h> diff --git a/src/tests/linebuf_test.c b/src/tests/linebuf_test.c index 31ce808..8ba88c5 100644 --- a/src/tests/linebuf_test.c +++ b/src/tests/linebuf_test.c @@ -1,6 +1,6 @@ #include <stdint.h> #include <string.h> -#include <vsprintf.h> +#include <stdio.h> #include <gpxe/linebuf.h> static const char data1[] = diff --git a/src/tests/umalloc_test.c b/src/tests/umalloc_test.c index 910edfe..7a36186 100644 --- a/src/tests/umalloc_test.c +++ b/src/tests/umalloc_test.c @@ -1,4 +1,4 @@ -#include <vsprintf.h> +#include <stdio.h> #include <gpxe/uaccess.h> #include <gpxe/umalloc.h> #include <gpxe/memmap.h> diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c index ebafde7..0e606ef 100644 --- a/src/usr/autoboot.c +++ b/src/usr/autoboot.c @@ -17,8 +17,8 @@ */ #include <string.h> +#include <stdio.h> #include <errno.h> -#include <vsprintf.h> #include <gpxe/netdevice.h> #include <gpxe/dhcp.h> #include <gpxe/image.h> diff --git a/src/usr/dhcpmgmt.c b/src/usr/dhcpmgmt.c index 42a0f2b..060dd67 100644 --- a/src/usr/dhcpmgmt.c +++ b/src/usr/dhcpmgmt.c @@ -17,8 +17,8 @@ */ #include <string.h> +#include <stdio.h> #include <byteswap.h> -#include <vsprintf.h> #include <gpxe/in.h> #include <gpxe/ip.h> #include <gpxe/dhcp.h> diff --git a/src/usr/ifmgmt.c b/src/usr/ifmgmt.c index 7b9d847..ff5b34a 100644 --- a/src/usr/ifmgmt.c +++ b/src/usr/ifmgmt.c @@ -17,7 +17,7 @@ */ #include <string.h> -#include <vsprintf.h> +#include <stdio.h> #include <gpxe/netdevice.h> #include <gpxe/device.h> #include <usr/ifmgmt.h> diff --git a/src/usr/imgmgmt.c b/src/usr/imgmgmt.c index 06ae872..0d2c9cb 100644 --- a/src/usr/imgmgmt.c +++ b/src/usr/imgmgmt.c @@ -18,8 +18,8 @@ #include <stdint.h> #include <stdlib.h> +#include <stdio.h> #include <errno.h> -#include <vsprintf.h> #include <gpxe/image.h> #include <gpxe/umalloc.h> #include <gpxe/download.h> diff --git a/src/usr/route.c b/src/usr/route.c index b7f02f5..f3a49f4 100644 --- a/src/usr/route.c +++ b/src/usr/route.c @@ -16,7 +16,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <vsprintf.h> +#include <stdio.h> #include <gpxe/netdevice.h> #include <gpxe/ip.h> #include <usr/route.h> |