8 files changed, 14 insertions, 19 deletions

diff --git a/networking/arping.c b/networking/arping.c
index 2db2ff412..0a444f15c 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -61,10 +61,9 @@ struct globals {
 #define received   (G.received  )
 #define brd_recv   (G.brd_recv  )
 #define req_recv   (G.req_recv  )
-#define INIT_G() \
-        do { \
-                count = -1; \
-        } while (0)
+#define INIT_G() do { \
+        count = -1; \
+} while (0)
 
 // If GNUisms are not available...
 //static void *mempcpy(void *_dst, const void *_src, int n)
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index be3d5a673..f732d02a4 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -27,7 +27,7 @@ struct globals {
 #define G (*(struct globals*)&bb_common_bufsiz1)
 enum { BUFSZ = COMMON_BUFSIZE - offsetof(struct globals, buf) };
 struct BUG_G_too_big {
-        char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
+        char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
 };
 #define user           (G.user          )
 #define password       (G.password      )
@@ -36,8 +36,7 @@ struct BUG_G_too_big {
 #define verbose_flag   (G.verbose_flag  )
 #define do_continue    (G.do_continue   )
 #define buf            (G.buf           )
-#define INIT_G() do { \
-} while (0)
+#define INIT_G() do { } while (0)
 
 
 static void ftp_die(const char *msg) ATTRIBUTE_NORETURN;
diff --git a/networking/ifenslave.c b/networking/ifenslave.c
index fed186967..4c7eadc83 100644
--- a/networking/ifenslave.c
+++ b/networking/ifenslave.c
@@ -147,7 +147,7 @@ static int ioctl_on_skfd(unsigned request, struct ifreq *ifr)
 
 static int set_ifrname_and_do_ioctl(unsigned request, struct ifreq *ifr, const char *ifname)
 {
-        strncpy_IFNAMSIZ(ifr->ifr_name, ifname);
+        strncpy_IFNAMSIZ(ifr->ifr_name, ifname);
         return ioctl_on_skfd(request, ifr);
 }
 
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 6977a0956..354442c4e 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -582,7 +582,7 @@ static int iproute_list_or_flush(char **argv, int flush)
                                 if (rtnl_rttable_a2n(&tid, *argv))
                                         invarg(*argv, "table");
                                 filter.tb = tid;
-#else                           
+#else
                                 invarg(*argv, "table");
 #endif
                         }
diff --git a/networking/slattach.c b/networking/slattach.c
index 96dec7e5f..02ecb5e9f 100644
--- a/networking/slattach.c
+++ b/networking/slattach.c
@@ -25,7 +25,7 @@ struct globals {
 #define handle       (G.handle      )
 #define saved_disc   (G.saved_disc  )
 #define saved_state  (G.saved_state )
-#define INIT_G() do {} while (0)
+#define INIT_G() do { } while (0)
 
 
 /*
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 07a87b8ed..561d1324c 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -59,11 +59,10 @@ struct globals {
 #define cmax         (G.cmax        )
 #define env_cur      (G.env_cur     )
 #define env_var      (G.env_var     )
-#define INIT_G() \
-        do { \
-                cmax = 30; \
-                env_cur = &env_var[0]; \
-        } while (0)
+#define INIT_G() do { \
+        cmax = 30; \
+        env_cur = &env_var[0]; \
+} while (0)
 
 
 /* We have to be careful about leaking memory in repeated setenv's */
diff --git a/networking/tftp.c b/networking/tftp.c
index 63e045dfb..c61cde9d5 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -92,9 +92,7 @@ struct globals {
 #define block_buf        (G.block_buf   )
 #define user_opt         (G.user_opt    )
 #define error_pkt        (G.error_pkt   )
-#define INIT_G() \
-        do { \
-        } while (0)
+#define INIT_G() do { } while (0)
 
 #define error_pkt_reason (error_pkt[3])
 #define error_pkt_str    (error_pkt + 4)
diff --git a/networking/udhcp/clientpacket.c b/networking/udhcp/clientpacket.c
index c562c1200..3e4561946 100644
--- a/networking/udhcp/clientpacket.c
+++ b/networking/udhcp/clientpacket.c
@@ -64,7 +64,7 @@ static void add_param_req_option(struct dhcpMessage *packet)
 
         for (i = 0; (c = dhcp_options[i].code) != 0; i++) {
                 if (((dhcp_options[i].flags & OPTION_REQ)
-                     && !client_config.no_default_options)
+                     && !client_config.no_default_options)
                  || (client_config.opt_mask[c >> 3] & (1 << (c & 7)))
                 ) {
                         packet->options[end + OPT_DATA + len] = c;