moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-12 14:28:03 -05:00
Code Issues Releases Wiki Activity

Remove ERR, WARN, and pm_fprintf macros/functions

Browse Source 
Rip out this stuff from output.c and output.h for the next step of ripping all ERR
output from the pacman front end.

This commit will NOT compile.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2007-04-26 15:34:16 -04:00
parent 961be77c93
commit f2dabeb19f
2 changed files with 1 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/pacman/output.c
View File

@ -38,56 +38,6 @@
extern config_t *config; extern config_t *config;
static int neednl = 0; /* for cleaner message output */
static int needpad = 0; /* pad blanks to terminal width */
/* Wrapper to fprintf() that allows to choose if we want the output
* to be appended on the current line, or written to a new one
*/
void pm_fprintf(FILE *file, unsigned short line, char *fmt, ...)
{
va_list args;
char str[LOG_STR_LEN];
int len = 0;
if(neednl == 1 && line == NL) {
fprintf(file, "\n");
neednl = 0;
}
if(!fmt) {
return;
}
va_start(args, fmt);
vsnprintf(str, LOG_STR_LEN, fmt, args);
va_end(args);
len = strlen(str);
if(needpad == 1 && str[len-1] == '\n') {
/* we want this removed so we can pad */
str[len-1] = ' ';
neednl = 1;
}
fprintf(file, str);
if(needpad == 1) {
int i, cols = getcols();
for(i=len; i < cols; ++i) {
fprintf(file, " ");
}
if(neednl == 1 && line == NL) {
fprintf(file, "\n");
neednl = 0;
}
}
fflush(file);
neednl = (str[strlen(str)-1] == '\n') ? 0 : 1;
}
/* presents a prompt and gets a Y/N answer */ /* presents a prompt and gets a Y/N answer */
/* TODO there must be a better way */ /* TODO there must be a better way */
int yesno(char *fmt, ...) int yesno(char *fmt, ...)
@ -105,7 +55,7 @@ int yesno(char *fmt, ...)
va_end(args); va_end(args);
/* Use stderr so questions are always displayed when redirecting output */ /* Use stderr so questions are always displayed when redirecting output */
pm_fprintf(stderr, NL, str); \ fprintf(stderr, str);
if(fgets(response, 32, stdin)) { if(fgets(response, 32, stdin)) {
if(strlen(response) != 0) { if(strlen(response) != 0) {

20
src/pacman/output.h
View File

@ -23,26 +23,6 @@
#include <stdio.h> #include <stdio.h>
/* TODO these are illegal in ISO C, thus the reason -pedantic was never used
* as a compile flag for the pacman side of things (named variadic macros) */
#define ERR(line, fmt, args...) do { \
pm_fprintf(stderr, line, _("error: ")); \
pm_fprintf(stderr, CL, fmt, ##args); \
} while(0)
#define WARN(line, fmt, args...) do { \
pm_fprintf(stderr, line, _("warning: ")); \
pm_fprintf(stderr, CL, fmt, ##args); \
} while(0)
enum {
NL, /* new line */
CL /* current line */
};
void set_output_padding(int on);
void pm_fprintf(FILE *file, unsigned short line, char *fmt, ...);
int yesno(char *fmt, ...); int yesno(char *fmt, ...);
#endif /* _PM_OUTPUT_H */ #endif /* _PM_OUTPUT_H */