whitespace fixes. no code changes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 9e887f2566a72083c67f083f525daf3ce6780284..032506d6da1396c3d8d6e9c21624b35abc701610 100644 (file)
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -229,7 +229,7 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize,
        }
 
        /* Note: after PIO_UNIMAPCLR and before PIO_UNIMAP
-          this printf did not work on many kernels */
+        * this printf did not work on many kernels */
 
        advice.advised_hashsize = 0;
        advice.advised_hashstep = 0;

diff --git a/coreutils/cal.c b/coreutils/cal.c
index 0b2307349fed4587fe66a4b245542256c076d61f..0d388aa1cbe9dbd9a4dc814e24bf43c0d430a081 100644 (file)
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -43,7 +43,7 @@ static const unsigned char days_in_month[] ALIGN1 = {
 };
 
 static const unsigned char sep1752[] ALIGN1 = {
-                1,     2,      14,     15,     16,
+               1,      2,      14,     15,     16,
        17,     18,     19,     20,     21,     22,     23,
        24,     25,     26,     27,     28,     29,     30
 };
@@ -183,7 +183,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
                center(lineout,
                                (WEEK_LEN * 3 + HEAD_SEP * 2)
                                + julian * (J_WEEK_LEN * 2 + HEAD_SEP
-                                                  - (WEEK_LEN * 3 + HEAD_SEP * 2)),
+                                               - (WEEK_LEN * 3 + HEAD_SEP * 2)),
                                0
                );
                puts("\n");             /* two \n's */

diff --git a/coreutils/chown.c b/coreutils/chown.c
index bb166d8fe401f6a707c19ac1d6cdccf1fd0086f8..1a91276221a39afb8c18947a31b93f333ade7f12 100644 (file)
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -126,8 +126,8 @@ int chown_main(int argc UNUSED_PARAM, char **argv)
        /* This matches coreutils behavior (almost - see below) */
        param.chown_func = chown;
        if (OPT_NODEREF
-           /* || (OPT_RECURSE && !OPT_TRAVERSE_TOP): */
-           IF_DESKTOP( || (opt & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE)
+       /* || (OPT_RECURSE && !OPT_TRAVERSE_TOP): */
+       IF_DESKTOP( || (opt & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE)
        ) {
                param.chown_func = lchown;
        }

diff --git a/coreutils/df.c b/coreutils/df.c
index 2c72e82a4134377f234f4d1451ebf8ca1cf7ba45..5e9a8670f340f27e6965c980334270f32fbc15e1 100644 (file)
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -110,8 +110,8 @@ int df_main(int argc UNUSED_PARAM, char **argv)
                df_disp_hr = xatoul_range(chp, 1, ULONG_MAX); /* disallow 0 */
 
        /* From the manpage of df from coreutils-6.10:
-          Disk space is shown in 1K blocks by default, unless the environment
-          variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
+        * Disk space is shown in 1K blocks by default, unless the environment
+        * variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
         */
        if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */
                df_disp_hr = 512;

diff --git a/coreutils/sort.c b/coreutils/sort.c
index 1df07285c7f41c5b0e4b3f4e7af6e67e56854736..a1625fc9cdb30a6d332ba023ef901ff6abac172d 100644 (file)
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -219,7 +219,7 @@ static int compare_keys(const void *xarg, const void *yarg)
                y = get_key(*(char **)yarg, key, flags);
 #else
        /* This curly bracket serves no purpose but to match the nesting
-          level of the for () loop we're not using */
+        * level of the for () loop we're not using */
        {
                x = *(char **)xarg;
                y = *(char **)yarg;

diff --git a/coreutils/sum.c b/coreutils/sum.c
index 95110a6da6e94a0bcb2bf8fcd5ce5724330383f9..75f6ef60a2f6abd747ffb514fcdc2e46a4b32203 100644 (file)
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -94,8 +94,8 @@ int sum_main(int argc UNUSED_PARAM, char **argv)
                n = sum_file("-", type);
        } else {
                /* Need to print the name if either
-                  - more than one file given
-                  - doing sysv */
+                * - more than one file given
+                * - doing sysv */
                type += (argv[1] || type == SUM_SYSV);
                n = 1;
                do {

diff --git a/editors/sed.c b/editors/sed.c
index 070af611a90f1a7fceaa9a60289cc31dde1d81c0..f8ca5d3517ca1ee1c854b4e8da219ba8b483ad1d 100644 (file)
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1077,7 +1077,7 @@ static void process_files(void)
                                /* or does this line matches our last address regex */
                                || (sed_cmd->end_match && old_matched
                                     && (regexec(sed_cmd->end_match,
-                                                pattern_space, 0, NULL, 0) == 0)
+                                               pattern_space, 0, NULL, 0) == 0)
                                )
                        );
                }

diff --git a/editors/vi.c b/editors/vi.c
index b1776c66857c2882bd95a6705b71ee91b0824ca1..5b5e2b0bfff64a7e912aa3e3d1cd80122d7d1b49 100644 (file)
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -1929,11 +1929,11 @@ static int find_range(char **start, char **stop, char c)
                dot_end();              // find NL
                q = dot;
        } else {
-           // nothing -- this causes any other values of c to
-           // represent the one-character range under the
-           // cursor.  this is correct for ' ' and 'l', but
-           // perhaps no others.
-           //
+               // nothing -- this causes any other values of c to
+               // represent the one-character range under the
+               // cursor.  this is correct for ' ' and 'l', but
+               // perhaps no others.
+               //
        }
        if (q < p) {
                t = q;

diff --git a/include/bb_archive.h b/include/bb_archive.h
index 7bb5615da47f0c0ce5af78d7ab449b9398da6331..a7a2a113581d9887b0dd569f2d3db9012dae309e 100644 (file)
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -220,9 +220,9 @@ IF_DESKTOP(long long) int unpack_xz_stream(transformer_aux_data_t *aux, int src_
 
 char* append_ext(char *filename, const char *expected_ext) FAST_FUNC;
 int bbunpack(char **argv,
-           IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(transformer_aux_data_t *aux),
-           char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext),
-           const char *expected_ext
+               IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(transformer_aux_data_t *aux),
+               char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext),
+               const char *expected_ext
 ) FAST_FUNC;
 
 void check_errors_in_children(int signo);

diff --git a/include/grp_.h b/include/grp_.h
index 82ad904921ffd37e910b766b0c38d5cc421d7866..e5075e5a0bde50bd03e6c4bee9737aaefa94c577 100644 (file)
--- a/include/grp_.h
+++ b/include/grp_.h
@@ -64,7 +64,7 @@ extern struct group *fgetgrent(FILE *__stream);
 
 /* Write the given entry onto the given stream.  */
 extern int putgrent(const struct group *__restrict __p,
-                    FILE *__restrict __f);
+               FILE *__restrict __f);
 #endif
 
 /* Search for an entry with a matching group ID.  */
@@ -82,32 +82,32 @@ extern struct group *getgrnam(const char *__name);
    POSIX people would choose.  */
 
 extern int getgrent_r(struct group *__restrict __resultbuf,
-                      char *__restrict __buffer, size_t __buflen,
-                      struct group **__restrict __result);
+               char *__restrict __buffer, size_t __buflen,
+               struct group **__restrict __result);
 
 /* Search for an entry with a matching group ID.  */
 extern int getgrgid_r(gid_t __gid, struct group *__restrict __resultbuf,
-                      char *__restrict __buffer, size_t __buflen,
-                      struct group **__restrict __result);
+               char *__restrict __buffer, size_t __buflen,
+               struct group **__restrict __result);
 
 /* Search for an entry with a matching group name.  */
 extern int getgrnam_r(const char *__restrict __name,
-                      struct group *__restrict __resultbuf,
-                      char *__restrict __buffer, size_t __buflen,
-                      struct group **__restrict __result);
+               struct group *__restrict __resultbuf,
+               char *__restrict __buffer, size_t __buflen,
+               struct group **__restrict __result);
 
 /* Read a group entry from STREAM.  This function is not standardized
    an probably never will.  */
 extern int fgetgrent_r(FILE *__restrict __stream,
-                       struct group *__restrict __resultbuf,
-                       char *__restrict __buffer, size_t __buflen,
-                       struct group **__restrict __result);
+               struct group *__restrict __resultbuf,
+               char *__restrict __buffer, size_t __buflen,
+               struct group **__restrict __result);
 
 /* Store at most *NGROUPS members of the group set for USER into
    *GROUPS.  Also include GROUP.  The actual number of groups found is
    returned in *NGROUPS.  Return -1 if the if *NGROUPS is too small.  */
 extern int getgrouplist(const char *__user, gid_t __group,
-                        gid_t *__groups, int *__ngroups);
+               gid_t *__groups, int *__ngroups);
 
 /* Initialize the group set for the current user
    by reading the group database and using all groups

diff --git a/include/libbb.h b/include/libbb.h
index 6ac7d2cab249406268dd476dca5cb2255dc9473c..606db7d0ddb09f47000018d4d143e33f059ce14b 100644 (file)
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1516,7 +1516,7 @@ struct smaprec {
        procps_read_smaps(pid, total)
 #endif
 int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
-                     void (*cb)(struct smaprec *, void *), void *data);
+               void (*cb)(struct smaprec *, void *), void *data);
 
 typedef struct procps_status_t {
        DIR *dir;

diff --git a/include/pwd_.h b/include/pwd_.h
index ea158da45211495ae83904d1026ccb6bca7b2175..625b6f5a2eb1abf2f5dc00cbbf4854954f343b9a 100644 (file)
--- a/include/pwd_.h
+++ b/include/pwd_.h
@@ -63,7 +63,7 @@ extern struct passwd *fgetpwent(FILE *__stream);
 
 /* Write the given entry onto the given stream.  */
 extern int putpwent(const struct passwd *__restrict __p,
-                    FILE *__restrict __f);
+               FILE *__restrict __f);
 #endif
 
 /* Search for an entry with a matching user ID.  */
@@ -81,25 +81,25 @@ extern struct passwd *getpwnam(const char *__name);
    POSIX people would choose.  */
 
 extern int getpwent_r(struct passwd *__restrict __resultbuf,
-                      char *__restrict __buffer, size_t __buflen,
-                      struct passwd **__restrict __result);
+               char *__restrict __buffer, size_t __buflen,
+               struct passwd **__restrict __result);
 
 extern int getpwuid_r(uid_t __uid,
-                      struct passwd *__restrict __resultbuf,
-                      char *__restrict __buffer, size_t __buflen,
-                      struct passwd **__restrict __result);
+               struct passwd *__restrict __resultbuf,
+               char *__restrict __buffer, size_t __buflen,
+               struct passwd **__restrict __result);
 
 extern int getpwnam_r(const char *__restrict __name,
-                      struct passwd *__restrict __resultbuf,
-                      char *__restrict __buffer, size_t __buflen,
-                      struct passwd **__restrict __result);
+               struct passwd *__restrict __resultbuf,
+               char *__restrict __buffer, size_t __buflen,
+               struct passwd **__restrict __result);
 
 /* Read an entry from STREAM.  This function is not standardized and
    probably never will.  */
 extern int fgetpwent_r(FILE *__restrict __stream,
-                       struct passwd *__restrict __resultbuf,
-                       char *__restrict __buffer, size_t __buflen,
-                       struct passwd **__restrict __result);
+               struct passwd *__restrict __resultbuf,
+               char *__restrict __buffer, size_t __buflen,
+               struct passwd **__restrict __result);
 
 POP_SAVED_FUNCTION_VISIBILITY
 

diff --git a/include/shadow_.h b/include/shadow_.h
index 648a62ab3204355a06ae39ddf68521256dd83fee..7babe4f30e54c8f59b66a64aa599a6b6c53f9ed0 100644 (file)
--- a/include/shadow_.h
+++ b/include/shadow_.h
@@ -79,21 +79,21 @@ extern int putspent(const struct spwd *__p, FILE *__stream);
 
 /* Reentrant versions of some of the functions above */
 extern int getspent_r(struct spwd *__result_buf, char *__buffer,
-                      size_t __buflen, struct spwd **__result);
+               size_t __buflen, struct spwd **__result);
 #endif
 
 extern int getspnam_r(const char *__name, struct spwd *__result_buf,
-                      char *__buffer, size_t __buflen,
-                      struct spwd **__result);
+               char *__buffer, size_t __buflen,
+               struct spwd **__result);
 
 #ifdef UNUSED_FOR_NOW
 extern int sgetspent_r(const char *__string, struct spwd *__result_buf,
-                       char *__buffer, size_t __buflen,
-                       struct spwd **__result);
+               char *__buffer, size_t __buflen,
+               struct spwd **__result);
 
 extern int fgetspent_r(FILE *__stream, struct spwd *__result_buf,
-                       char *__buffer, size_t __buflen,
-                       struct spwd **__result);
+               char *__buffer, size_t __buflen,
+               struct spwd **__result);
 /* Protect password file against multi writers */
 extern int lckpwdf(void);
 

diff --git a/libbb/xatonum_template.c b/libbb/xatonum_template.c
index 029f66202e225cf78bb7fe109edfc68e71939894..e0471983c98f3849a7eca3fc0c8783a9cbbe2a13 100644 (file)
--- a/libbb/xatonum_template.c
+++ b/libbb/xatonum_template.c
@@ -59,7 +59,7 @@ unsigned type FAST_FUNC xstrtou(_range_sfx)(const char *numstr, int base,
        }
 
        /* Note: trailing space is an error.
-          It would be easy enough to allow though if desired. */
+        * It would be easy enough to allow though if desired. */
        if (*e)
                goto inval;
  chk_range:

diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 2e87261cf348048b842719e3971ae56563974998..24c953bacd7d85dd0c7dc8486f0057029c81215a 100644 (file)
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -803,8 +803,8 @@ static void action_execute(const struct devfsd_notify_struct *info,
 
 
 static void action_copy(const struct devfsd_notify_struct *info,
-                        const struct config_entry_struct *entry,
-                        const regmatch_t *regexpr, unsigned int numexpr)
+                       const struct config_entry_struct *entry,
+                       const regmatch_t *regexpr, unsigned int numexpr)
 /*  [SUMMARY] Copy permissions.
     <info> The devfs change.
     <entry> The config file entry.
@@ -1259,11 +1259,11 @@ static int make_dir_tree(const char *path)
 } /*  End Function make_dir_tree  */
 
 static int expand_expression(char *output, unsigned int outsize,
-                             const char *input,
-                             const char *(*get_variable_func)(const char *variable, void *info),
-                             void *info,
-                             const char *devname,
-                             const regmatch_t *ex, unsigned int numexp)
+                       const char *input,
+                       const char *(*get_variable_func)(const char *variable, void *info),
+                       void *info,
+                       const char *devname,
+                       const regmatch_t *ex, unsigned int numexp)
 /*  [SUMMARY] Expand environment variables and regular subexpressions in string.
     <output> The output expanded expression is written here.
     <length> The size of the output buffer.
@@ -1288,8 +1288,8 @@ static int expand_expression(char *output, unsigned int outsize,
 }   /*  End Function expand_expression  */
 
 static void expand_regexp(char *output, size_t outsize, const char *input,
-                          const char *devname,
-                          const regmatch_t *ex, unsigned int numex)
+                       const char *devname,
+                       const regmatch_t *ex, unsigned int numex)
 /*  [SUMMARY] Expand all occurrences of the regular subexpressions \0 to \9.
     <output> The output expanded expression is written here.
     <outsize> The size of the output buffer.
@@ -1385,7 +1385,7 @@ static struct translate_struct translate_table[] =
 };
 
 const char *get_old_name(const char *devname, unsigned int namelen,
-                         char *buffer, unsigned int major, unsigned int minor)
+                       char *buffer, unsigned int major, unsigned int minor)
 /*  [SUMMARY] Translate a kernel-supplied name into an old name.
     <devname> The device name provided by the kernel.
     <namelen> The length of the name.
@@ -1423,7 +1423,7 @@ const char *get_old_name(const char *devname, unsigned int namelen,
        };
 
        for (trans = translate_table; trans->match != NULL; ++trans) {
-                len = strlen(trans->match);
+               len = strlen(trans->match);
 
                if (strncmp(devname, trans->match, len) == 0) {
                        if (trans->format == NULL)
@@ -1549,9 +1549,9 @@ static char *write_old_sd_name(char *buffer,
 /*EXPERIMENTAL_FUNCTION*/
 
 int st_expr_expand(char *output, unsigned int length, const char *input,
-                    const char *(*get_variable_func)(const char *variable,
-                                                 void *info),
-                    void *info)
+               const char *(*get_variable_func)(const char *variable,
+                                               void *info),
+               void *info)
 /*  [SUMMARY] Expand an expression using Borne Shell-like unquoted rules.
     <output> The output expanded expression is written here.
     <length> The size of the output buffer.
@@ -1643,7 +1643,7 @@ st_expr_expand_out:
 static const char *expand_variable(char *buffer, unsigned int length,
                                unsigned int *out_pos, const char *input,
                                const char *(*func)(const char *variable,
-                                                        void *info),
+                                                       void *info),
                                void *info)
 /*  [SUMMARY] Expand a variable.
     <buffer> The buffer to write to.

diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 9c6dbf4685a9f93403c9f7d8045c1b6a9e092880..69726ae7293636a93868ac1395bf42f2e864096e 100644 (file)
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -1038,7 +1038,7 @@ static void identify(uint16_t *val)
                                val[ACOUSTIC] & 0x00ff);
                }
        } else {
-                /* ATAPI */
+               /* ATAPI */
                if (eqpt != CDROM && (val[CAPAB_0] & SWRST_REQ))
                        printf("\tATA sw reset required\n");
 

diff --git a/miscutils/less.c b/miscutils/less.c
index f0187bf8aeaa13e2dc4de88e00d3f825a4fd6037..5ce0a1203031b42630c426dcbf775190a96e9228 100644 (file)
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -709,9 +709,9 @@ static void print_found(const char *line)
        /* buf[] holds quarantined version of str */
 
        /* Each part of the line that matches has the HIGHLIGHT
-          and NORMAL escape sequences placed around it.
-          NB: we regex against line, but insert text
-          from quarantined copy (buf[]) */
+        * and NORMAL escape sequences placed around it.
+        * NB: we regex against line, but insert text
+        * from quarantined copy (buf[]) */
        str = buf;
        growline = NULL;
        eflags = 0;

diff --git a/miscutils/rx.c b/miscutils/rx.c
index af597320cee6ad97a289f69adcc713249ecc9732..1dffb593afc70dfe771b9717c822d659f9a172e2 100644 (file)
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -193,8 +193,8 @@ static int receive(/*int read_fd, */int file_fd)
                }
                if (cksum_or_crc != expected) {
                        bb_error_msg(do_crc ? "crc error, expected 0x%04x, got 0x%04x"
-                                          : "checksum error, expected 0x%02x, got 0x%02x",
-                                       expected, cksum_or_crc);
+                                       : "checksum error, expected 0x%02x, got 0x%02x",
+                               expected, cksum_or_crc);
                        goto error;
                }
 

diff --git a/miscutils/time.c b/miscutils/time.c
index ffed38632995eb43498db5ff4460557442406235..19b0b44c91c0ba406d0f06135257cb5f4abc0f98 100644 (file)
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -70,7 +70,7 @@ static void resuse_end(pid_t pid, resource_t *resp)
        pid_t caught;
 
        /* Ignore signals, but don't ignore the children.  When wait3
-          returns the child process, set the time the command finished. */
+        * returns the child process, set the time the command finished. */
        while ((caught = wait3(&resp->waitstatus, 0, &resp->ru)) != pid) {
                if (caught == -1 && errno != EINTR) {
                        bb_perror_msg("wait");

diff --git a/shell/hush.c b/shell/hush.c
index 87807052c70d8a7b1eed2cbaea94e59990da4153..e2dc1e2d00aade3c8891d32233b445d63176b55f 100644 (file)
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -8281,7 +8281,7 @@ static int FAST_FUNC builtin_exit(char **argv)
         * (if there are _stopped_ jobs, running ones don't count)
         * # exit
         * exit
-        # EEE (then bash exits)
+        * EEE (then bash exits)
         *
         * TODO: we can use G.exiting = -1 as indicator "last cmd was exit"
         */