diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2007-01-24 17:57:19 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2007-01-24 17:57:19 +0100 |
| commit | 7f465320e409b80a38ba11a72f4108a470003b35 (patch) | |
| tree | 98b08901b5d0470767a896b68ed5a45108cbbfda | |
| parent | 170d63190a3cfb0c12ee9ddfe07b21f20825bd6f (diff) | |
| download | pacman-7f465320e409b80a38ba11a72f4108a470003b35.tar.gz pacman-7f465320e409b80a38ba11a72f4108a470003b35.tar.xz | |
Cleanup 'neednl' usage - make it static
| -rw-r--r-- | src/pacman/log.c | 2 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 18 | ||||
| -rw-r--r-- | src/pacman/util.c | 1 |
3 files changed, 4 insertions, 17 deletions
diff --git a/src/pacman/log.c b/src/pacman/log.c index f139fb14..d4db9848 100644 --- a/src/pacman/log.c +++ b/src/pacman/log.c @@ -37,7 +37,7 @@ extern config_t *config; -int neednl = 0; /* for cleaner message output */ +static int neednl = 0; /* for cleaner message output */ static int needpad = 0; /* pad blanks to terminal width */ /* simple helper for needpad */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 2c0fc4e6..56dd5035 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -78,8 +78,6 @@ pmdb_t *db_local; /* list of targets specified on command line */ static alpm_list_t *pm_targets; -extern int neednl; - /* Display usage/syntax for the specified operation. * op: the operation code requested * myname: basename(argv[0]) @@ -197,14 +195,8 @@ static void cleanup(int signum) FREELIST(pm_targets); FREECONF(config); - if(neednl) { - putchar('\n'); - } - - /* restore the cursor - printf("\033[?25h\033[?0c"); - fflush(stdout); - */ + /* This fixes up any missing newlines (neednl) */ + MSG(NL, ""); exit(signum); } @@ -407,10 +399,6 @@ int main(int argc, char *argv[]) signal(SIGTERM, cleanup); signal(SIGSEGV, cleanup); - /* hide the cursor, prevent flicker during fancy graphics - printf("\033[?25l\033[?1c"); - */ - /* i18n init */ lang=getenv("LC_ALL"); if(lang==NULL || lang[0]=='\0') @@ -419,7 +407,7 @@ int main(int argc, char *argv[]) lang=getenv("LANG"); setlocale(LC_ALL, lang); - // workaround for tr_TR + /* workaround for tr_TR */ if(lang && !strcmp(lang, "tr_TR")) setlocale(LC_CTYPE, "C"); bindtextdomain("pacman", "/usr/share/locale"); diff --git a/src/pacman/util.c b/src/pacman/util.c index b3a595be..16f4c78a 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -49,7 +49,6 @@ #include "log.h" extern config_t *config; -extern int neednl; /* gets the current screen column width */ unsigned int getcols() |