whitespace fixes. no code changes

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 83ad8cd00de85ff719d974a52f57d0fd2a57abe7..7fddefef5974b0f3e6957b17a1637b2b2890d95b 100644 (file)
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -169,12 +169,12 @@ enum {
 #endif
 #define current_time_t (G.current_time_t)
 /* memset: we have to zero it out because of NOEXEC */
-#define INIT_G() { \
+#define INIT_G() do { \
        memset(&G, 0, sizeof(G)); \
        USE_FEATURE_AUTOWIDTH(tabstops = COLUMN_GAP;) \
        USE_FEATURE_AUTOWIDTH(terminal_width = TERMINAL_WIDTH;) \
        USE_FEATURE_LS_TIMESTAMPS(time(&current_time_t);) \
-}
+} while (0)
 
 
 #if ENABLE_FEATURE_ASSUME_UNICODE

diff --git a/coreutils/stty.c b/coreutils/stty.c
index a17955a6a3bacb8e176f01271f8323efbe309fbb..c9f11a8dab3e51ab975789cb362938609cafcba3 100644 (file)
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -627,11 +627,10 @@ struct globals {
        char buf[10];
 };
 #define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() \
-       do { \
-               G.device_name = bb_msg_standard_input; \
-               G.max_col = 80; \
-       } while (0)
+#define INIT_G() do { \
+       G.device_name = bb_msg_standard_input; \
+       G.max_col = 80; \
+} while (0)
 
 
 /* Return a string that is the printable representation of character CH */

diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 6d7e61b42a8a98d1ea7b4c70f34563e6bab94f72..86ec710167d37dc1f62f47c7d0feb0a70b183c22 100644 (file)
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -105,11 +105,10 @@ struct globals {
 #define pidfile           (G.pidfile             )
 #define user_id           (G.user_id             )
 #define signal_nr         (G.signal_nr           )
-#define INIT_G() \
-        do { \
-               user_id = -1; \
-               signal_nr = 15; \
-        } while (0)
+#define INIT_G() do { \
+       user_id = -1; \
+       signal_nr = 15; \
+} while (0)
 
 #ifdef OLDER_VERSION_OF_X
 /* -x,--exec EXECUTABLE

diff --git a/findutils/grep.c b/findutils/grep.c
index fc7893860d1ca22b473df1ca11e13998b977d05c..9792ce479817108bacdd19e0b34cd7e0439d35bd 100644 (file)
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -103,12 +103,11 @@ struct globals {
        const char *cur_file;    /* the current file we are reading */
 };
 #define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() \
-       do { \
-               struct G_sizecheck { \
-                       char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
-               }; \
-       } while (0)
+#define INIT_G() do { \
+       struct G_sizecheck { \
+               char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
+       }; \
+} while (0)
 #define max_matches       (G.max_matches         )
 #define reflags           (G.reflags             )
 #define invert_search     (G.invert_search       )

diff --git a/miscutils/dc.c b/miscutils/dc.c
index 193929c8e48fa3fcddb208bba3cb0ed050208eb6..bd93ef68bc96e21f6ab0207bf1d67169da730e2a 100644 (file)
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -19,8 +19,7 @@ enum { STACK_SIZE = (COMMON_BUFSIZE - offsetof(struct globals, stack)) / sizeof(
 #define pointer   (G.pointer   )
 #define base      (G.base      )
 #define stack     (G.stack     )
-#define INIT_G() do { \
-} while (0)
+#define INIT_G() do { } while (0)
 
 
 static void push(double a)

diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 626cefb2823cd717bb615994ace048f997ccc9e6..07350b0cc0355cec5349923749f6e5c20593e449 100644 (file)
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -50,10 +50,9 @@ struct globals {
        struct fb_fix_screeninfo scr_fix;
 };
 #define G (*ptr_to_globals)
-#define INIT_G() \
-       do { \
-               SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
-       } while (0)
+#define INIT_G() do { \
+       SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+} while (0)
 
 
 #if DEBUG

diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 983de6d7bbf8f4002d689f6ff86dea9f28817d39..a5d5b05cd91a6dbb7bd84813749b524956a56fb2 100644 (file)
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -1251,7 +1251,7 @@ static void dump_identity(const struct hd_driveid *id)
                        .masks = { 0x100, 0x001, 0x200, 0x002, 0x400, 0x004 },
                        .labels = "*\0""udma0 \0""*\0""udma1 \0""*\0""udma2 \0",
                };
-                       
+
                printf("\n UDMA modes: ");
                print_flags(&ultra_modes1, id->dma_ultra);
 #ifdef __NEW_HD_DRIVE_ID

diff --git a/modutils/depmod.c b/modutils/depmod.c
index 4998d641d1518ff01dd9f1bfaa70cc53d1191454..fdeb7dcf1861ba4400255aab8d63d25146a0fe9a 100644 (file)
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -174,7 +174,7 @@ int depmod_main(int ATTRIBUTE_UNUSED argc, char **argv)
        /* Fixup the module names in the depends list */
        while (mods) {
                llist_t *deps = NULL, *old_deps = mods->dependencies;
-               
+
                while (old_deps) {
                        dep_lst_t *all = G.lst;
                        char *longname = NULL;
@@ -262,7 +262,7 @@ int depmod_main(int ATTRIBUTE_UNUSED argc, char **argv)
                        char *tmp = strrstr(shortname, ".ko");
 
                        *tmp = '\0';
-               
+
                        while (mods->aliases) {
                                fprintf(filedes, "alias %s %s\n",
                                        (char*)llist_pop(&mods->aliases),

diff --git a/networking/arping.c b/networking/arping.c
index 2db2ff412867b23c4dcf92b7ab37e6f9ec42eee1..0a444f15cef72ffff95b979d87acf27d767c313a 100644 (file)
--- 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 be3d5a673c32429d97bae841f2d89a17e5eb3481..f732d02a47c8a65a041238e156f1f3763cc70a19 100644 (file)
--- 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 fed18696792e34836e18e2bd36c4161ec307c8b3..4c7eadc83be0b7e4a4ebfcd972da28d96a7ce823 100644 (file)
--- 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 6977a0956e8f59a800fd6dc35d198897d380ce23..354442c4ec230357613ac9364dc0895e619adfd0 100644 (file)
--- 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 96dec7e5f7f0ece5657046da413f608fb38e8e6d..02ecb5e9fc87f5f2f28b755ce670f9336716afcc 100644 (file)
--- 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 07a87b8ede02a530c2ec1b5da263a6a884ad1a22..561d1324c40d44beab31a0df1da32695e8fe7077 100644 (file)
--- 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 63e045dfb0bb94d6b5788f8d2e6b8c6dc11c5bea..c61cde9d51226e30838172b47df420a073450f79 100644 (file)
--- 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 c562c1200486ba693d104207ee9c5905af0bf972..3e4561946652249471458fa9792200ba0df27816 100644 (file)
--- 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;

diff --git a/procps/top.c b/procps/top.c
index b861deb66fe9465895eaa25c46ad7fbcb8117f95..0e1b333a1f780a6185d8a80621eaeeea9ac1aa1d 100644 (file)
--- a/procps/top.c
+++ b/procps/top.c
@@ -89,12 +89,11 @@ struct globals {
 enum { LINE_BUF_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line_buf) };
 
 #define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() \
-       do { \
-               struct G_sizecheck { \
-                       char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
-               }; \
-       } while (0)
+#define INIT_G() do { \
+       struct G_sizecheck { \
+               char G_sizecheck[sizeof(G) > COMMON_BUFSIZE ? -1 : 1]; \
+       }; \
+} while (0)
 #define top              (G.top               )
 #define ntop             (G.ntop              )
 #define sort_field       (G.sort_field        )

diff --git a/runit/runsv.c b/runit/runsv.c
index e3b507d255f4620f2321183f29921a04515ea7b9..6981fa774668d864d0439a17686146d956bf9b6e 100644 (file)
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -103,10 +103,9 @@ struct globals {
 #define logpipe      (G.logpipe     )
 #define dir          (G.dir         )
 #define svd          (G.svd         )
-#define INIT_G() \
-       do { \
-               pidchanged = 1; \
-       } while (0)
+#define INIT_G() do { \
+       pidchanged = 1; \
+} while (0)
 
 static void fatal2_cannot(const char *m1, const char *m2)
 {

diff --git a/shell/hush.c b/shell/hush.c
index ace0cdafc78c1d8b8bfdb9a1cc9048e5307790d7..032482c6d9f12d0bda1a70381ea838ed49f772de 100644 (file)
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -1063,7 +1063,7 @@ static int o_save_ptr_helper(o_string *o, int n)
                        /* list[n] points to string_start, make space for 16 more pointers */
                        o->maxlen += 0x10 * sizeof(list[0]);
                        o->data = xrealloc(o->data, o->maxlen + 1);
-                       list = (char**)o->data;
+                       list = (char**)o->data;
                        memmove(list + n + 0x10, list + n, string_len);
                        o->length += 0x10 * sizeof(list[0]);
                } else
@@ -3018,7 +3018,7 @@ static void done_pipe(struct p_context *ctx, pipe_style type)
                /* Create the memory for child, roughly:
                 * ctx->pipe->progs = new struct child_prog;
                 * ctx->pipe->progs[0].family = ctx->pipe;
-                * ctx->child = &ctx->pipe->progs[0];
+                * ctx->child = &ctx->pipe->progs[0];
                 */
                done_command(ctx);
        }

diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index ace246fc43473fbfc2e327e762628b6a3dc92803..1753ce3247a5967f89cd75c43e59deda308900e7 100644 (file)
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -39,10 +39,9 @@ struct globals {
 #define SMrup (G.SMrup)
 #define SMrdn (G.SMrdn)
 #define shbuf (G.shbuf)
-#define INIT_G() \
-       do { \
-               memcpy(SMrup, init_sem, sizeof(init_sem)); \
-       } while (0)
+#define INIT_G() do { \
+       memcpy(SMrup, init_sem, sizeof(init_sem)); \
+} while (0)
 
 static void error_exit(const char *str) ATTRIBUTE_NORETURN;
 static void error_exit(const char *str)

diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 3ebc07661156e94a4d2b705846cfcf6229adabad..dba52417ebd3e77910b1a618f7bab19088fb6e10 100644 (file)
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -244,15 +244,15 @@ static ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n)
        return (size + n-1) / n;
 }
 
-#if ENABLE_FEATURE_MINIX2
-#define INODE_BLOCKS div_roundup(INODES, (version2 ? MINIX2_INODES_PER_BLOCK \
-                                   : MINIX1_INODES_PER_BLOCK))
+#if !ENABLE_FEATURE_MINIX2
+#define INODE_BLOCKS            div_roundup(INODES, MINIX1_INODES_PER_BLOCK)
 #else
-#define INODE_BLOCKS div_roundup(INODES, MINIX1_INODES_PER_BLOCK)
+#define INODE_BLOCKS            div_roundup(INODES, \
+                                (version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK))
 #endif
 
-#define INODE_BUFFER_SIZE (INODE_BLOCKS * BLOCK_SIZE)
-#define NORM_FIRSTZONE    (2 + IMAPS + ZMAPS + INODE_BLOCKS)
+#define INODE_BUFFER_SIZE       (INODE_BLOCKS * BLOCK_SIZE)
+#define NORM_FIRSTZONE          (2 + IMAPS + ZMAPS + INODE_BLOCKS)
 
 /* Before you ask "where they come from?": */
 /* setbit/clrbit are supplied by sys/param.h */

diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 057b9e4ff87f4ffd020c5a1e2033e7a22e4f9ff3..e1edd2073711b5d8b906e059da778f51972d8b34 100644 (file)
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -300,9 +300,9 @@ static void make_device(char *path, int delete)
 
 /* File callback for /sys/ traversal */
 static int fileAction(const char *fileName,
-                      struct stat *statbuf ATTRIBUTE_UNUSED,
-                      void *userData,
-                      int depth ATTRIBUTE_UNUSED)
+               struct stat *statbuf ATTRIBUTE_UNUSED,
+               void *userData,
+               int depth ATTRIBUTE_UNUSED)
 {
        size_t len = strlen(fileName) - 4; /* can't underflow */
        char *scratch = userData;
@@ -320,9 +320,9 @@ static int fileAction(const char *fileName,
 
 /* Directory callback for /sys/ traversal */
 static int dirAction(const char *fileName ATTRIBUTE_UNUSED,
-                      struct stat *statbuf ATTRIBUTE_UNUSED,
-                      void *userData ATTRIBUTE_UNUSED,
-                      int depth)
+               struct stat *statbuf ATTRIBUTE_UNUSED,
+               void *userData ATTRIBUTE_UNUSED,
+               int depth)
 {
        return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE);
 }

diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 60031a5c37ecaddd592d025807b5f4523bc531bd..49b1d4cca42531a0311eef6c15407a86638b8457 100644 (file)
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -149,7 +149,7 @@ static ALWAYS_INLINE unsigned div_roundup(unsigned size, unsigned n)
 #else
 # define SB_ZONES               (version2 ? SB.s_zones : SB.s_nzones)
 # define INODE_BLOCKS           div_roundup(SB_INODES, \
-                                version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK)
+                                (version2 ? MINIX2_INODES_PER_BLOCK : MINIX1_INODES_PER_BLOCK))
 #endif
 
 #define INODE_BUFFER_SIZE       (INODE_BLOCKS * BLOCK_SIZE)