diff options
| author | Sascha Hauer <sha@pengutronix.de> | 2009-10-17 09:10:09 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@pengutronix.de> | 2009-10-17 09:10:09 +0200 |
| commit | fdc9bd236ef09c603a7937cadfc018bc8439a98b (patch) | |
| tree | d59c8d132f732a7e6d0231a06dfa09addc238a19 /net | |
| parent | 3830d35bc61d091ae3d55fde978d4f5b017b5586 (diff) | |
| download | barebox-fdc9bd236ef09c603a7937cadfc018bc8439a98b.tar.gz barebox-fdc9bd236ef09c603a7937cadfc018bc8439a98b.tar.xz | |
tftp: consolidate different puts to printf
Signed-off-by: Sascha Hauer <sha@pengutronix.de>
Diffstat (limited to 'net')
| -rw-r--r-- | net/tftp.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/net/tftp.c b/net/tftp.c index 810a6d0346..72a31d9892 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -280,19 +280,18 @@ TftpTimeout (void) void TftpStart (void) { + char ip1[16], ip2[16]; #ifdef CONFIG_TFTP_PORT char *ep; /* Environment pointer */ #endif tftp_filename = BootFile; - puts ("TFTP from server "); print_IPaddr (NetServerIP); - puts ("; our IP address is "); print_IPaddr (NetOurIP); - putchar('\n'); - - printf ("Filename '%s'.", tftp_filename); - - puts ("\nLoading: *\b"); + printf("TFTP from server %s; our IP address is %s\n" + "\nFilename '%s'.\nLoading: *\b", + ip_to_string(NetServerIP, ip1), + ip_to_string(NetOurIP, ip2), + tftp_filename); NetSetTimeout (TIMEOUT * SECOND, TftpTimeout); NetSetHandler (TftpHandler); |