aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-09-17 16:28:10 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-09-17 16:28:10 +0000
commit9213a9e0f2d8fd638ecd02e2628d96dd5c7d233e (patch)
tree94c3c0678d1349497abe2db6004e9331e50f6d37 /e2fsprogs
parenta6127aacef047ed7661722705b052811fbe7f467 (diff)
downloadbusybox-w32-9213a9e0f2d8fd638ecd02e2628d96dd5c7d233e.tar.gz
busybox-w32-9213a9e0f2d8fd638ecd02e2628d96dd5c7d233e.tar.bz2
busybox-w32-9213a9e0f2d8fd638ecd02e2628d96dd5c7d233e.zip
whitespace cleanup
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/blkid/blkid.h4
-rw-r--r--e2fsprogs/blkid/dev.c6
-rw-r--r--e2fsprogs/blkid/probe.c10
-rw-r--r--e2fsprogs/blkid/read.c2
-rw-r--r--e2fsprogs/blkid/tag.c6
-rw-r--r--e2fsprogs/e2fsck.c2
-rw-r--r--e2fsprogs/e2p/ls.c4
-rw-r--r--e2fsprogs/mke2fs.c2
-rw-r--r--e2fsprogs/util.c2
9 files changed, 19 insertions, 19 deletions
diff --git a/e2fsprogs/blkid/blkid.h b/e2fsprogs/blkid/blkid.h
index 54721b221..4fa9f6fdf 100644
--- a/e2fsprogs/blkid/blkid.h
+++ b/e2fsprogs/blkid/blkid.h
@@ -56,7 +56,7 @@ extern int blkid_get_cache(blkid_cache *cache, const char *filename);
56extern const char *blkid_dev_devname(blkid_dev dev); 56extern const char *blkid_dev_devname(blkid_dev dev);
57 57
58extern blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache); 58extern blkid_dev_iterate blkid_dev_iterate_begin(blkid_cache cache);
59extern int blkid_dev_set_search(blkid_dev_iterate iter, 59extern int blkid_dev_set_search(blkid_dev_iterate iter,
60 char *search_type, char *search_value); 60 char *search_type, char *search_value);
61extern int blkid_dev_next(blkid_dev_iterate iterate, blkid_dev *dev); 61extern int blkid_dev_next(blkid_dev_iterate iterate, blkid_dev *dev);
62extern void blkid_dev_iterate_end(blkid_dev_iterate iterate); 62extern void blkid_dev_iterate_end(blkid_dev_iterate iterate);
@@ -90,7 +90,7 @@ extern blkid_tag_iterate blkid_tag_iterate_begin(blkid_dev dev);
90extern int blkid_tag_next(blkid_tag_iterate iterate, 90extern int blkid_tag_next(blkid_tag_iterate iterate,
91 const char **type, const char **value); 91 const char **type, const char **value);
92extern void blkid_tag_iterate_end(blkid_tag_iterate iterate); 92extern void blkid_tag_iterate_end(blkid_tag_iterate iterate);
93extern int blkid_dev_has_tag(blkid_dev dev, const char *type, 93extern int blkid_dev_has_tag(blkid_dev dev, const char *type,
94 const char *value); 94 const char *value);
95extern blkid_dev blkid_find_dev_with_tag(blkid_cache cache, 95extern blkid_dev blkid_find_dev_with_tag(blkid_cache cache,
96 const char *type, 96 const char *type,
diff --git a/e2fsprogs/blkid/dev.c b/e2fsprogs/blkid/dev.c
index 6d99504af..c2b756c81 100644
--- a/e2fsprogs/blkid/dev.c
+++ b/e2fsprogs/blkid/dev.c
@@ -76,8 +76,8 @@ void blkid_debug_dump_dev(blkid_dev dev)
76 76
77 list_for_each(p, &dev->bid_tags) { 77 list_for_each(p, &dev->bid_tags) {
78 blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); 78 blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags);
79 if (tag) 79 if (tag)
80 printf(" tag: %s=\"%s\"\n", tag->bit_name, 80 printf(" tag: %s=\"%s\"\n", tag->bit_name,
81 tag->bit_val); 81 tag->bit_val);
82 else 82 else
83 printf(" tag: NULL\n"); 83 printf(" tag: NULL\n");
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
177 case 'm': 177 case 'm':
178 blkid_debug_mask = strtoul (optarg, &tmp, 0); 178 blkid_debug_mask = strtoul (optarg, &tmp, 0);
179 if (*tmp) { 179 if (*tmp) {
180 fprintf(stderr, "Invalid debug mask: %d\n", 180 fprintf(stderr, "Invalid debug mask: %d\n",
181 optarg); 181 optarg);
182 exit(1); 182 exit(1);
183 } 183 }
diff --git a/e2fsprogs/blkid/probe.c b/e2fsprogs/blkid/probe.c
index 211569779..a2165efee 100644
--- a/e2fsprogs/blkid/probe.c
+++ b/e2fsprogs/blkid/probe.c
@@ -99,7 +99,7 @@ static void get_ext2_info(blkid_dev dev, unsigned char *buf)
99static int probe_ext3(int fd __BLKID_ATTR((unused)), 99static int probe_ext3(int fd __BLKID_ATTR((unused)),
100 blkid_cache cache __BLKID_ATTR((unused)), 100 blkid_cache cache __BLKID_ATTR((unused)),
101 blkid_dev dev, 101 blkid_dev dev,
102 const struct blkid_magic *id __BLKID_ATTR((unused)), 102 const struct blkid_magic *id __BLKID_ATTR((unused)),
103 unsigned char *buf) 103 unsigned char *buf)
104{ 104{
105 struct ext2_super_block *es; 105 struct ext2_super_block *es;
@@ -126,7 +126,7 @@ static int probe_ext3(int fd __BLKID_ATTR((unused)),
126static int probe_ext2(int fd __BLKID_ATTR((unused)), 126static int probe_ext2(int fd __BLKID_ATTR((unused)),
127 blkid_cache cache __BLKID_ATTR((unused)), 127 blkid_cache cache __BLKID_ATTR((unused)),
128 blkid_dev dev, 128 blkid_dev dev,
129 const struct blkid_magic *id __BLKID_ATTR((unused)), 129 const struct blkid_magic *id __BLKID_ATTR((unused)),
130 unsigned char *buf) 130 unsigned char *buf)
131{ 131{
132 struct ext2_super_block *es; 132 struct ext2_super_block *es;
@@ -305,10 +305,10 @@ static int probe_romfs(int fd __BLKID_ATTR((unused)),
305 return 0; 305 return 0;
306} 306}
307 307
308static int probe_cramfs(int fd __BLKID_ATTR((unused)), 308static int probe_cramfs(int fd __BLKID_ATTR((unused)),
309 blkid_cache cache __BLKID_ATTR((unused)), 309 blkid_cache cache __BLKID_ATTR((unused)),
310 blkid_dev dev, 310 blkid_dev dev,
311 const struct blkid_magic *id __BLKID_ATTR((unused)), 311 const struct blkid_magic *id __BLKID_ATTR((unused)),
312 unsigned char *buf) 312 unsigned char *buf)
313{ 313{
314 struct cramfs_super_block *csb; 314 struct cramfs_super_block *csb;
diff --git a/e2fsprogs/blkid/read.c b/e2fsprogs/blkid/read.c
index e954c6d94..624c907f3 100644
--- a/e2fsprogs/blkid/read.c
+++ b/e2fsprogs/blkid/read.c
@@ -432,7 +432,7 @@ static void debug_dump_dev(blkid_dev dev)
432 list_for_each(p, &dev->bid_tags) { 432 list_for_each(p, &dev->bid_tags) {
433 blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags); 433 blkid_tag tag = list_entry(p, struct blkid_struct_tag, bit_tags);
434 if (tag) 434 if (tag)
435 printf(" tag: %s=\"%s\"\n", tag->bit_name, 435 printf(" tag: %s=\"%s\"\n", tag->bit_name,
436 tag->bit_val); 436 tag->bit_val);
437 else 437 else
438 printf(" tag: NULL\n"); 438 printf(" tag: NULL\n");
diff --git a/e2fsprogs/blkid/tag.c b/e2fsprogs/blkid/tag.c
index ff10b28e2..09712bab7 100644
--- a/e2fsprogs/blkid/tag.c
+++ b/e2fsprogs/blkid/tag.c
@@ -355,7 +355,7 @@ extern int optind;
355void usage(char *prog) 355void usage(char *prog)
356{ 356{
357 fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask] device " 357 fprintf(stderr, "Usage: %s [-f blkid_file] [-m debug_mask] device "
358 "[type value]\n", 358 "[type value]\n",
359 prog); 359 prog);
360 fprintf(stderr, "\tList all tags for a device and exit\n", prog); 360 fprintf(stderr, "\tList all tags for a device and exit\n", prog);
361 exit(1); 361 exit(1);
@@ -383,7 +383,7 @@ int main(int argc, char **argv)
383 case 'm': 383 case 'm':
384 blkid_debug_mask = strtoul (optarg, &tmp, 0); 384 blkid_debug_mask = strtoul (optarg, &tmp, 0);
385 if (*tmp) { 385 if (*tmp) {
386 fprintf(stderr, "Invalid debug mask: %d\n", 386 fprintf(stderr, "Invalid debug mask: %d\n",
387 optarg); 387 optarg);
388 exit(1); 388 exit(1);
389 } 389 }
@@ -414,7 +414,7 @@ int main(int argc, char **argv)
414 if (search_type) { 414 if (search_type) {
415 found = blkid_dev_has_tag(dev, search_type, search_value); 415 found = blkid_dev_has_tag(dev, search_type, search_value);
416 printf("Device %s: (%s, %s) %s\n", blkid_dev_devname(dev), 416 printf("Device %s: (%s, %s) %s\n", blkid_dev_devname(dev),
417 search_type, search_value ? search_value : "NULL", 417 search_type, search_value ? search_value : "NULL",
418 found ? "FOUND" : "NOT FOUND"); 418 found ? "FOUND" : "NOT FOUND");
419 return(!found); 419 return(!found);
420 } 420 }
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index 985f9fd5c..7ffc0d230 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -3661,7 +3661,7 @@ static void e2fsck_pass1(e2fsck_t ctx)
3661 e2fsck_read_inode(ctx, EXT2_RESIZE_INO, inode, 3661 e2fsck_read_inode(ctx, EXT2_RESIZE_INO, inode,
3662 "recreate inode"); 3662 "recreate inode");
3663 inode->i_mtime = time(0); 3663 inode->i_mtime = time(0);
3664 e2fsck_write_inode(ctx, EXT2_RESIZE_INO, inode, 3664 e2fsck_write_inode(ctx, EXT2_RESIZE_INO, inode,
3665 "recreate inode"); 3665 "recreate inode");
3666 fs->block_map = save_bmap; 3666 fs->block_map = save_bmap;
3667 ctx->flags &= ~E2F_FLAG_RESIZE_INODE; 3667 ctx->flags &= ~E2F_FLAG_RESIZE_INODE;
diff --git a/e2fsprogs/e2p/ls.c b/e2fsprogs/e2p/ls.c
index e2a1ccb3d..9d29db6af 100644
--- a/e2fsprogs/e2p/ls.c
+++ b/e2fsprogs/e2p/ls.c
@@ -26,14 +26,14 @@ static void print_user(unsigned short uid, FILE *f)
26{ 26{
27 struct passwd *pw = getpwuid(uid); 27 struct passwd *pw = getpwuid(uid);
28 fprintf(f, "%u (user %s)\n", uid, 28 fprintf(f, "%u (user %s)\n", uid,
29 (pw == NULL ? "unknown" : pw->pw_name)); 29 (pw == NULL ? "unknown" : pw->pw_name));
30} 30}
31 31
32static void print_group(unsigned short gid, FILE *f) 32static void print_group(unsigned short gid, FILE *f)
33{ 33{
34 struct group *gr = getgrgid(gid); 34 struct group *gr = getgrgid(gid);
35 fprintf(f, "%u (group %s)\n", gid, 35 fprintf(f, "%u (group %s)\n", gid,
36 (gr == NULL ? "unknown" : gr->gr_name)); 36 (gr == NULL ? "unknown" : gr->gr_name));
37} 37}
38 38
39#define MONTH_INT (86400 * 30) 39#define MONTH_INT (86400 * 30)
diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c
index 687f18567..72ce57458 100644
--- a/e2fsprogs/mke2fs.c
+++ b/e2fsprogs/mke2fs.c
@@ -737,7 +737,7 @@ static void parse_extended_opts(struct ext2_super_block *sb_param,
737 } 737 }
738 if (resize <= sb_param->s_blocks_count) { 738 if (resize <= sb_param->s_blocks_count) {
739 bb_error_msg("The resize maximum must be greater " 739 bb_error_msg("The resize maximum must be greater "
740 "than the filesystem size"); 740 "than the filesystem size");
741 r_usage++; 741 r_usage++;
742 continue; 742 continue;
743 } 743 }
diff --git a/e2fsprogs/util.c b/e2fsprogs/util.c
index 113ef9c8f..efb128f59 100644
--- a/e2fsprogs/util.c
+++ b/e2fsprogs/util.c
@@ -99,7 +99,7 @@ force_check:
99 bb_error_msg_and_die("it's not safe to run badblocks!"); 99 bb_error_msg_and_die("it's not safe to run badblocks!");
100 } 100 }
101 101
102 if (mount_flags & EXT2_MF_BUSY) { 102 if (mount_flags & EXT2_MF_BUSY) {
103 bb_error_msg("%s is apparently in use by the system", device); 103 bb_error_msg("%s is apparently in use by the system", device);
104 goto force_check; 104 goto force_check;
105 } 105 }