zcip: fix unaligned trap on ARM

[oweals/busybox.git] / networking / nc_bloaty.c

diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 0d1071499eb411cf316e19be7714d800264244ec..ab82465310c6914b7b387380304150833006eb5f 100644 (file)
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -278,7 +278,7 @@ static void dolisten(void)
                rr = getsockname(netfd, &ouraddr->sa, &ouraddr->len);
                if (rr < 0)
                        bb_perror_msg_and_die("getsockname after bind");
-               addr = xmalloc_sockaddr2dotted(&ouraddr->sa, ouraddr->len);
+               addr = xmalloc_sockaddr2dotted(&ouraddr->sa);
                fprintf(stderr, "listening on %s ...\n", addr);
                free(addr);
        }
@@ -341,7 +341,7 @@ create new one, and bind() it. TODO */
                                /* nc 1.10 bails out instead, and its error message
                                 * is not suppressed by o_verbose */
                                if (o_verbose) {
-                                       char *remaddr = xmalloc_sockaddr2dotted(&remend.sa, remend.len);
+                                       char *remaddr = xmalloc_sockaddr2dotted(&remend.sa);
                                        bb_error_msg("connect from wrong ip/port %s ignored", remaddr);
                                        free(remaddr);
                                }
@@ -393,9 +393,9 @@ create new one, and bind() it. TODO */
         accept the connection and then reject undesireable ones by closing.
         In other words, we need a TCP MSG_PEEK. */
        /* bbox: removed most of it */
-               lcladdr = xmalloc_sockaddr2dotted(&ouraddr->sa, ouraddr->len);
-               remaddr = xmalloc_sockaddr2dotted(&remend.sa, remend.len);
-               remhostname = o_nflag ? remaddr : xmalloc_sockaddr2host(&remend.sa, remend.len);
+               lcladdr = xmalloc_sockaddr2dotted(&ouraddr->sa);
+               remaddr = xmalloc_sockaddr2dotted(&remend.sa);
+               remhostname = o_nflag ? remaddr : xmalloc_sockaddr2host(&remend.sa);
                fprintf(stderr, "connect to %s from %s (%s)\n",
                                lcladdr, remhostname, remaddr);
                free(lcladdr);
@@ -706,7 +706,7 @@ int nc_main(int argc, char **argv)
 
        // -g -G -t -r deleted, unimplemented -a deleted too
        opt_complementary = "?2:vv"; /* max 2 params, -v is a counter */
-       getopt32(argc, argv, "hnp:s:uvw:" USE_NC_SERVER("l")
+       getopt32(argv, "hnp:s:uvw:" USE_NC_SERVER("l")
                        USE_NC_EXTRA("i:o:z"),
                        &str_p, &str_s, &str_w
                        USE_NC_EXTRA(, &str_i, &str_o, &o_verbose));
@@ -796,7 +796,7 @@ int nc_main(int argc, char **argv)
 
                remend = *themaddr;
                if (o_verbose)
-                       themdotted = xmalloc_sockaddr2dotted(&themaddr->sa, themaddr->len);
+                       themdotted = xmalloc_sockaddr2dotted(&themaddr->sa);
 
                x = connect_w_timeout(netfd);
                if (o_zero && x == 0 && o_udpmode)        /* if UDP scanning... */