summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-04-26 21:34:16 +0200
committerDan McGee <dan@archlinux.org>2007-04-26 21:34:16 +0200
commitf2dabeb19f79544775e8f369710f267a6d087b24 (patch)
tree41a3c0658151ee2a51222b0539193187613a2afc
parent961be77c93b487987600cd041bef3aa656949724 (diff)
downloadpacman-f2dabeb19f79544775e8f369710f267a6d087b24.tar.gz
pacman-f2dabeb19f79544775e8f369710f267a6d087b24.tar.xz
Remove ERR, WARN, and pm_fprintf macros/functions
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>
-rw-r--r--src/pacman/output.c52
-rw-r--r--src/pacman/output.h20
2 files changed, 1 insertions, 71 deletions
diff --git a/src/pacman/output.c b/src/pacman/output.c
index 85defaa2..36f0aa65 100644
--- a/src/pacman/output.c
+++ b/src/pacman/output.c
@@ -38,56 +38,6 @@
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 */
/* TODO there must be a better way */
int yesno(char *fmt, ...)
@@ -105,7 +55,7 @@ int yesno(char *fmt, ...)
va_end(args);
/* Use stderr so questions are always displayed when redirecting output */
- pm_fprintf(stderr, NL, str); \
+ fprintf(stderr, str);
if(fgets(response, 32, stdin)) {
if(strlen(response) != 0) {
diff --git a/src/pacman/output.h b/src/pacman/output.h
index b74a1dbf..29a70b87 100644
--- a/src/pacman/output.h
+++ b/src/pacman/output.h
@@ -23,26 +23,6 @@
#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, ...);
#endif /* _PM_OUTPUT_H */