diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-10-28 18:57:19 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-10-28 18:57:19 +0200 |
commit | e4dcba1c103dc28e927e004791e331aaf604383d (patch) | |
tree | a18094ecc54fcea2cb523a802e0c414c3e6f85bf /libbb | |
parent | 776509544123c68bbc128c0fdb2f699062d294cf (diff) | |
download | busybox-e4dcba1c103dc28e927e004791e331aaf604383d.tar.gz |
*: whitespace fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/dump.c | 6 | ||||
-rw-r--r-- | libbb/full_write.c | 2 | ||||
-rw-r--r-- | libbb/human_readable.c | 4 | ||||
-rw-r--r-- | libbb/inet_common.c | 2 | ||||
-rw-r--r-- | libbb/inode_hash.c | 4 | ||||
-rw-r--r-- | libbb/login.c | 2 | ||||
-rw-r--r-- | libbb/make_directory.c | 2 | ||||
-rw-r--r-- | libbb/parse_config.c | 2 | ||||
-rw-r--r-- | libbb/parse_mode.c | 10 | ||||
-rw-r--r-- | libbb/progress.c | 6 | ||||
-rw-r--r-- | libbb/speed_table.c | 4 | ||||
-rw-r--r-- | libbb/update_passwd.c | 2 | ||||
-rw-r--r-- | libbb/wfopen_input.c | 4 | ||||
-rw-r--r-- | libbb/xatonum_template.c | 2 | ||||
-rw-r--r-- | libbb/xgetcwd.c | 2 |
15 files changed, 27 insertions, 27 deletions
diff --git a/libbb/dump.c b/libbb/dump.c index 4db3f06f0..1b1d03a66 100644 --- a/libbb/dump.c +++ b/libbb/dump.c @@ -4,7 +4,7 @@ * based on code from util-linux v 2.11l * * Copyright (c) 1989 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * * Licensed under GPLv2 or later, see file LICENSE in this source tree. * @@ -208,7 +208,7 @@ static NOINLINE void rewrite(priv_dumper_t *dumper, FS *fs) pr->bcnt = fu->bcnt; } else if (sokay == USEPREC) { pr->bcnt = prec; - } else { /* NOTOKAY */ + } else { /* NOTOKAY */ bb_error_msg_and_die("%%s requires a precision or a byte count"); } } else if (*p1 == '_') { @@ -467,7 +467,7 @@ static void bpad(PR *pr) static const char conv_str[] ALIGN1 = "\0\\0\0" - "\007\\a\0" /* \a */ + "\007\\a\0" /* \a */ "\b\\b\0" "\f\\b\0" "\n\\n\0" diff --git a/libbb/full_write.c b/libbb/full_write.c index a2abaee25..777fbd910 100644 --- a/libbb/full_write.c +++ b/libbb/full_write.c @@ -30,7 +30,7 @@ ssize_t FAST_FUNC full_write(int fd, const void *buf, size_t len) /* user can do another write to know the error code */ return total; } - return cc; /* write() returns -1 on failure. */ + return cc; /* write() returns -1 on failure. */ } total += cc; diff --git a/libbb/human_readable.c b/libbb/human_readable.c index 50cbe41bb..8b22b0cb5 100644 --- a/libbb/human_readable.c +++ b/libbb/human_readable.c @@ -53,8 +53,8 @@ const char* FAST_FUNC make_human_readable_str(unsigned long long val, u = unit_chars; if (display_unit) { - val += display_unit/2; /* Deal with rounding */ - val /= display_unit; /* Don't combine with the line above! */ + val += display_unit/2; /* Deal with rounding */ + val /= display_unit; /* Don't combine with the line above! */ /* will just print it as ulonglong (below) */ } else { while ((val >= 1024) diff --git a/libbb/inet_common.c b/libbb/inet_common.c index e031ddf9b..6f585ebd9 100644 --- a/libbb/inet_common.c +++ b/libbb/inet_common.c @@ -218,4 +218,4 @@ char* FAST_FUNC INET6_rresolve(struct sockaddr_in6 *sin6, int numeric) return xstrdup(name); } -#endif /* CONFIG_FEATURE_IPV6 */ +#endif /* CONFIG_FEATURE_IPV6 */ diff --git a/libbb/inode_hash.c b/libbb/inode_hash.c index 2aea08b04..715535ef5 100644 --- a/libbb/inode_hash.c +++ b/libbb/inode_hash.c @@ -17,8 +17,8 @@ typedef struct ino_dev_hash_bucket_struct { char name[1]; } ino_dev_hashtable_bucket_t; -#define HASH_SIZE 311 /* Should be prime */ -#define hash_inode(i) ((i) % HASH_SIZE) +#define HASH_SIZE 311 /* Should be prime */ +#define hash_inode(i) ((i) % HASH_SIZE) /* array of [HASH_SIZE] elements */ static ino_dev_hashtable_bucket_t **ino_dev_hashtable; diff --git a/libbb/login.c b/libbb/login.c index aa2e17164..8a82c6add 100644 --- a/libbb/login.c +++ b/libbb/login.c @@ -30,7 +30,7 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty) time(&t); uname(&uts); - puts("\r"); /* start a new line */ + puts("\r"); /* start a new line */ fp = fopen_for_read(issue_file); if (!fp) diff --git a/libbb/make_directory.c b/libbb/make_directory.c index 1350e8bd9..72303e7a3 100644 --- a/libbb/make_directory.c +++ b/libbb/make_directory.c @@ -44,7 +44,7 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags) while (1) { c = '\0'; - if (flags & FILEUTILS_RECUR) { /* Get the parent */ + if (flags & FILEUTILS_RECUR) { /* Get the parent */ /* Bypass leading non-'/'s and then subsequent '/'s */ while (*s) { if (*s == '/') { diff --git a/libbb/parse_config.c b/libbb/parse_config.c index 9dbfaf5d7..d471edbee 100644 --- a/libbb/parse_config.c +++ b/libbb/parse_config.c @@ -45,7 +45,7 @@ int parse_main(int argc UNUSED_PARAM, char **argv) Typical usage: ----- CUT ----- - char *t[3]; // tokens placeholder + char *t[3]; // tokens placeholder parser_t *p = config_open(filename); if (p) { // parse line-by-line diff --git a/libbb/parse_mode.c b/libbb/parse_mode.c index 8ea89163c..5a4e1c579 100644 --- a/libbb/parse_mode.c +++ b/libbb/parse_mode.c @@ -57,8 +57,8 @@ int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode) /* Note: we allow empty clauses, and hence empty modes. * We treat an empty mode as no change to perms. */ - while (*s) { /* Process clauses. */ - if (*s == ',') { /* We allow empty clauses. */ + while (*s) { /* Process clauses. */ + if (*s == ',') { /* We allow empty clauses. */ ++s; continue; } @@ -77,7 +77,7 @@ int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode) } } while (*++p); - do { /* Process action list. */ + do { /* Process action list. */ if ((*s != '+') && (*s != '-')) { if (*s != '=') { return 0; @@ -93,7 +93,7 @@ int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode) op = *s++; /* Check for permcopy. */ - p = who_chars + 1; /* Skip 'a' entry. */ + p = who_chars + 1; /* Skip 'a' entry. */ do { if (*p == *s) { int i = 0; @@ -128,7 +128,7 @@ int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode) } } while (*++p); GOT_ACTION: - if (permlist) { /* The permlist was nonempty. */ + if (permlist) { /* The permlist was nonempty. */ mode_t tmp = wholist; if (!wholist) { mode_t u_mask = umask(0); diff --git a/libbb/progress.c b/libbb/progress.c index f53271398..4c2763c53 100644 --- a/libbb/progress.c +++ b/libbb/progress.c @@ -7,7 +7,7 @@ */ /*- * Copyright (c) 1992, 1993 - * The Regents of the University of California. All rights reserved. + * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -18,8 +18,8 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change - * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change> + * 3. BSD Advertising Clause omitted per the July 22, 1999 licensing change + * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change * * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software diff --git a/libbb/speed_table.c b/libbb/speed_table.c index 6f95c54e6..45159f1f3 100644 --- a/libbb/speed_table.c +++ b/libbb/speed_table.c @@ -29,12 +29,12 @@ static const struct speed_map speeds[] = { {B2400, 2400}, {B4800, 4800}, {B9600, 9600}, -#ifdef B19200 +#ifdef B19200 {B19200, 19200}, #elif defined(EXTA) {EXTA, 19200}, #endif -#ifdef B38400 +#ifdef B38400 {B38400, 38400/256 + 0x8000U}, #elif defined(EXTB) {EXTB, 38400/256 + 0x8000U}, diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c index a2be0f155..dc5029223 100644 --- a/libbb/update_passwd.c +++ b/libbb/update_passwd.c @@ -22,7 +22,7 @@ static void check_selinux_update_passwd(const char *username) char *seuser; if (getuid() != (uid_t)0 || is_selinux_enabled() == 0) - return; /* No need to check */ + return; /* No need to check */ if (getprevcon_raw(&context) < 0) bb_perror_msg_and_die("getprevcon failed"); diff --git a/libbb/wfopen_input.c b/libbb/wfopen_input.c index 422a58ecf..d8b1c4a36 100644 --- a/libbb/wfopen_input.c +++ b/libbb/wfopen_input.c @@ -31,7 +31,7 @@ FILE* FAST_FUNC xfopen_stdin(const char *filename) FILE *fp = fopen_or_warn_stdin(filename); if (fp) return fp; - xfunc_die(); /* We already output an error message. */ + xfunc_die(); /* We already output an error message. */ } int FAST_FUNC open_or_warn_stdin(const char *filename) @@ -52,5 +52,5 @@ int FAST_FUNC xopen_stdin(const char *filename) int fd = open_or_warn_stdin(filename); if (fd >= 0) return fd; - xfunc_die(); /* We already output an error message. */ + xfunc_die(); /* We already output an error message. */ } diff --git a/libbb/xatonum_template.c b/libbb/xatonum_template.c index f67b50710..029f66202 100644 --- a/libbb/xatonum_template.c +++ b/libbb/xatonum_template.c @@ -41,7 +41,7 @@ unsigned type FAST_FUNC xstrtou(_range_sfx)(const char *numstr, int base, if (errno || numstr == e) goto inval; /* error / no digits / illegal trailing chars */ - errno = old_errno; /* Ok. So restore errno. */ + errno = old_errno; /* Ok. So restore errno. */ /* Do optional suffix parsing. Allow 'empty' suffix tables. * Note that we also allow nul suffixes with associated multipliers, diff --git a/libbb/xgetcwd.c b/libbb/xgetcwd.c index 97367217e..71720d323 100644 --- a/libbb/xgetcwd.c +++ b/libbb/xgetcwd.c @@ -24,7 +24,7 @@ xrealloc_getcwd_or_warn(char *cwd) char *ret; unsigned path_max; - path_max = 128; /* 128 + 64 should be enough for 99% of cases */ + path_max = 128; /* 128 + 64 should be enough for 99% of cases */ while (1) { path_max += PATH_INCR; |