diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-26 14:32:57 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-26 14:32:57 +0000 |
commit | f5d8c90d73777d912ddffea9dd7c537c3a1a43a5 (patch) | |
tree | a358be6a258f4c7c8905f1809737e74413df26c6 | |
parent | 2649f215aecf923713d2f9a379cf651437ddf499 (diff) | |
download | busybox-w32-f5d8c90d73777d912ddffea9dd7c537c3a1a43a5.tar.gz busybox-w32-f5d8c90d73777d912ddffea9dd7c537c3a1a43a5.tar.bz2 busybox-w32-f5d8c90d73777d912ddffea9dd7c537c3a1a43a5.zip |
style fixes, no code changes
-rw-r--r-- | archival/libunarchive/decompress_bunzip2.c | 4 | ||||
-rw-r--r-- | archival/unzip.c | 6 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/probe.c | 4 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/mke2fs.c | 4 | ||||
-rw-r--r-- | editors/patch.c | 2 | ||||
-rw-r--r-- | miscutils/devfsd.c | 4 | ||||
-rw-r--r-- | modutils/insmod.c | 2 | ||||
-rw-r--r-- | shell/bbsh.c | 2 | ||||
-rw-r--r-- | util-linux/fdisk.c | 2 | ||||
-rw-r--r-- | util-linux/getopt.c | 4 | ||||
-rw-r--r-- | util-linux/volume_id/util.c | 4 |
11 files changed, 19 insertions, 19 deletions
diff --git a/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c index 8f35bc5f9..6da09fc1b 100644 --- a/archival/libunarchive/decompress_bunzip2.c +++ b/archival/libunarchive/decompress_bunzip2.c | |||
@@ -761,9 +761,9 @@ int main(int argc, char **argv) | |||
761 | char c; | 761 | char c; |
762 | 762 | ||
763 | if (i < 0) | 763 | if (i < 0) |
764 | fprintf(stderr,"%s\n", bunzip_errors[-i]); | 764 | fprintf(stderr, "%s\n", bunzip_errors[-i]); |
765 | else if (read(STDIN_FILENO, &c, 1)) | 765 | else if (read(STDIN_FILENO, &c, 1)) |
766 | fprintf(stderr,"Trailing garbage ignored\n"); | 766 | fprintf(stderr, "Trailing garbage ignored\n"); |
767 | return -i; | 767 | return -i; |
768 | } | 768 | } |
769 | #endif | 769 | #endif |
diff --git a/archival/unzip.c b/archival/unzip.c index c7d39daef..2c8971295 100644 --- a/archival/unzip.c +++ b/archival/unzip.c | |||
@@ -308,7 +308,7 @@ int unzip_main(int argc, char **argv) | |||
308 | } else if (last_char_is(dst_fn, '/')) { /* Extract directory */ | 308 | } else if (last_char_is(dst_fn, '/')) { /* Extract directory */ |
309 | if (stat(dst_fn, &stat_buf) == -1) { | 309 | if (stat(dst_fn, &stat_buf) == -1) { |
310 | if (errno != ENOENT) { | 310 | if (errno != ENOENT) { |
311 | bb_perror_msg_and_die("cannot stat '%s'",dst_fn); | 311 | bb_perror_msg_and_die("cannot stat '%s'", dst_fn); |
312 | } | 312 | } |
313 | if (verbose) { | 313 | if (verbose) { |
314 | printf(" creating: %s\n", dst_fn); | 314 | printf(" creating: %s\n", dst_fn); |
@@ -328,7 +328,7 @@ int unzip_main(int argc, char **argv) | |||
328 | _check_file: | 328 | _check_file: |
329 | if (stat(dst_fn, &stat_buf) == -1) { /* File does not exist */ | 329 | if (stat(dst_fn, &stat_buf) == -1) { /* File does not exist */ |
330 | if (errno != ENOENT) { | 330 | if (errno != ENOENT) { |
331 | bb_perror_msg_and_die("cannot stat '%s'",dst_fn); | 331 | bb_perror_msg_and_die("cannot stat '%s'", dst_fn); |
332 | } | 332 | } |
333 | i = 'y'; | 333 | i = 'y'; |
334 | } else { /* File already exists */ | 334 | } else { /* File already exists */ |
@@ -345,7 +345,7 @@ int unzip_main(int argc, char **argv) | |||
345 | i = key_buf[0]; | 345 | i = key_buf[0]; |
346 | } | 346 | } |
347 | } else { /* File is not regular file */ | 347 | } else { /* File is not regular file */ |
348 | bb_error_msg_and_die("'%s' exists but is not regular file",dst_fn); | 348 | bb_error_msg_and_die("'%s' exists but is not regular file", dst_fn); |
349 | } | 349 | } |
350 | } | 350 | } |
351 | } | 351 | } |
diff --git a/e2fsprogs/old_e2fsprogs/blkid/probe.c b/e2fsprogs/old_e2fsprogs/blkid/probe.c index 453b4d04a..48b240e98 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/probe.c +++ b/e2fsprogs/old_e2fsprogs/blkid/probe.c | |||
@@ -429,9 +429,9 @@ static int probe_ocfs(int fd __BLKID_ATTR((unused)), | |||
429 | 429 | ||
430 | major = ocfsmajor(ovh); | 430 | major = ocfsmajor(ovh); |
431 | if (major == 1) | 431 | if (major == 1) |
432 | blkid_set_tag(dev,"SEC_TYPE","ocfs1",sizeof("ocfs1")); | 432 | blkid_set_tag(dev, "SEC_TYPE", "ocfs1", sizeof("ocfs1")); |
433 | else if (major >= 9) | 433 | else if (major >= 9) |
434 | blkid_set_tag(dev,"SEC_TYPE","ntocfs",sizeof("ntocfs")); | 434 | blkid_set_tag(dev, "SEC_TYPE", "ntocfs", sizeof("ntocfs")); |
435 | 435 | ||
436 | blkid_set_tag(dev, "LABEL", (const char*)ovl.label, ocfslabellen(ovl)); | 436 | blkid_set_tag(dev, "LABEL", (const char*)ovl.label, ocfslabellen(ovl)); |
437 | blkid_set_tag(dev, "MOUNT", (const char*)ovh.mount, ocfsmountlen(ovh)); | 437 | blkid_set_tag(dev, "MOUNT", (const char*)ovh.mount, ocfsmountlen(ovh)); |
diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c index 89b5223b7..e16fe93e8 100644 --- a/e2fsprogs/old_e2fsprogs/mke2fs.c +++ b/e2fsprogs/old_e2fsprogs/mke2fs.c | |||
@@ -176,7 +176,7 @@ static void mke2fs_error_msg_and_die(int retval, const char *fmt, ...) | |||
176 | 176 | ||
177 | if (retval) { | 177 | if (retval) { |
178 | va_start(ap, fmt); | 178 | va_start(ap, fmt); |
179 | fprintf(stderr,"\nCould not "); | 179 | fprintf(stderr, "\nCould not "); |
180 | vfprintf(stderr, fmt, ap); | 180 | vfprintf(stderr, fmt, ap); |
181 | fprintf(stderr, "\n"); | 181 | fprintf(stderr, "\n"); |
182 | va_end(ap); | 182 | va_end(ap); |
@@ -209,7 +209,7 @@ static void mke2fs_warning_msg(int retval, char *fmt, ... ) | |||
209 | 209 | ||
210 | if (retval) { | 210 | if (retval) { |
211 | va_start(ap, fmt); | 211 | va_start(ap, fmt); |
212 | fprintf(stderr,"\nWarning: "); | 212 | fprintf(stderr, "\nWarning: "); |
213 | vfprintf(stderr, fmt, ap); | 213 | vfprintf(stderr, fmt, ap); |
214 | fprintf(stderr, "\n"); | 214 | fprintf(stderr, "\n"); |
215 | va_end(ap); | 215 | va_end(ap); |
diff --git a/editors/patch.c b/editors/patch.c index 1c9e97005..2bc594d16 100644 --- a/editors/patch.c +++ b/editors/patch.c | |||
@@ -50,7 +50,7 @@ static char *extract_filename(char *line, int patch_level, const char *pat) | |||
50 | 50 | ||
51 | if (strncmp(line, pat, 4) == 0) { | 51 | if (strncmp(line, pat, 4) == 0) { |
52 | /* Terminate string at end of source filename */ | 52 | /* Terminate string at end of source filename */ |
53 | line[strcspn(line,"\t\n\r")] = '\0'; | 53 | line[strcspn(line, "\t\n\r")] = '\0'; |
54 | 54 | ||
55 | /* Skip over (patch_level) number of leading directories */ | 55 | /* Skip over (patch_level) number of leading directories */ |
56 | while (patch_level--) { | 56 | while (patch_level--) { |
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 782457ac7..ffc595ac9 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c | |||
@@ -1091,7 +1091,7 @@ static int get_uid_gid(int flag, const char *string) | |||
1091 | msg = "group"; | 1091 | msg = "group"; |
1092 | 1092 | ||
1093 | if (ENABLE_DEVFSD_VERBOSE) | 1093 | if (ENABLE_DEVFSD_VERBOSE) |
1094 | msg_logger(LOG_ERR,"unknown %s: %s, defaulting to %cid=0", msg, string, msg[0]); | 1094 | msg_logger(LOG_ERR, "unknown %s: %s, defaulting to %cid=0", msg, string, msg[0]); |
1095 | return 0; | 1095 | return 0; |
1096 | }/* End Function get_uid_gid */ | 1096 | }/* End Function get_uid_gid */ |
1097 | 1097 | ||
@@ -1732,7 +1732,7 @@ static const char *expand_variable(char *buffer, unsigned int length, | |||
1732 | --open_braces; | 1732 | --open_braces; |
1733 | break; | 1733 | break; |
1734 | case '\0': | 1734 | case '\0': |
1735 | info_logger(LOG_INFO,"\"}\" not found in: %s", input); | 1735 | info_logger(LOG_INFO, "\"}\" not found in: %s", input); |
1736 | return NULL; | 1736 | return NULL; |
1737 | default: | 1737 | default: |
1738 | break; | 1738 | break; |
diff --git a/modutils/insmod.c b/modutils/insmod.c index 3fbb02b75..4ac1a1e1b 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
@@ -2893,7 +2893,7 @@ new_init_module(const char *m_name, struct obj_file *f, unsigned long m_size) | |||
2893 | 2893 | ||
2894 | sec = obj_find_section(f, ".this"); | 2894 | sec = obj_find_section(f, ".this"); |
2895 | if (!sec || !sec->contents) { | 2895 | if (!sec || !sec->contents) { |
2896 | bb_perror_msg_and_die("corrupt module %s?",m_name); | 2896 | bb_perror_msg_and_die("corrupt module %s?", m_name); |
2897 | } | 2897 | } |
2898 | module = (struct new_module *) sec->contents; | 2898 | module = (struct new_module *) sec->contents; |
2899 | m_addr = sec->header.sh_addr; | 2899 | m_addr = sec->header.sh_addr; |
diff --git a/shell/bbsh.c b/shell/bbsh.c index 5386bb097..3be64eec7 100644 --- a/shell/bbsh.c +++ b/shell/bbsh.c | |||
@@ -167,7 +167,7 @@ static int run_pipeline(struct pipeline *line) | |||
167 | if (!pid) { | 167 | if (!pid) { |
168 | run_applet_and_exit(cmd->argv[0],cmd->argc,cmd->argv); | 168 | run_applet_and_exit(cmd->argv[0],cmd->argc,cmd->argv); |
169 | execvp(cmd->argv[0],cmd->argv); | 169 | execvp(cmd->argv[0],cmd->argv); |
170 | printf("No %s",cmd->argv[0]); | 170 | printf("No %s", cmd->argv[0]); |
171 | exit(EXIT_FAILURE); | 171 | exit(EXIT_FAILURE); |
172 | } else waitpid(pid, &status, 0); | 172 | } else waitpid(pid, &status, 0); |
173 | } | 173 | } |
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 5871a065a..4034ca555 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c | |||
@@ -1807,7 +1807,7 @@ check_consistency(const struct partition *p, int partition) | |||
1807 | printf("Partition %d has different physical/logical " | 1807 | printf("Partition %d has different physical/logical " |
1808 | "beginnings (non-Linux?):\n", partition + 1); | 1808 | "beginnings (non-Linux?):\n", partition + 1); |
1809 | printf(" phys=(%d, %d, %d) ", pbc, pbh, pbs); | 1809 | printf(" phys=(%d, %d, %d) ", pbc, pbh, pbs); |
1810 | printf("logical=(%d, %d, %d)\n",lbc, lbh, lbs); | 1810 | printf("logical=(%d, %d, %d)\n", lbc, lbh, lbs); |
1811 | } | 1811 | } |
1812 | 1812 | ||
1813 | /* Same physical / logical ending? */ | 1813 | /* Same physical / logical ending? */ |
diff --git a/util-linux/getopt.c b/util-linux/getopt.c index e3b4ca625..bdf5f9716 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c | |||
@@ -255,9 +255,9 @@ static struct option *add_long_options(struct option *long_options, char *option | |||
255 | 255 | ||
256 | static void set_shell(const char *new_shell) | 256 | static void set_shell(const char *new_shell) |
257 | { | 257 | { |
258 | if (!strcmp(new_shell,"bash") || !strcmp(new_shell,"sh")) | 258 | if (!strcmp(new_shell, "bash") || !strcmp(new_shell, "sh")) |
259 | return; | 259 | return; |
260 | if (!strcmp(new_shell,"tcsh") || !strcmp(new_shell,"csh")) | 260 | if (!strcmp(new_shell, "tcsh") || !strcmp(new_shell, "csh")) |
261 | option_mask32 |= SHELL_IS_TCSH; | 261 | option_mask32 |= SHELL_IS_TCSH; |
262 | else | 262 | else |
263 | bb_error_msg("unknown shell '%s', assuming bash", new_shell); | 263 | bb_error_msg("unknown shell '%s', assuming bash", new_shell); |
diff --git a/util-linux/volume_id/util.c b/util-linux/volume_id/util.c index 240b3c1e3..315d75ca6 100644 --- a/util-linux/volume_id/util.c +++ b/util-linux/volume_id/util.c | |||
@@ -165,12 +165,12 @@ set: | |||
165 | buf[3], buf[2], buf[1], buf[0]); | 165 | buf[3], buf[2], buf[1], buf[0]); |
166 | break; | 166 | break; |
167 | case UUID_NTFS: | 167 | case UUID_NTFS: |
168 | sprintf(id->uuid,"%02X%02X%02X%02X%02X%02X%02X%02X", | 168 | sprintf(id->uuid, "%02X%02X%02X%02X%02X%02X%02X%02X", |
169 | buf[7], buf[6], buf[5], buf[4], | 169 | buf[7], buf[6], buf[5], buf[4], |
170 | buf[3], buf[2], buf[1], buf[0]); | 170 | buf[3], buf[2], buf[1], buf[0]); |
171 | break; | 171 | break; |
172 | case UUID_HFS: | 172 | case UUID_HFS: |
173 | sprintf(id->uuid,"%02X%02X%02X%02X%02X%02X%02X%02X", | 173 | sprintf(id->uuid, "%02X%02X%02X%02X%02X%02X%02X%02X", |
174 | buf[0], buf[1], buf[2], buf[3], | 174 | buf[0], buf[1], buf[2], buf[3], |
175 | buf[4], buf[5], buf[6], buf[7]); | 175 | buf[4], buf[5], buf[6], buf[7]); |
176 | break; | 176 | break; |