summaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-11-01 10:25:35 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-11-01 10:25:35 +0000
commit92258541449581302e180d05e827e27d35030a18 (patch)
tree99c5ad443f69860833c8ef37e142fddfedb90872 /e2fsprogs
parent048c93cc5593d53d6243c3e15dc8a5b0072a6083 (diff)
downloadbusybox-w32-92258541449581302e180d05e827e27d35030a18.tar.gz
busybox-w32-92258541449581302e180d05e827e27d35030a18.tar.bz2
busybox-w32-92258541449581302e180d05e827e27d35030a18.zip
mostly style fixes
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/e2fsck.c48
-rw-r--r--e2fsprogs/e2p/ps.c2
2 files changed, 25 insertions, 25 deletions
diff --git a/e2fsprogs/e2fsck.c b/e2fsprogs/e2fsck.c
index 77edbd871..88eedeaa6 100644
--- a/e2fsprogs/e2fsck.c
+++ b/e2fsprogs/e2fsck.c
@@ -9818,7 +9818,7 @@ static int jread(struct buffer_head **bhp, journal_t *journal,
9818 err = journal_bmap(journal, offset, &blocknr); 9818 err = journal_bmap(journal, offset, &blocknr);
9819 9819
9820 if (err) { 9820 if (err) {
9821 printf ("JBD: bad block at offset %u\n", offset); 9821 printf("JBD: bad block at offset %u\n", offset);
9822 return err; 9822 return err;
9823 } 9823 }
9824 9824
@@ -9835,7 +9835,7 @@ static int jread(struct buffer_head **bhp, journal_t *journal,
9835 } 9835 }
9836 9836
9837 if (!buffer_uptodate(bh)) { 9837 if (!buffer_uptodate(bh)) {
9838 printf ("JBD: Failed to read block at offset %u\n", offset); 9838 printf("JBD: Failed to read block at offset %u\n", offset);
9839 brelse(bh); 9839 brelse(bh);
9840 return -EIO; 9840 return -EIO;
9841 } 9841 }
@@ -10049,7 +10049,7 @@ static int do_one_pass(journal_t *journal,
10049 /* Recover what we can, but 10049 /* Recover what we can, but
10050 * report failure at the end. */ 10050 * report failure at the end. */
10051 success = err; 10051 success = err;
10052 printf ("JBD: IO error %d recovering " 10052 printf("JBD: IO error %d recovering "
10053 "block %ld in log\n", 10053 "block %ld in log\n",
10054 err, io_block); 10054 err, io_block);
10055 } else { 10055 } else {
@@ -10074,7 +10074,7 @@ static int do_one_pass(journal_t *journal,
10074 blocknr, 10074 blocknr,
10075 journal->j_blocksize); 10075 journal->j_blocksize);
10076 if (nbh == NULL) { 10076 if (nbh == NULL) {
10077 printf ("JBD: Out of memory " 10077 printf("JBD: Out of memory "
10078 "during recovery.\n"); 10078 "during recovery.\n");
10079 err = -ENOMEM; 10079 err = -ENOMEM;
10080 brelse(bh); 10080 brelse(bh);
@@ -10153,7 +10153,7 @@ static int do_one_pass(journal_t *journal,
10153 /* It's really bad news if different passes end up at 10153 /* It's really bad news if different passes end up at
10154 * different places (but possible due to IO errors). */ 10154 * different places (but possible due to IO errors). */
10155 if (info->end_transaction != next_commit_ID) { 10155 if (info->end_transaction != next_commit_ID) {
10156 printf ("JBD: recovery pass %d ended at " 10156 printf("JBD: recovery pass %d ended at "
10157 "transaction %u, expected %u\n", 10157 "transaction %u, expected %u\n",
10158 pass, next_commit_ID, info->end_transaction); 10158 pass, next_commit_ID, info->end_transaction);
10159 if (!success) 10159 if (!success)
@@ -12335,15 +12335,15 @@ static int ask_yn(const char * string, int def)
12335int ask (e2fsck_t ctx, const char * string, int def) 12335int ask (e2fsck_t ctx, const char * string, int def)
12336{ 12336{
12337 if (ctx->options & E2F_OPT_NO) { 12337 if (ctx->options & E2F_OPT_NO) {
12338 printf (_("%s? no\n\n"), string); 12338 printf(_("%s? no\n\n"), string);
12339 return 0; 12339 return 0;
12340 } 12340 }
12341 if (ctx->options & E2F_OPT_YES) { 12341 if (ctx->options & E2F_OPT_YES) {
12342 printf (_("%s? yes\n\n"), string); 12342 printf(_("%s? yes\n\n"), string);
12343 return 1; 12343 return 1;
12344 } 12344 }
12345 if (ctx->options & E2F_OPT_PREEN) { 12345 if (ctx->options & E2F_OPT_PREEN) {
12346 printf ("%s? %s\n\n", string, def ? _("yes") : _("no")); 12346 printf("%s? %s\n\n", string, def ? _("yes") : _("no"));
12347 return def; 12347 return def;
12348 } 12348 }
12349 return ask_yn(string, def); 12349 return ask_yn(string, def);
@@ -12606,26 +12606,26 @@ static void show_stats(e2fsck_t ctx)
12606 blocks_used, blocks); 12606 blocks_used, blocks);
12607 return; 12607 return;
12608 } 12608 }
12609 printf ("\n%8d inode%s used (%d%%)\n", P_E2("", "s", inodes_used), 12609 printf("\n%8d inode%s used (%d%%)\n", P_E2("", "s", inodes_used),
12610 100 * inodes_used / inodes); 12610 100 * inodes_used / inodes);
12611 printf ("%8d non-contiguous inode%s (%0d.%d%%)\n", 12611 printf("%8d non-contiguous inode%s (%0d.%d%%)\n",
12612 P_E2("", "s", ctx->fs_fragmented), 12612 P_E2("", "s", ctx->fs_fragmented),
12613 frag_percent / 10, frag_percent % 10); 12613 frag_percent / 10, frag_percent % 10);
12614 printf (_(" # of inodes with ind/dind/tind blocks: %d/%d/%d\n"), 12614 printf(_(" # of inodes with ind/dind/tind blocks: %d/%d/%d\n"),
12615 ctx->fs_ind_count, ctx->fs_dind_count, ctx->fs_tind_count); 12615 ctx->fs_ind_count, ctx->fs_dind_count, ctx->fs_tind_count);
12616 printf ("%8d block%s used (%d%%)\n", P_E2("", "s", blocks_used), 12616 printf("%8d block%s used (%d%%)\n", P_E2("", "s", blocks_used),
12617 (int) ((long long) 100 * blocks_used / blocks)); 12617 (int) ((long long) 100 * blocks_used / blocks));
12618 printf ("%8d large file%s\n", P_E2("", "s", ctx->large_files)); 12618 printf("%8d large file%s\n", P_E2("", "s", ctx->large_files));
12619 printf ("\n%8d regular file%s\n", P_E2("", "s", ctx->fs_regular_count)); 12619 printf("\n%8d regular file%s\n", P_E2("", "s", ctx->fs_regular_count));
12620 printf ("%8d director%s\n", P_E2("y", "ies", ctx->fs_directory_count)); 12620 printf("%8d director%s\n", P_E2("y", "ies", ctx->fs_directory_count));
12621 printf ("%8d character device file%s\n", P_E2("", "s", ctx->fs_chardev_count)); 12621 printf("%8d character device file%s\n", P_E2("", "s", ctx->fs_chardev_count));
12622 printf ("%8d block device file%s\n", P_E2("", "s", ctx->fs_blockdev_count)); 12622 printf("%8d block device file%s\n", P_E2("", "s", ctx->fs_blockdev_count));
12623 printf ("%8d fifo%s\n", P_E2("", "s", ctx->fs_fifo_count)); 12623 printf("%8d fifo%s\n", P_E2("", "s", ctx->fs_fifo_count));
12624 printf ("%8d link%s\n", P_E2("", "s", ctx->fs_links_count - dir_links)); 12624 printf("%8d link%s\n", P_E2("", "s", ctx->fs_links_count - dir_links));
12625 printf ("%8d symbolic link%s", P_E2("", "s", ctx->fs_symlinks_count)); 12625 printf("%8d symbolic link%s", P_E2("", "s", ctx->fs_symlinks_count));
12626 printf (" (%d fast symbolic link%s)\n", P_E2("", "s", ctx->fs_fast_symlinks_count)); 12626 printf(" (%d fast symbolic link%s)\n", P_E2("", "s", ctx->fs_fast_symlinks_count));
12627 printf ("%8d socket%s--------\n\n", P_E2("", "s", ctx->fs_sockets_count)); 12627 printf("%8d socket%s--------\n\n", P_E2("", "s", ctx->fs_sockets_count));
12628 printf ("%8d file%s\n", P_E2("", "s", ctx->fs_total_count - dir_links)); 12628 printf("%8d file%s\n", P_E2("", "s", ctx->fs_total_count - dir_links));
12629} 12629}
12630 12630
12631static void check_mount(e2fsck_t ctx) 12631static void check_mount(e2fsck_t ctx)
@@ -12663,7 +12663,7 @@ static void check_mount(e2fsck_t ctx)
12663 "SEVERE filesystem damage.\007\007\007\n\n")); 12663 "SEVERE filesystem damage.\007\007\007\n\n"));
12664 cont = ask_yn(_("Do you really want to continue"), -1); 12664 cont = ask_yn(_("Do you really want to continue"), -1);
12665 if (!cont) { 12665 if (!cont) {
12666 printf (_("check aborted.\n")); 12666 printf(_("check aborted.\n"));
12667 exit (0); 12667 exit (0);
12668 } 12668 }
12669 return; 12669 return;
diff --git a/e2fsprogs/e2p/ps.c b/e2fsprogs/e2p/ps.c
index d1067388a..a6b4099db 100644
--- a/e2fsprogs/e2p/ps.c
+++ b/e2fsprogs/e2p/ps.c
@@ -23,5 +23,5 @@ void print_fs_state(FILE *f, unsigned short state)
23{ 23{
24 fprintf(f, (state & EXT2_VALID_FS ? " clean" : " not clean")); 24 fprintf(f, (state & EXT2_VALID_FS ? " clean" : " not clean"));
25 if (state & EXT2_ERROR_FS) 25 if (state & EXT2_ERROR_FS)
26 fprintf (f, " with errors"); 26 fprintf(f, " with errors");
27} 27}