Commit 5ba27c90 authored by Shiz ...'s avatar Shiz ... Committed by William Pitcock

print: print warnings and errors to stderr

parent 515f31eb
......@@ -14,13 +14,14 @@
#include "apk_blob.h"
#define apk_error(args...) do { apk_log("ERROR: ", args); } while (0)
#define apk_warning(args...) do { if (apk_verbosity > 0) { apk_log("WARNING: ", args); } } while (0)
#define apk_error(args...) do { apk_log_err("ERROR: ", args); } while (0)
#define apk_warning(args...) do { if (apk_verbosity > 0) { apk_log_err("WARNING: ", args); } } while (0)
#define apk_message(args...) do { if (apk_verbosity > 0) { apk_log(NULL, args); } } while (0)
extern int apk_progress_fd;
void apk_log(const char *prefix, const char *format, ...);
void apk_log_err(const char *prefix, const char *format, ...);
const char *apk_error_str(int error);
void apk_reset_screen_width(void);
......
......@@ -157,17 +157,28 @@ const char *apk_error_str(int error)
}
}
static void log(FILE *dest, const char *prefix, const char *format, va_list va)
{
if (prefix != NULL)
fprintf(dest, "%s", prefix);
vfprintf(dest, format, va);
fprintf(dest, "\n");
fflush(dest);
apk_progress_force = 1;
}
void apk_log(const char *prefix, const char *format, ...)
{
va_list va;
if (prefix != NULL)
fprintf(stdout, "%s", prefix);
va_start(va, format);
vfprintf(stdout, format, va);
log(stdout, prefix, format, va);
va_end(va);
fprintf(stdout, "\n");
fflush(stdout);
apk_progress_force = 1;
}
void apk_log_err(const char *prefix, const char *format, ...)
{
va_list va;
va_start(va, format);
log(stderr, prefix, format, va);
va_end(va);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment