Cleanup 'neednl' usage - make it static

This commit is contained in:
Aaron Griffin 2007-01-24 16:57:19 +00:00
parent 170d63190a
commit 7f465320e4
3 changed files with 4 additions and 17 deletions

View File

@ -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 */

View File

@ -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");

View File

@ -49,7 +49,6 @@
#include "log.h"
extern config_t *config;
extern int neednl;
/* gets the current screen column width */
unsigned int getcols()