svn commit: trunk/busybox: applets archival archival/libunarchive c etc...
vda at busybox.net
vda at busybox.net
Sat Jul 21 15:08:10 UTC 2007
Author: vda
Date: 2007-07-21 08:08:09 -0700 (Sat, 21 Jul 2007)
New Revision: 19191
Log:
style fix (stray space before ';')
Modified:
trunk/busybox/applets/install.sh
trunk/busybox/archival/dpkg.c
trunk/busybox/archival/gzip.c
trunk/busybox/archival/libunarchive/get_header_tar.c
trunk/busybox/coreutils/wc.c
trunk/busybox/e2fsprogs/old_e2fsprogs/chattr.c
trunk/busybox/e2fsprogs/old_e2fsprogs/e2fsck.c
trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/badblocks.c
trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/block.c
trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/fileio.c
trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/openfs.c
trunk/busybox/e2fsprogs/old_e2fsprogs/fsck.c
trunk/busybox/e2fsprogs/old_e2fsprogs/mke2fs.c
trunk/busybox/editors/diff.c
trunk/busybox/editors/vi.c
trunk/busybox/include/usage.h
trunk/busybox/include/xatonum.h
trunk/busybox/libbb/human_readable.c
trunk/busybox/libbb/speed_table.c
trunk/busybox/libpwdgrp/pwd_grp.c
trunk/busybox/miscutils/devfsd.c
trunk/busybox/networking/interface.c
trunk/busybox/networking/libiproute/ip_parse_common_args.c
trunk/busybox/networking/libiproute/ipaddress.c
trunk/busybox/shell/ash.c
trunk/busybox/util-linux/fdisk.c
trunk/busybox/util-linux/fdisk_sgi.c
trunk/busybox/util-linux/fdisk_sun.c
Changeset:
Modified: trunk/busybox/applets/install.sh
===================================================================
--- trunk/busybox/applets/install.sh 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/applets/install.sh 2007-07-21 15:08:09 UTC (rev 19191)
@@ -43,7 +43,7 @@
inode=`ls -i "$prefix/bin/busybox" | awk '{print $1}'`
sub_shell_it=`
cd "$prefix"
- for d in usr/sbin usr/bin sbin bin ; do
+ for d in usr/sbin usr/bin sbin bin; do
pd=$PWD
if [ -d "$d" ]; then
cd $d
@@ -58,7 +58,7 @@
mkdir -p $prefix/bin || exit 1
install -m 755 busybox $prefix/bin/busybox || exit 1
-for i in $h ; do
+for i in $h; do
appdir=`dirname $i`
mkdir -p $prefix/$appdir || exit 1
if [ "$2" = "--hardlinks" ]; then
Modified: trunk/busybox/archival/dpkg.c
===================================================================
--- trunk/busybox/archival/dpkg.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/archival/dpkg.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -712,7 +712,7 @@
static const char *describe_status(int status_num)
{
- int status_want, status_state ;
+ int status_want, status_state;
if (status_hashtable[status_num] == NULL || status_hashtable[status_num]->status == 0)
return "is not installed or flagged to be installed";
Modified: trunk/busybox/archival/gzip.c
===================================================================
--- trunk/busybox/archival/gzip.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/archival/gzip.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -49,10 +49,10 @@
#ifdef DEBUG
# define Assert(cond,msg) { if (!(cond)) bb_error_msg(msg); }
# define Trace(x) fprintf x
-# define Tracev(x) {if (verbose) fprintf x ;}
-# define Tracevv(x) {if (verbose > 1) fprintf x ;}
-# define Tracec(c,x) {if (verbose && (c)) fprintf x ;}
-# define Tracecv(c,x) {if (verbose > 1 && (c)) fprintf x ;}
+# define Tracev(x) {if (verbose) fprintf x; }
+# define Tracevv(x) {if (verbose > 1) fprintf x; }
+# define Tracec(c,x) {if (verbose && (c)) fprintf x; }
+# define Tracecv(c,x) {if (verbose > 1 && (c)) fprintf x; }
#else
# define Assert(cond,msg)
# define Trace(x)
Modified: trunk/busybox/archival/libunarchive/get_header_tar.c
===================================================================
--- trunk/busybox/archival/libunarchive/get_header_tar.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/archival/libunarchive/get_header_tar.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -122,13 +122,13 @@
sum_s = ' ' * sizeof(tar.chksum);
#endif
sum_u = ' ' * sizeof(tar.chksum);
- for (i = 0; i < 148 ; i++) {
+ for (i = 0; i < 148; i++) {
sum_u += ((unsigned char*)&tar)[i];
#if ENABLE_FEATURE_TAR_OLDSUN_COMPATIBILITY
sum_s += ((signed char*)&tar)[i];
#endif
}
- for (i = 156; i < 512 ; i++) {
+ for (i = 156; i < 512; i++) {
sum_u += ((unsigned char*)&tar)[i];
#if ENABLE_FEATURE_TAR_OLDSUN_COMPATIBILITY
sum_s += ((signed char*)&tar)[i];
Modified: trunk/busybox/coreutils/wc.c
===================================================================
--- trunk/busybox/coreutils/wc.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/coreutils/wc.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -36,7 +36,7 @@
* (adapted from example in gnu wc.c)
*
* echo hello > /tmp/testfile &&
- * (dd ibs=1k skip=1 count=0 &> /dev/null ; wc -c) < /tmp/testfile
+ * (dd ibs=1k skip=1 count=0 &> /dev/null; wc -c) < /tmp/testfile
*
* for which 'wc -c' should output '0'.
*/
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/chattr.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/chattr.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/chattr.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -101,7 +101,7 @@
} else
return EOF;
- for (; *arg ; ++arg)
+ for (; *arg; ++arg)
(*fl) |= get_flag(*arg);
return 1;
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/e2fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/e2fsck.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/e2fsck.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -4701,7 +4701,7 @@
else {
di = (struct dup_inode *) e2fsck_allocate_memory(ctx,
sizeof(struct dup_inode), "duplicate inode header");
- di->dir = (ino == EXT2_ROOT_INO) ? EXT2_ROOT_INO : 0 ;
+ di->dir = (ino == EXT2_ROOT_INO) ? EXT2_ROOT_INO : 0;
di->num_dupblocks = 0;
di->block_list = 0;
di->inode = *inode;
@@ -12490,7 +12490,7 @@
sb = (struct ext2_super_block *) buf;
for (blocksize = EXT2_MIN_BLOCK_SIZE;
- blocksize <= EXT2_MAX_BLOCK_SIZE ; blocksize *= 2) {
+ blocksize <= EXT2_MAX_BLOCK_SIZE; blocksize *= 2) {
superblock = blocksize*8;
if (blocksize == 1024)
superblock++;
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/badblocks.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/badblocks.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/badblocks.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -223,7 +223,7 @@
if (remloc < 0)
return -1;
- for (i = remloc ; i < bb->num-1; i++)
+ for (i = remloc; i < bb->num - 1; i++)
bb->list[i] = bb->list[i+1];
bb->num--;
return 0;
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/block.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/block.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/block.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -343,7 +343,7 @@
/*
* Iterate over normal data blocks
*/
- for (i = 0; i < EXT2_NDIR_BLOCKS ; i++, ctx.bcount++) {
+ for (i = 0; i < EXT2_NDIR_BLOCKS; i++, ctx.bcount++) {
if (blocks[i] || (flags & BLOCK_FLAG_APPEND)) {
ret |= (*ctx.func)(fs, &blocks[i],
ctx.bcount, 0, i, priv_data);
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/fileio.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/fileio.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/fileio.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -228,7 +228,7 @@
c = fs->blocksize - start;
if (c > wanted)
c = wanted;
- left = EXT2_I_SIZE(&file->inode) - file->pos ;
+ left = EXT2_I_SIZE(&file->inode) - file->pos;
if (c > left)
c = left;
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/openfs.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/openfs.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/ext2fs/openfs.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -273,7 +273,7 @@
group_block = fs->super->s_first_data_block;
dest = (char *) fs->group_desc;
groups_per_block = fs->blocksize / sizeof(struct ext2_group_desc);
- for (i=0 ; i < fs->desc_blocks; i++) {
+ for (i = 0; i < fs->desc_blocks; i++) {
blk = ext2fs_descriptor_block_loc(fs, group_block, i);
retval = io_channel_read_blk(fs->io, blk, 1, dest);
if (retval)
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/fsck.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/fsck.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/fsck.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -1357,7 +1357,7 @@
interactive++;
return check_all();
}
- for (i = 0 ; i < num_devices; i++) {
+ for (i = 0; i < num_devices; i++) {
if (cancel_requested) {
if (!kill_sent) {
kill_all(SIGTERM);
Modified: trunk/busybox/e2fsprogs/old_e2fsprogs/mke2fs.c
===================================================================
--- trunk/busybox/e2fsprogs/old_e2fsprogs/mke2fs.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/e2fsprogs/old_e2fsprogs/mke2fs.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -59,14 +59,14 @@
static char *volume_label;
static char *mount_dir;
static char *journal_device = NULL;
-static int sync_kludge; /* Set using the MKE2FS_SYNC env. option */
+static int sync_kludge; /* Set using the MKE2FS_SYNC env. option */
static int sys_page_size = 4096;
static int linux_version_code = 0;
static int int_log2(int arg)
{
- int l = 0;
+ int l = 0;
arg >>= 1;
while (arg) {
@@ -80,7 +80,7 @@
{
int l;
- for (l=0; arg ; l++)
+ for (l = 0; arg; l++)
arg = arg / 10;
return l;
}
@@ -1226,7 +1226,7 @@
* don't check all the filesystems at the same time. We use a
* kludgy hack of using the UUID to derive a random jitter value.
*/
- for (i = 0, val = 0 ; i < sizeof(fs->super->s_uuid); i++)
+ for (i = 0, val = 0; i < sizeof(fs->super->s_uuid); i++)
val += fs->super->s_uuid[i];
fs->super->s_max_mnt_count += val % EXT2_DFL_MAX_MNT_COUNT;
Modified: trunk/busybox/editors/diff.c
===================================================================
--- trunk/busybox/editors/diff.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/editors/diff.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -328,11 +328,11 @@
for (pref = 0; pref < len[0] && pref < len[1] &&
file[0][pref + 1].value == file[1][pref + 1].value; pref++)
- ;
+ continue;
for (suff = 0; suff < len[0] - pref && suff < len[1] - pref &&
file[0][len[0] - suff].value == file[1][len[1] - suff].value;
suff++)
- ;
+ continue;
for (j = 0; j < 2; j++) {
sfile[j] = file[j] + pref;
slen[j] = len[j] - pref - suff;
Modified: trunk/busybox/editors/vi.c
===================================================================
--- trunk/busybox/editors/vi.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/editors/vi.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -2800,7 +2800,7 @@
format_line(buf, tp, li);
// skip to the end of the current text[] line
- while (tp < end && *tp++ != '\n') /*no-op*/ ;
+ while (tp < end && *tp++ != '\n') /*no-op*/;
// see if there are any changes between vitual screen and buf
changed = FALSE; // assume no change
Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/include/usage.h 2007-07-21 15:08:09 UTC (rev 19191)
@@ -417,7 +417,7 @@
" -m show min and max priorities"
#define chrt_example_usage \
- "$ chrt -r 4 sleep 900 ; x=$!\n" \
+ "$ chrt -r 4 sleep 900; x=$!\n" \
"$ chrt -f -p 3 $x\n" \
"You need CAP_SYS_NICE privileges to set scheduling attributes of a process"
@@ -1105,19 +1105,19 @@
"#!/bin/sh\n" \
"GETOPT=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \\\n" \
" -n 'example.busybox' -- \"$@\"`\n" \
- "if [ $? != 0 ] ; then exit 1 ; fi\n" \
+ "if [ $? != 0 ]; then exit 1; fi\n" \
"eval set -- \"$GETOPT\"\n" \
- "while true ; do\n" \
+ "while true; do\n" \
" case $1 in\n" \
- " -a|--a-long) echo \"Option a\" ; shift ;;\n" \
- " -b|--b-long) echo \"Option b, argument '$2'\" ; shift 2 ;;\n" \
+ " -a|--a-long) echo \"Option a\"; shift;;\n" \
+ " -b|--b-long) echo \"Option b, argument '$2'\"; shift 2;;\n" \
" -c|--c-long)\n" \
" case \"$2\" in\n" \
- " \"\") echo \"Option c, no argument\"; shift 2 ;;\n" \
- " *) echo \"Option c, argument '$2'\" ; shift 2 ;;\n" \
- " esac ;;\n" \
- " --) shift ; break ;;\n" \
- " *) echo \"Internal error!\" ; exit 1 ;;\n" \
+ " \"\") echo \"Option c, no argument\"; shift 2;;\n" \
+ " *) echo \"Option c, argument '$2'\"; shift 2;;\n" \
+ " esac;;\n" \
+ " --) shift; break;;\n" \
+ " *) echo \"Internal error!\"; exit 1;;\n" \
" esac\n" \
"done\n"
@@ -2867,10 +2867,10 @@
"$ run-parts -a stop=now /etc/init.d\n\n" \
"Let's assume you have a script foo/dosomething:\n" \
"#!/bin/sh\n" \
- "for i in $*; do eval $i; done ; unset i\n" \
+ "for i in $*; do eval $i; done; unset i\n" \
"case \"$1\" in\n" \
- "start*) echo starting something ;;\n" \
- "stop*) set -x ; shutdown -h $stop ;;\n" \
+ "start*) echo starting something;;\n" \
+ "stop*) set -x; shutdown -h $stop;;\n" \
"esac\n\n" \
"Running this yields:\n" \
"$run-parts -a stop=+4m foo/\n" \
Modified: trunk/busybox/include/xatonum.h
===================================================================
--- trunk/busybox/include/xatonum.h 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/include/xatonum.h 2007-07-21 15:08:09 UTC (rev 19191)
@@ -18,7 +18,7 @@
unsigned type xato##UT##_range(const char *str, unsigned type l, unsigned type u); \
unsigned type xato##UT##_sfx(const char *str, const struct suffix_mult *sfx); \
unsigned type xato##UT(const char *str); \
-type xstrto##T##_range_sfx(const char *str, int b, type l, type u, const struct suffix_mult *sfx) ;\
+type xstrto##T##_range_sfx(const char *str, int b, type l, type u, const struct suffix_mult *sfx); \
type xstrto##T##_range(const char *str, int b, type l, type u); \
type xato##T##_range_sfx(const char *str, type l, type u, const struct suffix_mult *sfx); \
type xato##T##_range(const char *str, type l, type u); \
Modified: trunk/busybox/libbb/human_readable.c
===================================================================
--- trunk/busybox/libbb/human_readable.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/libbb/human_readable.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -75,7 +75,7 @@
if (frac >= 5) {
++val;
}
- f = "%llu%*c" /* fmt_no_tenths */ ;
+ f = "%llu%*c" /* fmt_no_tenths */;
frac = 1;
}
#endif
Modified: trunk/busybox/libbb/speed_table.c
===================================================================
--- trunk/busybox/libbb/speed_table.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/libbb/speed_table.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -94,7 +94,7 @@
unsigned long v;
speed_t s;
- for (v = 0 ; v < 500000 ; v++) {
+ for (v = 0 ; v < 500000; v++) {
s = tty_value_to_baud(v);
if (s == (speed_t) -1) {
continue;
@@ -104,7 +104,7 @@
printf("-------------------------------\n");
- for (s = 0 ; s < 010017+1 ; s++) {
+ for (s = 0 ; s < 010017+1; s++) {
v = tty_baud_to_value(s);
if (!v) {
continue;
Modified: trunk/busybox/libpwdgrp/pwd_grp.c
===================================================================
--- trunk/busybox/libpwdgrp/pwd_grp.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/libpwdgrp/pwd_grp.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -642,7 +642,7 @@
while (!bb__pgsreader(bb__parsegrent, &group, buff, sizeof(buff), grfile)) {
assert(group.gr_mem); /* Must have at least a NULL terminator. */
if (group.gr_gid != gid) {
- for (m=group.gr_mem ; *m ; m++) {
+ for (m = group.gr_mem; *m; m++) {
if (!strcmp(*m, user)) {
if (!(num_groups & 7)) {
gid_t *tmp = (gid_t *)
@@ -759,7 +759,7 @@
goto DO_UNLOCK;
}
- for (i=0 ; i < sizeof(_sp_off) ; i++) {
+ for (i = 0; i < sizeof(_sp_off); i++) {
f = ld_format;
x = *(const long *)(((const char *) p) + _sp_off[i]);
if (x == -1) {
Modified: trunk/busybox/miscutils/devfsd.c
===================================================================
--- trunk/busybox/miscutils/devfsd.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/miscutils/devfsd.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -1600,7 +1600,7 @@
}
/* Someone else's home directory */
for (ptr = ++input; !isspace(ch) && (ch != '/') && (ch != '\0'); ch = *++ptr)
- /* VOID */ ;
+ /* VOID */;
len = ptr - input;
if (len >= sizeof tmp)
goto st_expr_expand_out;
@@ -1679,7 +1679,7 @@
if (ch != '{') {
/* Simple variable expansion */
for (ptr = input; isalnum(ch) || (ch == '_') || (ch == ':'); ch = *++ptr)
- /* VOID */ ;
+ /* VOID */;
len = ptr - input;
if ((size_t)len >= sizeof tmp)
goto expand_variable_out;
Modified: trunk/busybox/networking/interface.c
===================================================================
--- trunk/busybox/networking/interface.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/networking/interface.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -803,7 +803,7 @@
.type = ARPHRD_SIT,
.print = UNSPEC_print,
.suppress_null_addr = 1
-} ;
+};
#endif
static const struct hwtype *const hwtypes[] = {
Modified: trunk/busybox/networking/libiproute/ip_parse_common_args.c
===================================================================
--- trunk/busybox/networking/libiproute/ip_parse_common_args.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/networking/libiproute/ip_parse_common_args.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -82,7 +82,7 @@
argc--;
argv++;
}
- _SL_ = oneline ? '\\' : '\n' ;
+ _SL_ = oneline ? '\\' : '\n';
*argcp = argc;
*argvp = argv;
}
Modified: trunk/busybox/networking/libiproute/ipaddress.c
===================================================================
--- trunk/busybox/networking/libiproute/ipaddress.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/networking/libiproute/ipaddress.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -46,7 +46,7 @@
fprintf(fp, "<");
flags &= ~IFF_RUNNING;
#define _PF(f) if (flags&IFF_##f) { \
- flags &= ~IFF_##f ; \
+ flags &= ~IFF_##f; \
fprintf(fp, #f "%s", flags ? "," : ""); }
_PF(LOOPBACK);
_PF(BROADCAST);
Modified: trunk/busybox/shell/ash.c
===================================================================
--- trunk/busybox/shell/ash.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/shell/ash.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -11268,7 +11268,7 @@
int col, i;
out1fmt("\nBuilt-in commands:\n-------------------\n");
- for (col = 0, i = 0; i < ARRAY_SIZE(builtintab) ; i++) {
+ for (col = 0, i = 0; i < ARRAY_SIZE(builtintab); i++) {
col += out1fmt("%c%s", ((col == 0) ? '\t' : ' '),
builtintab[i].name + 1);
if (col > 60) {
Modified: trunk/busybox/util-linux/fdisk.c
===================================================================
--- trunk/busybox/util-linux/fdisk.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/util-linux/fdisk.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -1823,7 +1823,7 @@
ullong last_p_start_pos = 0, p_start_pos;
int i, last_i = 0;
- for (i = 0 ; i < partitions; i++) {
+ for (i = 0; i < partitions; i++) {
if (i == 4) {
last_i = 4;
last_p_start_pos = 0;
@@ -2041,7 +2041,7 @@
printf("\nDisk %s: %d heads, %d sectors, %d cylinders\n\n",
disk_device, heads, sectors, cylinders);
printf("Nr AF Hd Sec Cyl Hd Sec Cyl Start Size ID\n");
- for (i = 0 ; i < partitions; i++) {
+ for (i = 0; i < partitions; i++) {
pe = &ptes[i];
p = (extend ? pe->ext_pointer : pe->part_table);
if (p != NULL) {
Modified: trunk/busybox/util-linux/fdisk_sgi.c
===================================================================
--- trunk/busybox/util-linux/fdisk_sgi.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/util-linux/fdisk_sgi.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -142,7 +142,7 @@
add2freelist(unsigned int f, unsigned int l)
{
int i;
- for (i = 0; i < 17 ; i++)
+ for (i = 0; i < 17; i++)
if (freelist[i].last == 0)
break;
setfreelist(i, f, l);
@@ -153,7 +153,7 @@
{
int i;
- for (i = 0; i < 17 ; i++)
+ for (i = 0; i < 17; i++)
setfreelist(i, 0, 0);
}
@@ -162,7 +162,7 @@
{
int i;
- for (i = 0; i < 17 ; i++)
+ for (i = 0; i < 17; i++)
if (freelist[i].first <= b && freelist[i].last >= b)
return freelist[i].last;
return 0;
@@ -317,7 +317,7 @@
printf("----- partitions -----\n"
"Pt# %*s Info Start End Sectors Id System\n",
w + 2, "Device");
- for (i = 0 ; i < partitions; i++) {
+ for (i = 0; i < partitions; i++) {
if (sgi_get_num_sectors(i) || debug ) {
uint32_t start = sgi_get_start_sector(i);
uint32_t len = sgi_get_num_sectors(i);
@@ -338,7 +338,7 @@
printf("----- Bootinfo -----\nBootfile: %s\n"
"----- Directory Entries -----\n",
sgilabel->boot_file);
- for (i = 0 ; i < sgi_volumes; i++) {
+ for (i = 0; i < sgi_volumes; i++) {
if (sgilabel->directory[i].vol_file_size) {
uint32_t start = SGI_SSWAP32(sgilabel->directory[i].vol_file_start);
uint32_t len = SGI_SSWAP32(sgilabel->directory[i].vol_file_size);
Modified: trunk/busybox/util-linux/fdisk_sun.c
===================================================================
--- trunk/busybox/util-linux/fdisk_sun.c 2007-07-21 15:07:22 UTC (rev 19190)
+++ trunk/busybox/util-linux/fdisk_sun.c 2007-07-21 15:08:09 UTC (rev 19191)
@@ -647,7 +647,7 @@
printf("%*s Flag Start End Blocks Id System\n",
w + 1, "Device");
- for (i = 0 ; i < partitions; i++) {
+ for (i = 0; i < partitions; i++) {
if (sunlabel->partitions[i].num_sectors) {
uint32_t start = SUN_SSWAP32(sunlabel->partitions[i].start_cylinder) * heads * sectors;
uint32_t len = SUN_SSWAP32(sunlabel->partitions[i].num_sectors);
More information about the busybox-cvs
mailing list