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>

diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index b2d6f8479a7aa1e971fb31f134cfbb77ca20e959..6af57493ae9e2c4ae309260228561ffb7eefef81 100644 (file)
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -26,7 +26,6 @@
  */
 #include <common.h>
 #include <command.h>
-#include <net.h>               /* for print_IPaddr */
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -134,8 +133,8 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 #ifdef CONFIG_HERMES
        print_str ("ethspeed",      strmhz(buf, bd->bi_ethspeed));
 #endif
-       puts ("\nIP addr     = ");      print_IPaddr (bd->bi_ip_addr);
-       printf ("\nbaudrate    = %6ld bps\n", bd->bi_baudrate   );
+       printf ("IP addr     = %pI4\n", &bd->bi_ip_addr);
+       printf ("baudrate    = %6ld bps\n", bd->bi_baudrate   );
        return 0;
 }
 
@@ -156,9 +155,8 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
        }
-       puts ("\nip_addr     = ");
-       print_IPaddr (bd->bi_ip_addr);
-       printf ("\nbaudrate    = %ld bps\n", bd->bi_baudrate);
+       printf ("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf ("baudrate    = %ld bps\n", bd->bi_baudrate);
 
        return 0;
 }
@@ -188,11 +186,10 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
        }
-       puts ("\nip_addr     = ");
-       print_IPaddr (bd->bi_ip_addr);
+       printf ("ip_addr     = %pI4\n", &bd->bi_ip_addr);
 #endif
 
-       printf ("\nbaudrate    = %ld bps\n", bd->bi_baudrate);
+       printf ("baudrate    = %ld bps\n", bd->bi_baudrate);
 
        return 0;
 }
@@ -216,10 +213,9 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
        }
-       puts ("\nip_addr     = ");
-       print_IPaddr (bd->bi_ip_addr);
+       printf ("ip_addr     = %pI4\n", &bd->bi_ip_addr);
 #endif
-       printf ("\nbaudrate    = %ld bps\n", (ulong)bd->bi_baudrate);
+       printf ("baudrate    = %ld bps\n", (ulong)bd->bi_baudrate);
        return 0;
 }
 
@@ -255,10 +251,9 @@ int do_bdinfo(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
        for (i = 0; i < 6; ++i) {
                printf("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
        }
-       puts("\nIP addr                = ");
-       print_IPaddr(bd->bi_ip_addr);
+       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
 #endif
-       printf("\nbaudrate               = %6ld bps\n", bd->bi_baudrate);
+       printf("baudrate               = %6ld bps\n", bd->bi_baudrate);
        return 0;
 }
 
@@ -320,10 +315,9 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        }
 #endif
 
-       puts ("\nip_addr     = ");
-       print_IPaddr (bd->bi_ip_addr);
+       printf ("ip_addr     = %pI4\n", &bd->bi_ip_addr);
 #endif
-       printf ("\nbaudrate    = %ld bps\n", bd->bi_baudrate);
+       printf ("baudrate    = %ld bps\n", bd->bi_baudrate);
 
        return 0;
 }
@@ -354,9 +348,8 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        puts("ethaddr     =");
        for (i = 0; i < 6; ++i)
                printf("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
-       puts("\nip_addr     = ");
-       print_IPaddr(bd->bi_ip_addr);
-       printf("\nbaudrate    = %d bps\n", bd->bi_baudrate);
+       printf("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf("baudrate    = %d bps\n", bd->bi_baudrate);
 
        return 0;
 }
@@ -379,9 +372,8 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
        }
-       puts ("\nip_addr     = ");
-       print_IPaddr (bd->bi_ip_addr);
-       printf ("\nbaudrate    = %d bps\n", bd->bi_baudrate);
+       printf ("ip_addr     = %pI4\n", &bd->bi_ip_addr);
+       printf ("baudrate    = %d bps\n", bd->bi_baudrate);
 
        return 0;
 }
@@ -409,12 +401,10 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        for (i=0; i<6; ++i) {
                printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
        }
-       puts  ( "\n"
-               "ip_addr     = ");
-       print_IPaddr (bd->bi_ip_addr);
+       puts  ( "\n" );
+       printf ("ip_addr     = %pI4\n", &bd->bi_ip_addr);
 #endif
-       printf ("\n"
-               "baudrate    = %d bps\n", bd->bi_baudrate);
+       printf ("baudrate    = %d bps\n", bd->bi_baudrate);
 
        return 0;
 }

diff --git a/include/net.h b/include/net.h
index b192db1938cf2c7ee6e35fad6c62f779fcf94efd..bd061d9e76002970fa04d43fc6cc8d5f5d8c4637 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -408,9 +408,6 @@ extern int  NetSendUDPPacket(uchar *ether, IPaddr_t dest, int dport, int sport, i
 /* Processes a received packet */
 extern void    NetReceive(volatile uchar *, int);
 
-/* Print an IP address on the console */
-extern void    print_IPaddr (IPaddr_t);
-
 /*
  * The following functions are a bit ugly, but necessary to deal with
  * alignment restrictions on ARM.

diff --git a/net/bootp.c b/net/bootp.c
index 83465e41aa9de081c24c0f9c6a51c2c10e5bd14d..d1cbd39c2b032743b9d86338b12012eaa3e881bb 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -271,17 +271,11 @@ static void BootpVendorProcess (u8 * ext, int size)
 
 #ifdef DEBUG_BOOTP_EXT
        puts ("[BOOTP] Received fields: \n");
-       if (NetOurSubnetMask) {
-               puts ("NetOurSubnetMask : ");
-               print_IPaddr (NetOurSubnetMask);
-               putc ('\n');
-       }
+       if (NetOurSubnetMask)
+               printf ("NetOurSubnetMask : %pI4\n", &NetOurSubnetMask);
 
-       if (NetOurGatewayIP) {
-               puts ("NetOurGatewayIP  : ");
-               print_IPaddr (NetOurGatewayIP);
-               putc ('\n');
-       }
+       if (NetOurGatewayIP)
+               printf ("NetOurGatewayIP        : %pI4", &NetOurGatewayIP);
 
        if (NetBootFileSize) {
                printf ("NetBootFileSize : %d\n", NetBootFileSize);
@@ -942,9 +936,7 @@ DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len)
                                DhcpOptionsProcess((u8 *)&bp->bp_vend[4], bp);
                        BootpCopyNetParams(bp); /* Store net params from reply */
                        dhcp_state = BOUND;
-                       puts ("DHCP client bound to address ");
-                       print_IPaddr(NetOurIP);
-                       putc ('\n');
+                       printf ("DHCP client bound to address %pI4\n", &NetOurIP);
 
                        /* Obey the 'autoload' setting */
                        if ((s = getenv("autoload")) != NULL) {

diff --git a/net/net.c b/net/net.c
index a55f4d33f984ce98f5dc1b046b03466974bd18bb..da3f4cddb16c2418e9b74e0d992c586ac7b473a3 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1461,9 +1461,7 @@ NetReceive(volatile uchar * inpkt, int len)
                        case ICMP_REDIRECT:
                                if (icmph->code != ICMP_REDIR_HOST)
                                        return;
-                               puts (" ICMP Host Redirect to ");
-                               print_IPaddr(icmph->un.gateway);
-                               putc(' ');
+                               printf (" ICMP Host Redirect to %pI4 ", &icmph->un.gateway);
                                return;
 #if defined(CONFIG_CMD_PING)
                        case ICMP_ECHO_REPLY:
@@ -1805,15 +1803,6 @@ ushort string_to_VLAN(char *s)
        return htons(id);
 }
 
-void print_IPaddr (IPaddr_t x)
-{
-       char tmp[16];
-
-       ip_to_string (x, tmp);
-
-       puts (tmp);
-}
-
 IPaddr_t getenv_IPaddr (char *var)
 {
        return (string_to_ip(getenv(var)));

diff --git a/net/nfs.c b/net/nfs.c
index f2900149d4980919c94ed864160b78079cee4fbe..01016290283aacfad5d966773ffc50b72c3148f6 100644 (file)
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -741,18 +741,16 @@ NfsStart (void)
        printf ("Using %s device\n", eth_get_name());
 #endif
 
-       puts ("File transfer via NFS from server "); print_IPaddr (NfsServerIP);
-       puts ("; our IP address is ");              print_IPaddr (NetOurIP);
+       printf("File transfer via NFS from server %pI4"
+               "; our IP address is %pI4", &NfsServerIP, &NetOurIP);
 
        /* Check if we need to send across this subnet */
        if (NetOurGatewayIP && NetOurSubnetMask) {
                IPaddr_t OurNet     = NetOurIP    & NetOurSubnetMask;
                IPaddr_t ServerNet  = NetServerIP & NetOurSubnetMask;
 
-               if (OurNet != ServerNet) {
-                       puts ("; sending through gateway ");
-                       print_IPaddr (NetOurGatewayIP) ;
-               }
+               if (OurNet != ServerNet)
+                       printf("; sending through gateway %pI4", &NetOurGatewayIP);
        }
        printf ("\nFilename '%s/%s'.", nfs_path, nfs_filename);
 

diff --git a/net/tftp.c b/net/tftp.c
index 3dac3d8531b0580156fc6ec938f8c4eae9257e1f..b0f1cca0b6baebf184bfc3b3597a2ae44a3102c5 100644 (file)
--- 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');