aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-09-27 10:20:47 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-09-27 10:20:47 +0000
commit4daad9004d8f07991516970a1cbd77756fae7041 (patch)
treef1a17e4b168ef8fdf8af92ac5ce8deba89d38db2 /e2fsprogs
parent1acdc89e992eb3f0548ff48ba586b31c9a0ae232 (diff)
downloadbusybox-w32-4daad9004d8f07991516970a1cbd77756fae7041.tar.gz
busybox-w32-4daad9004d8f07991516970a1cbd77756fae7041.tar.bz2
busybox-w32-4daad9004d8f07991516970a1cbd77756fae7041.zip
introduce bb_putchar(). saves ~1800 on uclibc (less on glibc).
Diffstat (limited to 'e2fsprogs')
-rw-r--r--e2fsprogs/fsck.c2
-rw-r--r--e2fsprogs/lsattr.c4
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/dev.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/blkid/read.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/e2fsck.c14
-rw-r--r--e2fsprogs/old_e2fsprogs/fsck.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/lsattr.c4
-rw-r--r--e2fsprogs/old_e2fsprogs/mke2fs.c2
-rw-r--r--e2fsprogs/old_e2fsprogs/uuid/uuid_time.c2
9 files changed, 17 insertions, 17 deletions
diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index dfcbf67dd..3717781db 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -651,7 +651,7 @@ static void execute(const char *type, const char *device, const char *mntpt,
651 mntpt ? mntpt : device); 651 mntpt ? mntpt : device);
652 for (i = 0; i < argc; i++) 652 for (i = 0; i < argc; i++)
653 printf(" %s", argv[i]); 653 printf(" %s", argv[i]);
654 puts(""); 654 bb_putchar('\n');
655 } 655 }
656 656
657 /* Fork and execute the correct program. */ 657 /* Fork and execute the correct program. */
diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c
index dd6efc812..5f4f87276 100644
--- a/e2fsprogs/lsattr.c
+++ b/e2fsprogs/lsattr.c
@@ -46,7 +46,7 @@ static void list_attributes(const char *name)
46 if (option_mask32 & OPT_PF_LONG) { 46 if (option_mask32 & OPT_PF_LONG) {
47 printf("%-28s ", name); 47 printf("%-28s ", name);
48 print_flags(stdout, fsflags, PFOPT_LONG); 48 print_flags(stdout, fsflags, PFOPT_LONG);
49 puts(""); 49 bb_putchar('\n');
50 } else { 50 } else {
51 print_flags(stdout, fsflags, 0); 51 print_flags(stdout, fsflags, 0);
52 printf(" %s\n", name); 52 printf(" %s\n", name);
@@ -74,7 +74,7 @@ static int lsattr_dir_proc(const char *dir_name, struct dirent *de,
74 ) { 74 ) {
75 printf("\n%s:\n", path); 75 printf("\n%s:\n", path);
76 iterate_on_dir(path, lsattr_dir_proc, NULL); 76 iterate_on_dir(path, lsattr_dir_proc, NULL);
77 puts(""); 77 bb_putchar('\n');
78 } 78 }
79 } 79 }
80 80
diff --git a/e2fsprogs/old_e2fsprogs/blkid/dev.c b/e2fsprogs/old_e2fsprogs/blkid/dev.c
index eddbd02b7..d86cc48d1 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/dev.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/dev.c
@@ -82,7 +82,7 @@ void blkid_debug_dump_dev(blkid_dev dev)
82 else 82 else
83 printf(" tag: NULL\n"); 83 printf(" tag: NULL\n");
84 } 84 }
85 puts(""); 85 bb_putchar('\n');
86} 86}
87#endif 87#endif
88 88
diff --git a/e2fsprogs/old_e2fsprogs/blkid/read.c b/e2fsprogs/old_e2fsprogs/blkid/read.c
index 276e62a70..67bc8ee44 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/read.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/read.c
@@ -436,7 +436,7 @@ static void debug_dump_dev(blkid_dev dev)
436 else 436 else
437 printf(" tag: NULL\n"); 437 printf(" tag: NULL\n");
438 } 438 }
439 puts(""); 439 bb_putchar('\n');
440} 440}
441 441
442int main(int argc, char**argv) 442int main(int argc, char**argv)
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index 3d5b4f4fb..61db53e80 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -2443,10 +2443,10 @@ static void safe_print(const char *cp, int len)
2443 ch -= 128; 2443 ch -= 128;
2444 } 2444 }
2445 if ((ch < 32) || (ch == 0x7f)) { 2445 if ((ch < 32) || (ch == 0x7f)) {
2446 fputc('^', stdout); 2446 bb_putchar('^');
2447 ch ^= 0x40; /* ^@, ^A, ^B; ^? for DEL */ 2447 ch ^= 0x40; /* ^@, ^A, ^B; ^? for DEL */
2448 } 2448 }
2449 fputc(ch, stdout); 2449 bb_putchar(ch);
2450 } 2450 }
2451} 2451}
2452 2452
@@ -2497,7 +2497,7 @@ static void expand_at_expression(e2fsck_t ctx, char ch,
2497 str = _(*cpp) + 1; 2497 str = _(*cpp) + 1;
2498 if (*first && islower(*str)) { 2498 if (*first && islower(*str)) {
2499 *first = 0; 2499 *first = 0;
2500 fputc(toupper(*str++), stdout); 2500 bb_putchar(toupper(*str++));
2501 } 2501 }
2502 print_e2fsck_message(ctx, str, pctx, *first); 2502 print_e2fsck_message(ctx, str, pctx, *first);
2503 } else 2503 } else
@@ -2630,7 +2630,7 @@ static void expand_percent_expression(ext2_filsys fs, char ch,
2630 2630
2631 switch (ch) { 2631 switch (ch) {
2632 case '%': 2632 case '%':
2633 fputc('%', stdout); 2633 bb_putchar('%');
2634 break; 2634 break;
2635 case 'b': 2635 case 'b':
2636 printf("%u", ctx->blk); 2636 printf("%u", ctx->blk);
@@ -12767,7 +12767,7 @@ static void check_if_skip(e2fsck_t ctx)
12767 else 12767 else
12768 printf(_(" (check in %ld mounts)"), next_check); 12768 printf(_(" (check in %ld mounts)"), next_check);
12769 } 12769 }
12770 fputc('\n', stdout); 12770 bb_putchar('\n');
12771 ext2fs_close(fs); 12771 ext2fs_close(fs);
12772 ctx->fs = NULL; 12772 ctx->fs = NULL;
12773 e2fsck_free_context(ctx); 12773 e2fsck_free_context(ctx);
@@ -12864,9 +12864,9 @@ int e2fsck_simple_progress(e2fsck_t ctx, const char *label, float percent,
12864 bar + (sizeof(bar) - (i+1)), 12864 bar + (sizeof(bar) - (i+1)),
12865 spaces + (sizeof(spaces) - (dpywidth - i + 1))); 12865 spaces + (sizeof(spaces) - (dpywidth - i + 1)));
12866 if (fixed_percent == 1000) 12866 if (fixed_percent == 1000)
12867 fputc('|', stdout); 12867 bb_putchar('|');
12868 else 12868 else
12869 fputc(spinner[ctx->progress_pos & 3], stdout); 12869 bb_putchar(spinner[ctx->progress_pos & 3]);
12870 printf(" %4.1f%% ", percent); 12870 printf(" %4.1f%% ", percent);
12871 if (dpynum) 12871 if (dpynum)
12872 printf("%u\r", dpynum); 12872 printf("%u\r", dpynum);
diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c
index 261783726..aad85cf61 100644
--- a/e2fsprogs/old_e2fsprogs/fsck.c
+++ b/e2fsprogs/old_e2fsprogs/fsck.c
@@ -613,7 +613,7 @@ static int execute(const char *type, const char *device, const char *mntpt,
613 mntpt ? mntpt : device); 613 mntpt ? mntpt : device);
614 for (i=0; i < argc; i++) 614 for (i=0; i < argc; i++)
615 printf("%s ", argv[i]); 615 printf("%s ", argv[i]);
616 puts(""); 616 bb_putchar('\n');
617 } 617 }
618 618
619 /* Fork and execute the correct program. */ 619 /* Fork and execute the correct program. */
diff --git a/e2fsprogs/old_e2fsprogs/lsattr.c b/e2fsprogs/old_e2fsprogs/lsattr.c
index 920146496..bbc03aa9d 100644
--- a/e2fsprogs/old_e2fsprogs/lsattr.c
+++ b/e2fsprogs/old_e2fsprogs/lsattr.c
@@ -57,7 +57,7 @@ static void list_attributes(const char *name)
57 if (flags & OPT_PF_LONG) { 57 if (flags & OPT_PF_LONG) {
58 printf("%-28s ", name); 58 printf("%-28s ", name);
59 print_flags(stdout, fsflags, PFOPT_LONG); 59 print_flags(stdout, fsflags, PFOPT_LONG);
60 puts(""); 60 bb_putchar('\n');
61 } else { 61 } else {
62 print_flags(stdout, fsflags, 0); 62 print_flags(stdout, fsflags, 0);
63 printf(" %s\n", name); 63 printf(" %s\n", name);
@@ -102,7 +102,7 @@ static int lsattr_dir_proc(const char *dir_name, struct dirent *de,
102 (de->d_name[1] != '.' && de->d_name[2] != '\0')))) { 102 (de->d_name[1] != '.' && de->d_name[2] != '\0')))) {
103 printf("\n%s:\n", path); 103 printf("\n%s:\n", path);
104 iterate_on_dir(path, lsattr_dir_proc, NULL); 104 iterate_on_dir(path, lsattr_dir_proc, NULL);
105 puts(""); 105 bb_putchar('\n');
106 } 106 }
107 } 107 }
108 } 108 }
diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c
index c1deefdb7..89b5223b7 100644
--- a/e2fsprogs/old_e2fsprogs/mke2fs.c
+++ b/e2fsprogs/old_e2fsprogs/mke2fs.c
@@ -641,7 +641,7 @@ static void show_stats(ext2_filsys fs)
641 s->s_blocks_per_group, s->s_frags_per_group, 641 s->s_blocks_per_group, s->s_frags_per_group,
642 s->s_inodes_per_group); 642 s->s_inodes_per_group);
643 if (fs->group_desc_count == 1) { 643 if (fs->group_desc_count == 1) {
644 puts(""); 644 bb_putchar('\n');
645 return; 645 return;
646 } 646 }
647 647
diff --git a/e2fsprogs/old_e2fsprogs/uuid/uuid_time.c b/e2fsprogs/old_e2fsprogs/uuid/uuid_time.c
index b54d67322..b6f73e6dc 100644
--- a/e2fsprogs/old_e2fsprogs/uuid/uuid_time.c
+++ b/e2fsprogs/old_e2fsprogs/uuid/uuid_time.c
@@ -147,7 +147,7 @@ main(int argc, char **argv)
147 printf(" (random)\n"); 147 printf(" (random)\n");
148 break; 148 break;
149 default: 149 default:
150 puts(""); 150 bb_putchar('\n');
151 } 151 }
152 if (type != 1) { 152 if (type != 1) {
153 printf("Warning: not a time-based UUID, so UUID time " 153 printf("Warning: not a time-based UUID, so UUID time "