diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-09-27 14:03:25 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-09-27 14:03:25 +0000 |
commit | d6855d1b5043089fc606f7e62679babb68c7cbb4 (patch) | |
tree | 8004722cf1b409fc4d988086dad179577db8c4fa /e2fsprogs | |
parent | bed22a01fb19de6e4b4c2c7d8c5953bc7aa2580e (diff) | |
download | busybox-w32-d6855d1b5043089fc606f7e62679babb68c7cbb4.tar.gz busybox-w32-d6855d1b5043089fc606f7e62679babb68c7cbb4.tar.bz2 busybox-w32-d6855d1b5043089fc606f7e62679babb68c7cbb4.zip |
style fixes, no code changes
Diffstat (limited to 'e2fsprogs')
-rw-r--r-- | e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c | 2 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/mke2fs.c | 4 | ||||
-rw-r--r-- | e2fsprogs/old_e2fsprogs/util.c | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c b/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c index f7ee8b1fb..31cc89e28 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/res_gdt.c | |||
@@ -113,7 +113,7 @@ errcode_t ext2fs_create_resize_inode(ext2_filsys fs) | |||
113 | inode_size *= fs->blocksize; | 113 | inode_size *= fs->blocksize; |
114 | inode.i_size = inode_size & 0xFFFFFFFF; | 114 | inode.i_size = inode_size & 0xFFFFFFFF; |
115 | inode.i_size_high = (inode_size >> 32) & 0xFFFFFFFF; | 115 | inode.i_size_high = (inode_size >> 32) & 0xFFFFFFFF; |
116 | if(inode.i_size_high) { | 116 | if (inode.i_size_high) { |
117 | sb->s_feature_ro_compat |= | 117 | sb->s_feature_ro_compat |= |
118 | EXT2_FEATURE_RO_COMPAT_LARGE_FILE; | 118 | EXT2_FEATURE_RO_COMPAT_LARGE_FILE; |
119 | } | 119 | } |
diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c index 852c249b1..6ffad3513 100644 --- a/e2fsprogs/old_e2fsprogs/mke2fs.c +++ b/e2fsprogs/old_e2fsprogs/mke2fs.c | |||
@@ -676,7 +676,7 @@ static int set_os(struct ext2_super_block *sb, char *os) | |||
676 | return 1; | 676 | return 1; |
677 | } | 677 | } |
678 | 678 | ||
679 | if((sb->s_creator_os = e2p_string2os(os)) >= 0) { | 679 | if ((sb->s_creator_os = e2p_string2os(os)) >= 0) { |
680 | return 1; | 680 | return 1; |
681 | } else if (!strcasecmp("GNU", os)) { | 681 | } else if (!strcasecmp("GNU", os)) { |
682 | sb->s_creator_os = EXT2_OS_HURD; | 682 | sb->s_creator_os = EXT2_OS_HURD; |
@@ -1187,7 +1187,7 @@ int mke2fs_main (int argc, char **argv) | |||
1187 | 1187 | ||
1188 | if (ENABLE_FEATURE_CLEAN_UP) | 1188 | if (ENABLE_FEATURE_CLEAN_UP) |
1189 | atexit(mke2fs_clean_up); | 1189 | atexit(mke2fs_clean_up); |
1190 | if(!PRS(argc, argv)) | 1190 | if (!PRS(argc, argv)) |
1191 | return 0; | 1191 | return 0; |
1192 | 1192 | ||
1193 | #ifdef CONFIG_TESTIO_DEBUG | 1193 | #ifdef CONFIG_TESTIO_DEBUG |
diff --git a/e2fsprogs/old_e2fsprogs/util.c b/e2fsprogs/old_e2fsprogs/util.c index b30c294b8..ce49db96a 100644 --- a/e2fsprogs/old_e2fsprogs/util.c +++ b/e2fsprogs/old_e2fsprogs/util.c | |||
@@ -37,7 +37,7 @@ void check_plausibility(const char *device, int force) | |||
37 | val = stat(device, &s); | 37 | val = stat(device, &s); |
38 | if (force) | 38 | if (force) |
39 | return; | 39 | return; |
40 | if(val == -1) | 40 | if (val == -1) |
41 | bb_perror_msg_and_die("cannot stat %s", device); | 41 | bb_perror_msg_and_die("cannot stat %s", device); |
42 | if (!S_ISBLK(s.st_mode)) { | 42 | if (!S_ISBLK(s.st_mode)) { |
43 | printf("%s is not a block special device.\n", device); | 43 | printf("%s is not a block special device.\n", device); |
@@ -220,13 +220,13 @@ void make_journal_device(char *journal_device, ext2_filsys fs, int quiet, int fo | |||
220 | fs->blocksize, io_ptr, &jfs); | 220 | fs->blocksize, io_ptr, &jfs); |
221 | if (retval) | 221 | if (retval) |
222 | bb_error_msg_and_die("cannot journal device %s", journal_device); | 222 | bb_error_msg_and_die("cannot journal device %s", journal_device); |
223 | if(!quiet) | 223 | if (!quiet) |
224 | printf("Adding journal to device %s: ", journal_device); | 224 | printf("Adding journal to device %s: ", journal_device); |
225 | fflush(stdout); | 225 | fflush(stdout); |
226 | retval = ext2fs_add_journal_device(fs, jfs); | 226 | retval = ext2fs_add_journal_device(fs, jfs); |
227 | if(retval) | 227 | if (retval) |
228 | bb_error_msg_and_die("\nFailed to add journal to device %s", journal_device); | 228 | bb_error_msg_and_die("\nFailed to add journal to device %s", journal_device); |
229 | if(!quiet) | 229 | if (!quiet) |
230 | puts("done"); | 230 | puts("done"); |
231 | ext2fs_close(jfs); | 231 | ext2fs_close(jfs); |
232 | } | 232 | } |
@@ -242,14 +242,14 @@ void make_journal_blocks(ext2_filsys fs, int journal_size, int journal_flags, in | |||
242 | ~EXT3_FEATURE_COMPAT_HAS_JOURNAL; | 242 | ~EXT3_FEATURE_COMPAT_HAS_JOURNAL; |
243 | return; | 243 | return; |
244 | } | 244 | } |
245 | if(!quiet) | 245 | if (!quiet) |
246 | printf("Creating journal (%ld blocks): ", journal_blocks); | 246 | printf("Creating journal (%ld blocks): ", journal_blocks); |
247 | fflush(stdout); | 247 | fflush(stdout); |
248 | retval = ext2fs_add_journal_inode(fs, journal_blocks, | 248 | retval = ext2fs_add_journal_inode(fs, journal_blocks, |
249 | journal_flags); | 249 | journal_flags); |
250 | if(retval) | 250 | if (retval) |
251 | bb_error_msg_and_die("cannot create journal"); | 251 | bb_error_msg_and_die("cannot create journal"); |
252 | if(!quiet) | 252 | if (!quiet) |
253 | puts("done"); | 253 | puts("done"); |
254 | } | 254 | } |
255 | 255 | ||
@@ -262,6 +262,6 @@ char *e2fs_set_sbin_path(void) | |||
262 | oldpath = xasprintf("%s:%s", PATH_SET, oldpath); | 262 | oldpath = xasprintf("%s:%s", PATH_SET, oldpath); |
263 | else | 263 | else |
264 | oldpath = PATH_SET; | 264 | oldpath = PATH_SET; |
265 | putenv (oldpath); | 265 | putenv(oldpath); |
266 | return oldpath; | 266 | return oldpath; |
267 | } | 267 | } |