diff options
| author | Dan McGee <dan@archlinux.org> | 2011-10-13 19:34:58 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-10-14 15:14:44 +0200 |
| commit | dbd54c0cb95c5d9c914e5d99b23556d2528ee9b9 (patch) | |
| tree | cf336c6b1b36a00d6471863300628a7c28ef5b15 | |
| parent | 0d2600c575033774485f84ad67cbc602592237ab (diff) | |
| download | pacman-dbd54c0cb95c5d9c914e5d99b23556d2528ee9b9.tar.gz pacman-dbd54c0cb95c5d9c914e5d99b23556d2528ee9b9.tar.xz | |
Use fputs and putchar in callback progress display
When we have fixed strings or output, printf overhead is unnecessary.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | src/pacman/callback.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 80db402a..d8564553 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -96,41 +96,41 @@ static void fill_progress(const int bar_percent, const int disp_percent, } if(hashlen > 0) { - printf(" ["); + fputs(" [", stdout); for(i = hashlen; i > 0; --i) { /* if special progress bar enabled */ if(config->chomp) { if(i > hashlen - hash) { - printf("-"); + putchar('-'); } else if(i == hashlen - hash) { if(lasthash == hash) { if(mouth) { - printf("\033[1;33mC\033[m"); + fputs("\033[1;33mC\033[m", stdout); } else { - printf("\033[1;33mc\033[m"); + fputs("\033[1;33mc\033[m", stdout); } } else { lasthash = hash; mouth = mouth == 1 ? 0 : 1; if(mouth) { - printf("\033[1;33mC\033[m"); + fputs("\033[1;33mC\033[m", stdout); } else { - printf("\033[1;33mc\033[m"); + fputs("\033[1;33mc\033[m", stdout); } } - } else if(i%3 == 0) { - printf("\033[0;37mo\033[m"); + } else if(i % 3 == 0) { + fputs("\033[0;37mo\033[m", stdout); } else { - printf("\033[0;37m \033[m"); + fputs("\033[0;37m \033[m", stdout); } } /* else regular progress bar */ else if(i > hashlen - hash) { - printf("#"); + putchar('#'); } else { - printf("-"); + putchar('-'); } } - printf("]"); + putchar(']'); } /* print display percent after progress bar */ /* 5 = 1 space + 3 digits + 1 % */ @@ -139,9 +139,9 @@ static void fill_progress(const int bar_percent, const int disp_percent, } if(bar_percent == 100) { - printf("\n"); + putchar('\n'); } else { - printf("\r"); + putchar('\r'); } fflush(stdout); } @@ -712,7 +712,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) } else if(eta_h < 100) { printf("%02u:%02u:%02u", eta_h, eta_m, eta_s); } else { - printf("--:--"); + fputs("--:--", stdout); } free(fname); |