aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2013-01-15 13:58:01 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2013-01-15 13:58:01 +0100
commit6830ade6aa91dad5afe6abf9d1e4f696f5641bf1 (patch)
tree0b7de8e0cbaa864f742901814f734549270e5ff9
parent30a8652fbf16884490cee4a624f039a9ab587269 (diff)
downloadbusybox-w32-6830ade6aa91dad5afe6abf9d1e4f696f5641bf1.tar.gz
busybox-w32-6830ade6aa91dad5afe6abf9d1e4f696f5641bf1.tar.bz2
busybox-w32-6830ade6aa91dad5afe6abf9d1e4f696f5641bf1.zip
whitespace fixes. no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat
-rw-r--r--console-tools/loadfont.c2
-rw-r--r--coreutils/cal.c4
-rw-r--r--coreutils/chown.c4
-rw-r--r--coreutils/df.c4
-rw-r--r--coreutils/sort.c2
-rw-r--r--coreutils/sum.c4
-rw-r--r--editors/sed.c2
-rw-r--r--editors/vi.c10
-rw-r--r--include/bb_archive.h6
-rw-r--r--include/grp_.h24
-rw-r--r--include/libbb.h2
-rw-r--r--include/pwd_.h24
-rw-r--r--include/shadow_.h14
-rw-r--r--libbb/xatonum_template.c2
-rw-r--r--miscutils/devfsd.c30
-rw-r--r--miscutils/hdparm.c2
-rw-r--r--miscutils/less.c6
-rw-r--r--miscutils/rx.c4
-rw-r--r--miscutils/time.c2
-rw-r--r--shell/hush.c2
20 files changed, 75 insertions, 75 deletions
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 9e887f256..032506d6d 100644
--- 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,
229 } 229 }
230 230
231 /* Note: after PIO_UNIMAPCLR and before PIO_UNIMAP 231 /* Note: after PIO_UNIMAPCLR and before PIO_UNIMAP
232 this printf did not work on many kernels */ 232 * this printf did not work on many kernels */
233 233
234 advice.advised_hashsize = 0; 234 advice.advised_hashsize = 0;
235 advice.advised_hashstep = 0; 235 advice.advised_hashstep = 0;
diff --git a/coreutils/cal.c b/coreutils/cal.c
index 0b2307349..0d388aa1c 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -43,7 +43,7 @@ static const unsigned char days_in_month[] ALIGN1 = {
43}; 43};
44 44
45static const unsigned char sep1752[] ALIGN1 = { 45static const unsigned char sep1752[] ALIGN1 = {
46 1, 2, 14, 15, 16, 46 1, 2, 14, 15, 16,
47 17, 18, 19, 20, 21, 22, 23, 47 17, 18, 19, 20, 21, 22, 23,
48 24, 25, 26, 27, 28, 29, 30 48 24, 25, 26, 27, 28, 29, 30
49}; 49};
@@ -183,7 +183,7 @@ int cal_main(int argc UNUSED_PARAM, char **argv)
183 center(lineout, 183 center(lineout,
184 (WEEK_LEN * 3 + HEAD_SEP * 2) 184 (WEEK_LEN * 3 + HEAD_SEP * 2)
185 + julian * (J_WEEK_LEN * 2 + HEAD_SEP 185 + julian * (J_WEEK_LEN * 2 + HEAD_SEP
186 - (WEEK_LEN * 3 + HEAD_SEP * 2)), 186 - (WEEK_LEN * 3 + HEAD_SEP * 2)),
187 0 187 0
188 ); 188 );
189 puts("\n"); /* two \n's */ 189 puts("\n"); /* two \n's */
diff --git a/coreutils/chown.c b/coreutils/chown.c
index bb166d8fe..1a9127622 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -126,8 +126,8 @@ int chown_main(int argc UNUSED_PARAM, char **argv)
126 /* This matches coreutils behavior (almost - see below) */ 126 /* This matches coreutils behavior (almost - see below) */
127 param.chown_func = chown; 127 param.chown_func = chown;
128 if (OPT_NODEREF 128 if (OPT_NODEREF
129 /* || (OPT_RECURSE && !OPT_TRAVERSE_TOP): */ 129 /* || (OPT_RECURSE && !OPT_TRAVERSE_TOP): */
130 IF_DESKTOP( || (opt & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE) 130 IF_DESKTOP( || (opt & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE)
131 ) { 131 ) {
132 param.chown_func = lchown; 132 param.chown_func = lchown;
133 } 133 }
diff --git a/coreutils/df.c b/coreutils/df.c
index 2c72e82a4..5e9a8670f 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -110,8 +110,8 @@ int df_main(int argc UNUSED_PARAM, char **argv)
110 df_disp_hr = xatoul_range(chp, 1, ULONG_MAX); /* disallow 0 */ 110 df_disp_hr = xatoul_range(chp, 1, ULONG_MAX); /* disallow 0 */
111 111
112 /* From the manpage of df from coreutils-6.10: 112 /* From the manpage of df from coreutils-6.10:
113 Disk space is shown in 1K blocks by default, unless the environment 113 * Disk space is shown in 1K blocks by default, unless the environment
114 variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used. 114 * variable POSIXLY_CORRECT is set, in which case 512-byte blocks are used.
115 */ 115 */
116 if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */ 116 if (getenv("POSIXLY_CORRECT")) /* TODO - a new libbb function? */
117 df_disp_hr = 512; 117 df_disp_hr = 512;
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 1df07285c..a1625fc9c 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -219,7 +219,7 @@ static int compare_keys(const void *xarg, const void *yarg)
219 y = get_key(*(char **)yarg, key, flags); 219 y = get_key(*(char **)yarg, key, flags);
220#else 220#else
221 /* This curly bracket serves no purpose but to match the nesting 221 /* This curly bracket serves no purpose but to match the nesting
222 level of the for () loop we're not using */ 222 * level of the for () loop we're not using */
223 { 223 {
224 x = *(char **)xarg; 224 x = *(char **)xarg;
225 y = *(char **)yarg; 225 y = *(char **)yarg;
diff --git a/coreutils/sum.c b/coreutils/sum.c
index 95110a6da..75f6ef60a 100644
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -94,8 +94,8 @@ int sum_main(int argc UNUSED_PARAM, char **argv)
94 n = sum_file("-", type); 94 n = sum_file("-", type);
95 } else { 95 } else {
96 /* Need to print the name if either 96 /* Need to print the name if either
97 - more than one file given 97 * - more than one file given
98 - doing sysv */ 98 * - doing sysv */
99 type += (argv[1] || type == SUM_SYSV); 99 type += (argv[1] || type == SUM_SYSV);
100 n = 1; 100 n = 1;
101 do { 101 do {
diff --git a/editors/sed.c b/editors/sed.c
index 070af611a..f8ca5d351 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1077,7 +1077,7 @@ static void process_files(void)
1077 /* or does this line matches our last address regex */ 1077 /* or does this line matches our last address regex */
1078 || (sed_cmd->end_match && old_matched 1078 || (sed_cmd->end_match && old_matched
1079 && (regexec(sed_cmd->end_match, 1079 && (regexec(sed_cmd->end_match,
1080 pattern_space, 0, NULL, 0) == 0) 1080 pattern_space, 0, NULL, 0) == 0)
1081 ) 1081 )
1082 ); 1082 );
1083 } 1083 }
diff --git a/editors/vi.c b/editors/vi.c
index b1776c668..5b5e2b0bf 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -1929,11 +1929,11 @@ static int find_range(char **start, char **stop, char c)
1929 dot_end(); // find NL 1929 dot_end(); // find NL
1930 q = dot; 1930 q = dot;
1931 } else { 1931 } else {
1932 // nothing -- this causes any other values of c to 1932 // nothing -- this causes any other values of c to
1933 // represent the one-character range under the 1933 // represent the one-character range under the
1934 // cursor. this is correct for ' ' and 'l', but 1934 // cursor. this is correct for ' ' and 'l', but
1935 // perhaps no others. 1935 // perhaps no others.
1936 // 1936 //
1937 } 1937 }
1938 if (q < p) { 1938 if (q < p) {
1939 t = q; 1939 t = q;
diff --git a/include/bb_archive.h b/include/bb_archive.h
index 7bb5615da..a7a2a1135 100644
--- 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_
220 220
221char* append_ext(char *filename, const char *expected_ext) FAST_FUNC; 221char* append_ext(char *filename, const char *expected_ext) FAST_FUNC;
222int bbunpack(char **argv, 222int bbunpack(char **argv,
223 IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(transformer_aux_data_t *aux), 223 IF_DESKTOP(long long) int FAST_FUNC (*unpacker)(transformer_aux_data_t *aux),
224 char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext), 224 char* FAST_FUNC (*make_new_name)(char *filename, const char *expected_ext),
225 const char *expected_ext 225 const char *expected_ext
226) FAST_FUNC; 226) FAST_FUNC;
227 227
228void check_errors_in_children(int signo); 228void check_errors_in_children(int signo);
diff --git a/include/grp_.h b/include/grp_.h
index 82ad90492..e5075e5a0 100644
--- a/include/grp_.h
+++ b/include/grp_.h
@@ -64,7 +64,7 @@ extern struct group *fgetgrent(FILE *__stream);
64 64
65/* Write the given entry onto the given stream. */ 65/* Write the given entry onto the given stream. */
66extern int putgrent(const struct group *__restrict __p, 66extern int putgrent(const struct group *__restrict __p,
67 FILE *__restrict __f); 67 FILE *__restrict __f);
68#endif 68#endif
69 69
70/* Search for an entry with a matching group ID. */ 70/* Search for an entry with a matching group ID. */
@@ -82,32 +82,32 @@ extern struct group *getgrnam(const char *__name);
82 POSIX people would choose. */ 82 POSIX people would choose. */
83 83
84extern int getgrent_r(struct group *__restrict __resultbuf, 84extern int getgrent_r(struct group *__restrict __resultbuf,
85 char *__restrict __buffer, size_t __buflen, 85 char *__restrict __buffer, size_t __buflen,
86 struct group **__restrict __result); 86 struct group **__restrict __result);
87 87
88/* Search for an entry with a matching group ID. */ 88/* Search for an entry with a matching group ID. */
89extern int getgrgid_r(gid_t __gid, struct group *__restrict __resultbuf, 89extern int getgrgid_r(gid_t __gid, struct group *__restrict __resultbuf,
90 char *__restrict __buffer, size_t __buflen, 90 char *__restrict __buffer, size_t __buflen,
91 struct group **__restrict __result); 91 struct group **__restrict __result);
92 92
93/* Search for an entry with a matching group name. */ 93/* Search for an entry with a matching group name. */
94extern int getgrnam_r(const char *__restrict __name, 94extern int getgrnam_r(const char *__restrict __name,
95 struct group *__restrict __resultbuf, 95 struct group *__restrict __resultbuf,
96 char *__restrict __buffer, size_t __buflen, 96 char *__restrict __buffer, size_t __buflen,
97 struct group **__restrict __result); 97 struct group **__restrict __result);
98 98
99/* Read a group entry from STREAM. This function is not standardized 99/* Read a group entry from STREAM. This function is not standardized
100 an probably never will. */ 100 an probably never will. */
101extern int fgetgrent_r(FILE *__restrict __stream, 101extern int fgetgrent_r(FILE *__restrict __stream,
102 struct group *__restrict __resultbuf, 102 struct group *__restrict __resultbuf,
103 char *__restrict __buffer, size_t __buflen, 103 char *__restrict __buffer, size_t __buflen,
104 struct group **__restrict __result); 104 struct group **__restrict __result);
105 105
106/* Store at most *NGROUPS members of the group set for USER into 106/* Store at most *NGROUPS members of the group set for USER into
107 *GROUPS. Also include GROUP. The actual number of groups found is 107 *GROUPS. Also include GROUP. The actual number of groups found is
108 returned in *NGROUPS. Return -1 if the if *NGROUPS is too small. */ 108 returned in *NGROUPS. Return -1 if the if *NGROUPS is too small. */
109extern int getgrouplist(const char *__user, gid_t __group, 109extern int getgrouplist(const char *__user, gid_t __group,
110 gid_t *__groups, int *__ngroups); 110 gid_t *__groups, int *__ngroups);
111 111
112/* Initialize the group set for the current user 112/* Initialize the group set for the current user
113 by reading the group database and using all groups 113 by reading the group database and using all groups
diff --git a/include/libbb.h b/include/libbb.h
index 6ac7d2cab..606db7d0d 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1516,7 +1516,7 @@ struct smaprec {
1516 procps_read_smaps(pid, total) 1516 procps_read_smaps(pid, total)
1517#endif 1517#endif
1518int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total, 1518int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
1519 void (*cb)(struct smaprec *, void *), void *data); 1519 void (*cb)(struct smaprec *, void *), void *data);
1520 1520
1521typedef struct procps_status_t { 1521typedef struct procps_status_t {
1522 DIR *dir; 1522 DIR *dir;
diff --git a/include/pwd_.h b/include/pwd_.h
index ea158da45..625b6f5a2 100644
--- a/include/pwd_.h
+++ b/include/pwd_.h
@@ -63,7 +63,7 @@ extern struct passwd *fgetpwent(FILE *__stream);
63 63
64/* Write the given entry onto the given stream. */ 64/* Write the given entry onto the given stream. */
65extern int putpwent(const struct passwd *__restrict __p, 65extern int putpwent(const struct passwd *__restrict __p,
66 FILE *__restrict __f); 66 FILE *__restrict __f);
67#endif 67#endif
68 68
69/* Search for an entry with a matching user ID. */ 69/* Search for an entry with a matching user ID. */
@@ -81,25 +81,25 @@ extern struct passwd *getpwnam(const char *__name);
81 POSIX people would choose. */ 81 POSIX people would choose. */
82 82
83extern int getpwent_r(struct passwd *__restrict __resultbuf, 83extern int getpwent_r(struct passwd *__restrict __resultbuf,
84 char *__restrict __buffer, size_t __buflen, 84 char *__restrict __buffer, size_t __buflen,
85 struct passwd **__restrict __result); 85 struct passwd **__restrict __result);
86 86
87extern int getpwuid_r(uid_t __uid, 87extern int getpwuid_r(uid_t __uid,
88 struct passwd *__restrict __resultbuf, 88 struct passwd *__restrict __resultbuf,
89 char *__restrict __buffer, size_t __buflen, 89 char *__restrict __buffer, size_t __buflen,
90 struct passwd **__restrict __result); 90 struct passwd **__restrict __result);
91 91
92extern int getpwnam_r(const char *__restrict __name, 92extern int getpwnam_r(const char *__restrict __name,
93 struct passwd *__restrict __resultbuf, 93 struct passwd *__restrict __resultbuf,
94 char *__restrict __buffer, size_t __buflen, 94 char *__restrict __buffer, size_t __buflen,
95 struct passwd **__restrict __result); 95 struct passwd **__restrict __result);
96 96
97/* Read an entry from STREAM. This function is not standardized and 97/* Read an entry from STREAM. This function is not standardized and
98 probably never will. */ 98 probably never will. */
99extern int fgetpwent_r(FILE *__restrict __stream, 99extern int fgetpwent_r(FILE *__restrict __stream,
100 struct passwd *__restrict __resultbuf, 100 struct passwd *__restrict __resultbuf,
101 char *__restrict __buffer, size_t __buflen, 101 char *__restrict __buffer, size_t __buflen,
102 struct passwd **__restrict __result); 102 struct passwd **__restrict __result);
103 103
104POP_SAVED_FUNCTION_VISIBILITY 104POP_SAVED_FUNCTION_VISIBILITY
105 105
diff --git a/include/shadow_.h b/include/shadow_.h
index 648a62ab3..7babe4f30 100644
--- a/include/shadow_.h
+++ b/include/shadow_.h
@@ -79,21 +79,21 @@ extern int putspent(const struct spwd *__p, FILE *__stream);
79 79
80/* Reentrant versions of some of the functions above */ 80/* Reentrant versions of some of the functions above */
81extern int getspent_r(struct spwd *__result_buf, char *__buffer, 81extern int getspent_r(struct spwd *__result_buf, char *__buffer,
82 size_t __buflen, struct spwd **__result); 82 size_t __buflen, struct spwd **__result);
83#endif 83#endif
84 84
85extern int getspnam_r(const char *__name, struct spwd *__result_buf, 85extern int getspnam_r(const char *__name, struct spwd *__result_buf,
86 char *__buffer, size_t __buflen, 86 char *__buffer, size_t __buflen,
87 struct spwd **__result); 87 struct spwd **__result);
88 88
89#ifdef UNUSED_FOR_NOW 89#ifdef UNUSED_FOR_NOW
90extern int sgetspent_r(const char *__string, struct spwd *__result_buf, 90extern int sgetspent_r(const char *__string, struct spwd *__result_buf,
91 char *__buffer, size_t __buflen, 91 char *__buffer, size_t __buflen,
92 struct spwd **__result); 92 struct spwd **__result);
93 93
94extern int fgetspent_r(FILE *__stream, struct spwd *__result_buf, 94extern int fgetspent_r(FILE *__stream, struct spwd *__result_buf,
95 char *__buffer, size_t __buflen, 95 char *__buffer, size_t __buflen,
96 struct spwd **__result); 96 struct spwd **__result);
97/* Protect password file against multi writers */ 97/* Protect password file against multi writers */
98extern int lckpwdf(void); 98extern int lckpwdf(void);
99 99
diff --git a/libbb/xatonum_template.c b/libbb/xatonum_template.c
index 029f66202..e0471983c 100644
--- 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,
59 } 59 }
60 60
61 /* Note: trailing space is an error. 61 /* Note: trailing space is an error.
62 It would be easy enough to allow though if desired. */ 62 * It would be easy enough to allow though if desired. */
63 if (*e) 63 if (*e)
64 goto inval; 64 goto inval;
65 chk_range: 65 chk_range:
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 2e87261cf..24c953bac 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -803,8 +803,8 @@ static void action_execute(const struct devfsd_notify_struct *info,
803 803
804 804
805static void action_copy(const struct devfsd_notify_struct *info, 805static void action_copy(const struct devfsd_notify_struct *info,
806 const struct config_entry_struct *entry, 806 const struct config_entry_struct *entry,
807 const regmatch_t *regexpr, unsigned int numexpr) 807 const regmatch_t *regexpr, unsigned int numexpr)
808/* [SUMMARY] Copy permissions. 808/* [SUMMARY] Copy permissions.
809 <info> The devfs change. 809 <info> The devfs change.
810 <entry> The config file entry. 810 <entry> The config file entry.
@@ -1259,11 +1259,11 @@ static int make_dir_tree(const char *path)
1259} /* End Function make_dir_tree */ 1259} /* End Function make_dir_tree */
1260 1260
1261static int expand_expression(char *output, unsigned int outsize, 1261static int expand_expression(char *output, unsigned int outsize,
1262 const char *input, 1262 const char *input,
1263 const char *(*get_variable_func)(const char *variable, void *info), 1263 const char *(*get_variable_func)(const char *variable, void *info),
1264 void *info, 1264 void *info,
1265 const char *devname, 1265 const char *devname,
1266 const regmatch_t *ex, unsigned int numexp) 1266 const regmatch_t *ex, unsigned int numexp)
1267/* [SUMMARY] Expand environment variables and regular subexpressions in string. 1267/* [SUMMARY] Expand environment variables and regular subexpressions in string.
1268 <output> The output expanded expression is written here. 1268 <output> The output expanded expression is written here.
1269 <length> The size of the output buffer. 1269 <length> The size of the output buffer.
@@ -1288,8 +1288,8 @@ static int expand_expression(char *output, unsigned int outsize,
1288} /* End Function expand_expression */ 1288} /* End Function expand_expression */
1289 1289
1290static void expand_regexp(char *output, size_t outsize, const char *input, 1290static void expand_regexp(char *output, size_t outsize, const char *input,
1291 const char *devname, 1291 const char *devname,
1292 const regmatch_t *ex, unsigned int numex) 1292 const regmatch_t *ex, unsigned int numex)
1293/* [SUMMARY] Expand all occurrences of the regular subexpressions \0 to \9. 1293/* [SUMMARY] Expand all occurrences of the regular subexpressions \0 to \9.
1294 <output> The output expanded expression is written here. 1294 <output> The output expanded expression is written here.
1295 <outsize> The size of the output buffer. 1295 <outsize> The size of the output buffer.
@@ -1385,7 +1385,7 @@ static struct translate_struct translate_table[] =
1385}; 1385};
1386 1386
1387const char *get_old_name(const char *devname, unsigned int namelen, 1387const char *get_old_name(const char *devname, unsigned int namelen,
1388 char *buffer, unsigned int major, unsigned int minor) 1388 char *buffer, unsigned int major, unsigned int minor)
1389/* [SUMMARY] Translate a kernel-supplied name into an old name. 1389/* [SUMMARY] Translate a kernel-supplied name into an old name.
1390 <devname> The device name provided by the kernel. 1390 <devname> The device name provided by the kernel.
1391 <namelen> The length of the name. 1391 <namelen> The length of the name.
@@ -1423,7 +1423,7 @@ const char *get_old_name(const char *devname, unsigned int namelen,
1423 }; 1423 };
1424 1424
1425 for (trans = translate_table; trans->match != NULL; ++trans) { 1425 for (trans = translate_table; trans->match != NULL; ++trans) {
1426 len = strlen(trans->match); 1426 len = strlen(trans->match);
1427 1427
1428 if (strncmp(devname, trans->match, len) == 0) { 1428 if (strncmp(devname, trans->match, len) == 0) {
1429 if (trans->format == NULL) 1429 if (trans->format == NULL)
@@ -1549,9 +1549,9 @@ static char *write_old_sd_name(char *buffer,
1549/*EXPERIMENTAL_FUNCTION*/ 1549/*EXPERIMENTAL_FUNCTION*/
1550 1550
1551int st_expr_expand(char *output, unsigned int length, const char *input, 1551int st_expr_expand(char *output, unsigned int length, const char *input,
1552 const char *(*get_variable_func)(const char *variable, 1552 const char *(*get_variable_func)(const char *variable,
1553 void *info), 1553 void *info),
1554 void *info) 1554 void *info)
1555/* [SUMMARY] Expand an expression using Borne Shell-like unquoted rules. 1555/* [SUMMARY] Expand an expression using Borne Shell-like unquoted rules.
1556 <output> The output expanded expression is written here. 1556 <output> The output expanded expression is written here.
1557 <length> The size of the output buffer. 1557 <length> The size of the output buffer.
@@ -1643,7 +1643,7 @@ st_expr_expand_out:
1643static const char *expand_variable(char *buffer, unsigned int length, 1643static const char *expand_variable(char *buffer, unsigned int length,
1644 unsigned int *out_pos, const char *input, 1644 unsigned int *out_pos, const char *input,
1645 const char *(*func)(const char *variable, 1645 const char *(*func)(const char *variable,
1646 void *info), 1646 void *info),
1647 void *info) 1647 void *info)
1648/* [SUMMARY] Expand a variable. 1648/* [SUMMARY] Expand a variable.
1649 <buffer> The buffer to write to. 1649 <buffer> The buffer to write to.
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 9c6dbf468..69726ae72 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -1038,7 +1038,7 @@ static void identify(uint16_t *val)
1038 val[ACOUSTIC] & 0x00ff); 1038 val[ACOUSTIC] & 0x00ff);
1039 } 1039 }
1040 } else { 1040 } else {
1041 /* ATAPI */ 1041 /* ATAPI */
1042 if (eqpt != CDROM && (val[CAPAB_0] & SWRST_REQ)) 1042 if (eqpt != CDROM && (val[CAPAB_0] & SWRST_REQ))
1043 printf("\tATA sw reset required\n"); 1043 printf("\tATA sw reset required\n");
1044 1044
diff --git a/miscutils/less.c b/miscutils/less.c
index f0187bf8a..5ce0a1203 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -709,9 +709,9 @@ static void print_found(const char *line)
709 /* buf[] holds quarantined version of str */ 709 /* buf[] holds quarantined version of str */
710 710
711 /* Each part of the line that matches has the HIGHLIGHT 711 /* Each part of the line that matches has the HIGHLIGHT
712 and NORMAL escape sequences placed around it. 712 * and NORMAL escape sequences placed around it.
713 NB: we regex against line, but insert text 713 * NB: we regex against line, but insert text
714 from quarantined copy (buf[]) */ 714 * from quarantined copy (buf[]) */
715 str = buf; 715 str = buf;
716 growline = NULL; 716 growline = NULL;
717 eflags = 0; 717 eflags = 0;
diff --git a/miscutils/rx.c b/miscutils/rx.c
index af597320c..1dffb593a 100644
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -193,8 +193,8 @@ static int receive(/*int read_fd, */int file_fd)
193 } 193 }
194 if (cksum_or_crc != expected) { 194 if (cksum_or_crc != expected) {
195 bb_error_msg(do_crc ? "crc error, expected 0x%04x, got 0x%04x" 195 bb_error_msg(do_crc ? "crc error, expected 0x%04x, got 0x%04x"
196 : "checksum error, expected 0x%02x, got 0x%02x", 196 : "checksum error, expected 0x%02x, got 0x%02x",
197 expected, cksum_or_crc); 197 expected, cksum_or_crc);
198 goto error; 198 goto error;
199 } 199 }
200 200
diff --git a/miscutils/time.c b/miscutils/time.c
index ffed38632..19b0b44c9 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -70,7 +70,7 @@ static void resuse_end(pid_t pid, resource_t *resp)
70 pid_t caught; 70 pid_t caught;
71 71
72 /* Ignore signals, but don't ignore the children. When wait3 72 /* Ignore signals, but don't ignore the children. When wait3
73 returns the child process, set the time the command finished. */ 73 * returns the child process, set the time the command finished. */
74 while ((caught = wait3(&resp->waitstatus, 0, &resp->ru)) != pid) { 74 while ((caught = wait3(&resp->waitstatus, 0, &resp->ru)) != pid) {
75 if (caught == -1 && errno != EINTR) { 75 if (caught == -1 && errno != EINTR) {
76 bb_perror_msg("wait"); 76 bb_perror_msg("wait");
diff --git a/shell/hush.c b/shell/hush.c
index 87807052c..e2dc1e2d0 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -8281,7 +8281,7 @@ static int FAST_FUNC builtin_exit(char **argv)
8281 * (if there are _stopped_ jobs, running ones don't count) 8281 * (if there are _stopped_ jobs, running ones don't count)
8282 * # exit 8282 * # exit
8283 * exit 8283 * exit
8284 # EEE (then bash exits) 8284 * EEE (then bash exits)
8285 * 8285 *
8286 * TODO: we can use G.exiting = -1 as indicator "last cmd was exit" 8286 * TODO: we can use G.exiting = -1 as indicator "last cmd was exit"
8287 */ 8287 */
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-16 12:55:35 +0000