svn commit: trunk/busybox: archival archival/libunarchive e2fsprogs etc...
vda at busybox.net
vda at busybox.net
Thu Jun 26 14:32:58 UTC 2008
Author: vda
Date: 2008-06-26 07:32:57 -0700 (Thu, 26 Jun 2008)
New Revision: 22520
Log:
style fixes, no code changes
Modified:
trunk/busybox/archival/libunarchive/decompress_bunzip2.c
trunk/busybox/archival/unzip.c
trunk/busybox/e2fsprogs/old_e2fsprogs/blkid/probe.c
trunk/busybox/e2fsprogs/old_e2fsprogs/mke2fs.c
trunk/busybox/editors/patch.c
trunk/busybox/miscutils/devfsd.c
trunk/busybox/modutils/insmod.c
trunk/busybox/shell/bbsh.c
trunk/busybox/util-linux/fdisk.c
trunk/busybox/util-linux/getopt.c
trunk/busybox/util-linux/volume_id/util.c
Changeset:
Modified: trunk/busybox/archival/libunarchive/decompress_bunzip2.c
===================================================================
--- trunk/busybox/archival/libunarchive/decompress_bunzip2.c 2008-06-26 14:04:39 UTC (rev 22519)
+++ trunk/busybox/archival/libunarchive/decompress_bunzip2.c 2008-06-26 14:32:57 UTC (rev 22520)
@@ -761,9 +761,9 @@
char c;
if (i < 0)
- fprintf(stderr,"%s\n", bunzip_errors[-i]);
+ fprintf(stderr, "%s\n", bunzip_errors[-i]);
else if (read(STDIN_FILENO, &c, 1))
- fprintf(stderr,"Trailing garbage ignored\n");
+ fprintf(stderr, "Trailing garbage ignored\n");
return -i;
}
#endif
Modified: trunk/busybox/archival/unzip.c
===================================================================
--- trunk/busybox/archival/unzip.c 2008-06-26 14:04:39 UTC (rev 22519)
+++ trunk/busybox/archival/unzip.c 2008-06-26 14:32:57 UTC (rev 22520)
@@ -308,7 +308,7 @@
} else if (last_char_is(dst_fn, '/')) { /* Extract directory */
if (stat(dst_fn, &stat_buf) == -1) {
if (errno != ENOENT) {
- bb_perror_msg_and_die("cannot stat '%s'",dst_fn);
+ bb_perror_msg_and_die("cannot stat '%s'", dst_fn);
}
if (verbose) {
printf(" creating: %s\n", dst_fn);
@@ -328,7 +328,7 @@
_check_file:
if (stat(dst_fn, &stat_buf) == -1) { /* File does not exist */
if (errno != ENOENT) {
- bb_perror_msg_and_die("cannot stat '%s'",dst_fn);
+ bb_perror_msg_and_die("cannot stat '%s'", dst_fn);
}
i = 'y';
} else { /* File already exists */
@@ -345,7 +345,7 @@
i = key_buf[0];
}
} else { /* File is not regular file */
- bb_error_msg_and_die("'%s' exists but is not regular file",dst_fn);
+ bb_error_msg_and_die("'%s' exists but is not regular file", dst_fn);
}
}
}
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/blkid/probe.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/blkid/probe.c 2008-06-26 14:04:39 UTC (rev 22519)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/blkid/probe.c 2008-06-26 14:32:57 UTC (rev 22520)
@@ -429,9 +429,9 @@
major = ocfsmajor(ovh);
if (major == 1)
- blkid_set_tag(dev,"SEC_TYPE","ocfs1",sizeof("ocfs1"));
+ blkid_set_tag(dev, "SEC_TYPE", "ocfs1", sizeof("ocfs1"));
else if (major >= 9)
- blkid_set_tag(dev,"SEC_TYPE","ntocfs",sizeof("ntocfs"));
+ blkid_set_tag(dev, "SEC_TYPE", "ntocfs", sizeof("ntocfs"));
blkid_set_tag(dev, "LABEL", (const char*)ovl.label, ocfslabellen(ovl));
blkid_set_tag(dev, "MOUNT", (const char*)ovh.mount, ocfsmountlen(ovh));
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/mke2fs.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/mke2fs.c 2008-06-26 14:04:39 UTC (rev 22519)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/mke2fs.c 2008-06-26 14:32:57 UTC (rev 22520)
@@ -176,7 +176,7 @@
if (retval) {
va_start(ap, fmt);
- fprintf(stderr,"\nCould not ");
+ fprintf(stderr, "\nCould not ");
vfprintf(stderr, fmt, ap);
fprintf(stderr, "\n");
va_end(ap);
@@ -209,7 +209,7 @@
if (retval) {
va_start(ap, fmt);
- fprintf(stderr,"\nWarning: ");
+ fprintf(stderr, "\nWarning: ");
vfprintf(stderr, fmt, ap);
fprintf(stderr, "\n");
va_end(ap);
Modified: trunk/busybox/editors/patch.c
===================================================================
--- trunk/busybox/editors/patch.c 2008-06-26 14:04:39 UTC (rev 22519)
+++ trunk/busybox/editors/patch.c 2008-06-26 14:32:57 UTC (rev 22520)
@@ -50,7 +50,7 @@
if (strncmp(line, pat, 4) == 0) {
/* Terminate string at end of source filename */
- line[strcspn(line,"\t\n\r")] = '\0';
+ line[strcspn(line, "\t\n\r")] = '\0';
/* Skip over (patch_level) number of leading directories */
while (patch_level--) {
Modified: trunk/busybox/miscutils/devfsd.c
===================================================================
--- trunk/busybox/miscutils/devfsd.c 2008-06-26 14:04:39 UTC (rev 22519)
+++ trunk/busybox/miscutils/devfsd.c 2008-06-26 14:32:57 UTC (rev 22520)
@@ -1091,7 +1091,7 @@
msg = "group";
if (ENABLE_DEVFSD_VERBOSE)
- msg_logger(LOG_ERR,"unknown %s: %s, defaulting to %cid=0", msg, string, msg[0]);
+ msg_logger(LOG_ERR, "unknown %s: %s, defaulting to %cid=0", msg, string, msg[0]);
return 0;
}/* End Function get_uid_gid */
@@ -1732,7 +1732,7 @@
--open_braces;
break;
case '\0':
- info_logger(LOG_INFO,"\"}\" not found in: %s", input);
+ info_logger(LOG_INFO, "\"}\" not found in: %s", input);
return NULL;
default:
break;
Modified: trunk/busybox/modutils/insmod.c
===================================================================
--- trunk/busybox/modutils/insmod.c 2008-06-26 14:04:39 UTC (rev 22519)
+++ trunk/busybox/modutils/insmod.c 2008-06-26 14:32:57 UTC (rev 22520)
@@ -2893,7 +2893,7 @@
sec = obj_find_section(f, ".this");
if (!sec || !sec->contents) {
- bb_perror_msg_and_die("corrupt module %s?",m_name);
+ bb_perror_msg_and_die("corrupt module %s?", m_name);
}
module = (struct new_module *) sec->contents;
m_addr = sec->header.sh_addr;
Modified: trunk/busybox/shell/bbsh.c
===================================================================
--- trunk/busybox/shell/bbsh.c 2008-06-26 14:04:39 UTC (rev 22519)
+++ trunk/busybox/shell/bbsh.c 2008-06-26 14:32:57 UTC (rev 22520)
@@ -167,7 +167,7 @@
if (!pid) {
run_applet_and_exit(cmd->argv[0],cmd->argc,cmd->argv);
execvp(cmd->argv[0],cmd->argv);
- printf("No %s",cmd->argv[0]);
+ printf("No %s", cmd->argv[0]);
exit(EXIT_FAILURE);
} else waitpid(pid, &status, 0);
}
Modified: trunk/busybox/util-linux/fdisk.c
===================================================================
--- trunk/busybox/util-linux/fdisk.c 2008-06-26 14:04:39 UTC (rev 22519)
+++ trunk/busybox/util-linux/fdisk.c 2008-06-26 14:32:57 UTC (rev 22520)
@@ -1807,7 +1807,7 @@
printf("Partition %d has different physical/logical "
"beginnings (non-Linux?):\n", partition + 1);
printf(" phys=(%d, %d, %d) ", pbc, pbh, pbs);
- printf("logical=(%d, %d, %d)\n",lbc, lbh, lbs);
+ printf("logical=(%d, %d, %d)\n", lbc, lbh, lbs);
}
/* Same physical / logical ending? */
Modified: trunk/busybox/util-linux/getopt.c
===================================================================
--- trunk/busybox/util-linux/getopt.c 2008-06-26 14:04:39 UTC (rev 22519)
+++ trunk/busybox/util-linux/getopt.c 2008-06-26 14:32:57 UTC (rev 22520)
@@ -255,9 +255,9 @@
static void set_shell(const char *new_shell)
{
- if (!strcmp(new_shell,"bash") || !strcmp(new_shell,"sh"))
+ if (!strcmp(new_shell, "bash") || !strcmp(new_shell, "sh"))
return;
- if (!strcmp(new_shell,"tcsh") || !strcmp(new_shell,"csh"))
+ if (!strcmp(new_shell, "tcsh") || !strcmp(new_shell, "csh"))
option_mask32 |= SHELL_IS_TCSH;
else
bb_error_msg("unknown shell '%s', assuming bash", new_shell);
Modified: trunk/busybox/util-linux/volume_id/util.c
===================================================================
--- trunk/busybox/util-linux/volume_id/util.c 2008-06-26 14:04:39 UTC (rev 22519)
+++ trunk/busybox/util-linux/volume_id/util.c 2008-06-26 14:32:57 UTC (rev 22520)
@@ -165,12 +165,12 @@
buf[3], buf[2], buf[1], buf[0]);
break;
case UUID_NTFS:
- sprintf(id->uuid,"%02X%02X%02X%02X%02X%02X%02X%02X",
+ sprintf(id->uuid, "%02X%02X%02X%02X%02X%02X%02X%02X",
buf[7], buf[6], buf[5], buf[4],
buf[3], buf[2], buf[1], buf[0]);
break;
case UUID_HFS:
- sprintf(id->uuid,"%02X%02X%02X%02X%02X%02X%02X%02X",
+ sprintf(id->uuid, "%02X%02X%02X%02X%02X%02X%02X%02X",
buf[0], buf[1], buf[2], buf[3],
buf[4], buf[5], buf[6], buf[7]);
break;
More information about the busybox-cvs
mailing list