summaryrefslogtreecommitdiff
path: root/net/tftp.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-02-17 00:00:53 -0500
committerWolfgang Denk <wd@denx.de>2009-03-20 22:39:09 +0100
commitb6446b67758ea1e41223f0782924bb73fd0a89d0 (patch)
tree6d96ce0bb34d3be4f09de423721095c1c6b8b1aa /net/tftp.c
parent6c6166f52983dac775e3852f9d0f49d033f27108 (diff)
downloadu-boot-imx-b6446b67758ea1e41223f0782924bb73fd0a89d0.zip
u-boot-imx-b6446b67758ea1e41223f0782924bb73fd0a89d0.tar.gz
u-boot-imx-b6446b67758ea1e41223f0782924bb73fd0a89d0.tar.bz2
convert print_IPaddr() to %pI4
Now that our printf functions support the %pI4 modifier like the kernel, let's drop the inflexible print_IPaddr() function and covert over to the %pI4 modifier. Signed-off-by: Mike Frysinger <vapier@gentoo.org> CC: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'net/tftp.c')
-rw-r--r--net/tftp.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/net/tftp.c b/net/tftp.c
index 3dac3d8..b0f1cca 100644
--- a/net/tftp.c
+++ b/net/tftp.c
@@ -508,18 +508,16 @@ TftpStart (void)
#if defined(CONFIG_NET_MULTI)
printf ("Using %s device\n", eth_get_name());
#endif
- puts ("TFTP from server "); print_IPaddr (TftpServerIP);
- puts ("; our IP address is "); print_IPaddr (NetOurIP);
+ printf("TFTP from server %pI4"
+ "; our IP address is %pI4", &TftpServerIP, &NetOurIP);
/* Check if we need to send across this subnet */
if (NetOurGatewayIP && NetOurSubnetMask) {
IPaddr_t OurNet = NetOurIP & NetOurSubnetMask;
IPaddr_t ServerNet = TftpServerIP & NetOurSubnetMask;
- if (OurNet != ServerNet) {
- puts ("; sending through gateway ");
- print_IPaddr (NetOurGatewayIP) ;
- }
+ if (OurNet != ServerNet)
+ printf("; sending through gateway %pI4", &NetOurGatewayIP);
}
putc ('\n');