Use stdio.h instead of vsprintf.h

diff --git a/src/arch/i386/core/nulltrap.c b/src/arch/i386/core/nulltrap.c
index bd4b757743602cf6e6ef92bdfa40cfc38bfd17cf..61fe5564c04e723e93735c81f31487e7e0ef0b83 100644 (file)
--- 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 c93ad2476863b44f7045c09c1f509a02ec19378f..648835cffc6eb5b3d2bceb8740316903b5785c4a 100644 (file)
--- 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 8f1ef33395342f3fce613f9bb6f1b793864e7cb1..a1c073e3a58a3254d17a759a08d4a5c360cf1a6b 100644 (file)
--- 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 547aa6940229ee4fbccc4f15c62c389c83a3584f..6de412bb8a3424a68c370cd1440344fe9347c8eb 100644 (file)
--- 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 0ff0a7065858017c56a84187238d5c1d2a23d5f7..5a2ee824ef56f560f801ced4a0610833c7f6dc9a 100644 (file)
--- 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 448080b4fe4706cf6e6a4f17513cdf8bf92adcc0..6dfdd632ad7fec02a22ddcc4b6a55082ce5ec4e5 100644 (file)
--- 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 a1f4044408bbabc812a8cd88232f1f329b74928c..42029fdcde6dfd4cec8381bfb0a4b10c365c8f71 100644 (file)
--- 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 e225d48c2e4c130287d09edb9f329b71ad650cd3..ca22ae886f6bf66dc70887425a1deea57d857e26 100644 (file)
--- 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 56436b7d623b9a510104bf0f8b55f60ac8dceb00..e8f34fba393b6bbaba1af909f8171794c7ced876 100644 (file)
--- 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 73d1d7871d24d78bc5434f66004d0638de6ef93c..1719c82af7b7833ad669cf56a3ea50e2ca1d283b 100644 (file)
--- 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 21097d2ec7dcfd00abe564de23e6395b86e69333..7f4424202abcd6e0fb1915608e00bc8d1b97e41f 100644 (file)
--- 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 ff1fa646a75fc387639563d53c99e3321a2b0b3d..d3b89223a8375c497a4eaf5de4ef4ac6fe9ad919 100644 (file)
--- 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 d7fb2e1fb6291be6af59c9bf38a9a8d5f4cd820f..0e6f2948dc8b50a3d7eefaf370efb6b8e5f2f3d7 100644 (file)
--- 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 a15593913eaa47525a72a662c21e14c4a4c1e668..368a6ca4aee71dbdbe733cf9ef6790b7fa36c678 100644 (file)
--- 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 8cfd428e30aab64be0f0a51ce8276f0a5ab4756c..208f3557879c67af21c5641c1185ff6bf71d3101 100644 (file)
--- 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 dc255e1605e2b559c015dae079ec68f696106ce5..f2508e556cd9e3dbcade0c1f5b350efb225edbc4 100644 (file)
--- 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 900886ff25fd2abe956329c119995c83d3f5a809..98de50e25eb1e8d8cbc5a34edbc16472487d321a 100644 (file)
--- 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 91c132059b114285b6a3a245701b423dc95f29f1..4392787b0f2f5192d0ad03fb8b3f840949fa4aa1 100644 (file)
--- 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 2e9de562ff16657b950c7e1a65fa15623149945b..227682cb44a6e772408fcdc2386a73b50043f60b 100644 (file)
--- 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 4e88b82a7c442cd276c066e524ba21a168b92117..00e959a89038a0ef6009f62d221a18fdff9cd761 100644 (file)
--- 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 fc14e67e01597a40b70e31da1fa2f5aa7915b6ca..80766bc9440eb5c5d3653566e2a586dc5fa756bb 100644 (file)
--- 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 95662b501125453b5e2b05edaff0d5e2a32a11f0..b14af54265ed1d257e91a4bd161641b5152b0e58 100644 (file)
--- 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 e407d30b82078d5633bf7aadc5dc9cb075879f94..56b07e8a926373efbc6b86415fddf2588b6102e5 100644 (file)
--- 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 f38d4ecfc6597ff8d097c892f6258565790c4344..b1fe955b2b6c389dd67e3b04f12157cb9702f2ba 100644 (file)
--- 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 1c3cd1d2bf6d241a1942ebd2649af319dfd5e489..58579e23d7a2ded4db3fa44e7e1e2862abe17420 100644 (file)
--- 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 3013b669b33dbeb88279b810b44eef872fe863e3..b2a2266619953e697bcbc7a47d8f8bf3a08ae13c 100644 (file)
--- 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 690b2218287b635be54ae9d5ef13bd7dc062f70e..cee67d469bb81c18372ff235f6bbe8cb10f89850 100644 (file)
--- 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 065bf61c44c9d8a4d77add92f595886430179957..8bbcff155eff9862c4902a66d10913b5b3df7bd3 100644 (file)
--- 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 26c43dd0b154e15ba965a46cc700a3429fb95f1c..458a937580251eebbc7f20377a4316120b63f316 100644 (file)
--- 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 c5085918fef4d1c04cbaf20d56cbe49a6f882c86..af2bbf586556b253f0340e7ff0222c4f1a4b87d9 100644 (file)
--- 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 2311881bf91938e604b2a63b261cac14c3bbc196..2c2f0b3338d32eac3680f1bebdf9c3748f4244a7 100644 (file)
--- 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 7d10d85502c312927e640f301e1b9e4074070a40..785678842fb6154867f3df33fd79c02a585e2e13 100644 (file)
--- 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 87f6eee2b00d8ea61a783276c934052006353072..329324458a74e272dc3df967bb6e7d8709eff7c0 100644 (file)
--- 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 09edf697d19f2f8b7febb01091f4dac2b78e5e3b..4d95c0b9a8722c5a45090e3780962924384efe25 100644 (file)
--- 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 992b82baec4862b18de19baa4d341edd40c6e1a5..b07c150aac44a5c8f290703cb5078526131f3982 100644 (file)
--- 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 0fa9ba8226197b63de8d35475270bdca70cadc1f..17fda2c66c2ae3f4119c34881e3dbe655364f238 100644 (file)
--- 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 f35a34786034382a6ed2ae164a4c860866120bb4..7e4bedbd4e95b90037d36ef2990b09b8848f65bd 100644 (file)
--- 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 ce847856316f7b3cbb0931224c4bc41b4ee8ea76..bb20a5fa870d45fa93bc9d20a878e87a330b6f4a 100644 (file)
--- 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 31ce808bf02f446bd26974ed82a893f813311785..8ba88c566b13684cbbec14d904d0b9c69a30914d 100644 (file)
--- 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 910edfefcec10b87a7f76c7a16041b1a0e291076..7a3618684c82cff07415999938b1364abfa30ac1 100644 (file)
--- 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 ebafde7ee0b725f6d7da939aab438e9577505402..0e606efbae1afbad0ec4a58fdb60c3d4a566273d 100644 (file)
--- 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 42a0f2b79e84a780cf679e23a03907155042a5f0..060dd67ed30aecbd25032d7bcdd0d58465e170fc 100644 (file)
--- 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 7b9d84704a05af513be8be62f8a1954f20dd7e87..ff5b34a665e78f5c2e6d4e88648b42b5ddbed3bc 100644 (file)
--- 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 06ae872e03413daeb43f14b08a6261e6e4c8851e..0d2c9cb48e7e8c28fac3f8db8c3ac0f98fdf86ba 100644 (file)
--- 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 b7f02f579597cb30f767076f20ba66ca383270b8..f3a49f46b3c243be683e3e1278a1128c0443e083 100644 (file)
--- 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>