From b7c9fb27cba3d697e602f8cbf88cde135d8d6c5e Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 3 Feb 2011 00:05:48 +0100 Subject: [PATCH] whitespace fixes Signed-off-by: Denys Vlasenko --- applets/usage_pod.c | 4 ++-- archival/lzop.c | 2 +- e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c | 4 ++-- editors/sed.c | 2 +- libbb/crc32.c | 2 +- libbb/getopt32.c | 8 ++++---- loginutils/getty.c | 2 +- modutils/modprobe.c | 2 +- networking/httpd_ssi.c | 4 ++-- networking/ntpd.c | 2 +- procps/pstree.c | 2 +- shell/shell_common.c | 6 +++--- util-linux/flock.c | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/applets/usage_pod.c b/applets/usage_pod.c index da0baefc6..0b1c4aadb 100644 --- a/applets/usage_pod.c +++ b/applets/usage_pod.c @@ -31,8 +31,8 @@ #include "usage.h" #define MAKE_USAGE(aname, usage) { aname, usage }, static struct usage_data { - const char *aname; - const char *usage; + const char *aname; + const char *usage; } usage_array[] = { #include "applets.h" }; diff --git a/archival/lzop.c b/archival/lzop.c index 094e78cf9..62455c313 100644 --- a/archival/lzop.c +++ b/archival/lzop.c @@ -401,7 +401,7 @@ struct globals { #define INIT_G() do { } while (0) //#define G (*ptr_to_globals) //#define INIT_G() do { -// SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); +// SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); //} while (0) diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c index b9aab440a..7d37d232d 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/ext2fs_inline.c @@ -155,8 +155,8 @@ int ext2fs_group_of_ino(ext2_filsys fs, ext2_ino_t ino) blk_t ext2fs_inode_data_blocks(ext2_filsys fs, struct ext2_inode *inode) { - return inode->i_blocks - - (inode->i_file_acl ? fs->blocksize >> 9 : 0); + return inode->i_blocks - + (inode->i_file_acl ? fs->blocksize >> 9 : 0); } diff --git a/editors/sed.c b/editors/sed.c index b91acfb7f..d3555243f 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -124,7 +124,7 @@ struct globals { } FIX_ALIASING; #define G (*(struct globals*)&bb_common_bufsiz1) 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 INIT_G() do { \ G.sed_cmd_tail = &G.sed_cmd_head; \ diff --git a/libbb/crc32.c b/libbb/crc32.c index c63bf0772..ac9836cc9 100644 --- a/libbb/crc32.c +++ b/libbb/crc32.c @@ -59,7 +59,7 @@ uint32_t FAST_FUNC crc32_block_endian0(uint32_t val, const void *buf, unsigned l const void *end = (uint8_t*)buf + len; while (buf != end) { - val = crc_table[(uint8_t)val ^ *(uint8_t*)buf] ^ (val >> 8); + val = crc_table[(uint8_t)val ^ *(uint8_t*)buf] ^ (val >> 8); buf = (uint8_t*)buf + 1; } return val; diff --git a/libbb/getopt32.c b/libbb/getopt32.c index abd412043..f3f1cfcba 100644 --- a/libbb/getopt32.c +++ b/libbb/getopt32.c @@ -80,9 +80,9 @@ const char *applet_long_options This struct allows you to define long options: static const char applet_longopts[] ALIGN1 = - //"name\0" has_arg val - "verbose\0" No_argument "v" - ; + //"name\0" has_arg val + "verbose\0" No_argument "v" + ; applet_long_options = applet_longopts; The last member of struct option (val) typically is set to @@ -226,7 +226,7 @@ Special characters: if specified together. In this case you must set opt_complementary = "b--cf:c--bf:f--bc". If two of the mutually exclusive options are found, getopt32 will call - bb_show_usage() and die. + bb_show_usage() and die. "x--x" Variation of the above, it means that -x option should occur at most once. diff --git a/loginutils/getty.c b/loginutils/getty.c index 34f72c465..3f20c8e81 100644 --- a/loginutils/getty.c +++ b/loginutils/getty.c @@ -334,7 +334,7 @@ static void termios_final(void) * IMAXBEL Echo BEL on input line too long * IUTF8 Appears to affect tty's idea of char widths, * observed to improve backspacing through Unicode chars - */ + */ /* line buffered input (NL or EOL or EOF chars end a line); * recognize INT/QUIT/SUSP chars; diff --git a/modutils/modprobe.c b/modutils/modprobe.c index 8d2ccc562..0d28da7ea 100644 --- a/modutils/modprobe.c +++ b/modutils/modprobe.c @@ -170,7 +170,7 @@ struct globals { #define G (*(struct globals*)&bb_common_bufsiz1) #define INIT_G() do { } while (0) 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]; }; diff --git a/networking/httpd_ssi.c b/networking/httpd_ssi.c index 87f43fcfa..cfe64eb46 100644 --- a/networking/httpd_ssi.c +++ b/networking/httpd_ssi.c @@ -52,9 +52,9 @@ httpd_ssi.c -o httpd_ssi static char* skip_whitespace(char *s) { - while (*s == ' ' || *s == '\t') ++s; + while (*s == ' ' || *s == '\t') ++s; - return s; + return s; } static char line[64 * 1024]; diff --git a/networking/ntpd.c b/networking/ntpd.c index 8fe529edb..3ed05ba29 100644 --- a/networking/ntpd.c +++ b/networking/ntpd.c @@ -882,7 +882,7 @@ fit(peer_t *p, double rd) // /* Do we have a loop? */ // if (p->refid == p->dstaddr || p->refid == s.refid) // return 0; - return 1; + return 1; } static peer_t* select_and_cluster(void) diff --git a/procps/pstree.c b/procps/pstree.c index ddf5dba59..4cd8cb458 100644 --- a/procps/pstree.c +++ b/procps/pstree.c @@ -76,7 +76,7 @@ struct globals { }; #define G (*ptr_to_globals) #define INIT_G() do { \ - SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ + SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \ } while (0) diff --git a/shell/shell_common.c b/shell/shell_common.c index e9effd2d0..f02ed81ea 100644 --- a/shell/shell_common.c +++ b/shell/shell_common.c @@ -368,9 +368,9 @@ shell_builtin_ulimit(char **argv) #endif /* optarg = NULL; opterr = 0; optopt = 0; - do we need this?? */ - argc = 1; - while (argv[argc]) - argc++; + argc = 1; + while (argv[argc]) + argc++; opts = 0; while (1) { diff --git a/util-linux/flock.c b/util-linux/flock.c index be3d552fa..77fe1f809 100644 --- a/util-linux/flock.c +++ b/util-linux/flock.c @@ -19,7 +19,7 @@ int flock_main(int argc UNUSED_PARAM, char **argv) }; #if ENABLE_LONG_OPTS - static const char getopt_longopts[] ALIGN1 = + static const char getopt_longopts[] ALIGN1 = "shared\0" No_argument "s" "exclusive\0" No_argument "x" "unlock\0" No_argument "u" -- 2.25.1