diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2013-01-15 13:58:01 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2013-01-15 13:58:01 +0100 |
| commit | 6830ade6aa91dad5afe6abf9d1e4f696f5641bf1 (patch) | |
| tree | 0b7de8e0cbaa864f742901814f734549270e5ff9 /miscutils | |
| parent | 30a8652fbf16884490cee4a624f039a9ab587269 (diff) | |
| download | busybox-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 (limited to 'miscutils')
| -rw-r--r-- | miscutils/devfsd.c | 30 | ||||
| -rw-r--r-- | miscutils/hdparm.c | 2 | ||||
| -rw-r--r-- | miscutils/less.c | 6 | ||||
| -rw-r--r-- | miscutils/rx.c | 4 | ||||
| -rw-r--r-- | miscutils/time.c | 2 |
5 files changed, 22 insertions, 22 deletions
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 | ||
| 805 | static void action_copy(const struct devfsd_notify_struct *info, | 805 | static 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 | ||
| 1261 | static int expand_expression(char *output, unsigned int outsize, | 1261 | static 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 | ||
| 1290 | static void expand_regexp(char *output, size_t outsize, const char *input, | 1290 | static 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 | ||
| 1387 | const char *get_old_name(const char *devname, unsigned int namelen, | 1387 | const 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 | ||
| 1551 | int st_expr_expand(char *output, unsigned int length, const char *input, | 1551 | int 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: | |||
| 1643 | static const char *expand_variable(char *buffer, unsigned int length, | 1643 | static 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"); |
