#include <unistd.h>
#endif
-#define GMQCC_IS_STDOUT(X) ((X) == stdout)
-#define GMQCC_IS_STDERR(X) ((X) == stderr)
+#define GMQCC_IS_STDOUT(X) ((FILE*)((void*)X) == stdout)
+#define GMQCC_IS_STDERR(X) ((FILE*)((void*)X) == stderr)
#define GMQCC_IS_DEFINE(X) (GMQCC_IS_STDERR(X) || GMQCC_IS_STDOUT(X))
typedef struct {
int con_change(const char *out, const char *err) {
con_close();
- if (GMQCC_IS_DEFINE((FILE*)out)) {
- console.handle_out = (((FILE*)out) == stdout) ? stdout : stderr;
+ if (GMQCC_IS_DEFINE(out)) {
+ console.handle_out = GMQCC_IS_STDOUT(out) ? stdout : stderr;
con_enablecolor();
} else if (!(console.handle_out = fopen(out, "w"))) return 0;
- if (GMQCC_IS_DEFINE((FILE*)err)) {
- console.handle_err = (((FILE*)err) == stdout) ? stdout : stderr;
+ if (GMQCC_IS_DEFINE(err)) {
+ console.handle_err = GMQCC_IS_STDOUT(err) ? stdout : stderr;
con_enablecolor();
} else if (!(console.handle_err = fopen(err, "w"))) return 0;
CON_CYAN,
CON_RED
};
-
- int err = !!(level == LVL_ERROR);
- int color = (err) ? console.color_err : console.color_out;
- int (*print)(const char *, ...) = (err) ? &con_err : &con_out;
-
+
+ int err = !!(level == LVL_ERROR);
+ int color = (err) ? console.color_err : console.color_out;
+ int (*print)(const char *, ...) = (err) ? &con_err : &con_out;
+ int (*vprint)(const char *, va_list) = (err) ? &con_verr : &con_vout;
+
if (color)
print("\033[0;%dm%s:%d: \033[0;%dm%s: \033[0m", CON_CYAN, name, (int)line, sel[level], msgtype);
else
print("%s:%d: %s: ", name, (int)line, msgtype);
-
- con_verr(msg, ap);
- fprintf (stderr, "\n");
+
+ vprint(msg, ap);
+ print("\n");
}
void con_printmsg(int level, const char *name, size_t line, const char *msgtype, const char *msg, ...) {