X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=innduct.git;a=blobdiff_plain;f=innduct.h;h=69af7d95f348583294920895df7c26b16feae4d9;hp=5a337cde6b5b55b8f3010c32dba444de1a8c35e6;hb=e2d02662c513ccf5ed9391483cec014a12db087d;hpb=cb8a14892f10d346b83f7f4668978b9f89f717fc diff --git a/innduct.h b/innduct.h index 5a337cd..69af7d9 100644 --- a/innduct.h +++ b/innduct.h @@ -59,6 +59,7 @@ #include #include #include +#include #include #include @@ -323,8 +324,8 @@ void dbg(const char *fmt, ...) PRINTF(1,2); void logv(int sysloglevel, const char *pfx, int errnoval, const char *fmt, va_list al) PRINTF(5,0); -char *xvasprintf(const char *fmt, va_list al) PRINTF(1,0); -char *xasprintf(const char *fmt, ...) PRINTF(1,2); +char *mvasprintf(const char *fmt, va_list al) PRINTF(1,0); +char *masprintf(const char *fmt, ...) PRINTF(1,2); int close_perhaps(int *fd); void xclose(int fd, const char *what, const char *what2); @@ -368,7 +369,7 @@ static inline int isewouldblock(int errnoval) { INNLOGSET(die, "fatal", LOG_ERR) \ INNLOGSET(warn, "warning", LOG_WARNING) \ INNLOGSET(notice, "notice", LOG_NOTICE) \ - INNLOGSET(trace, "trace", LOG_NOTICE) + INNLOGSET(debug, "debug", LOG_DEBUG) #define INNLOGSET_DECLARE(fn, pfx, sysloglevel) \ void duct_log_##fn(int l, const char *fmt, va_list al, int errval) \ PRINTF(3,0);