diff options
Diffstat (limited to 'src/log.h')
| -rw-r--r-- | src/log.h | 24 |
1 files changed, 19 insertions, 5 deletions
@@ -6,10 +6,11 @@ #include <errno.h> #define LOGMSG_MAXLEN 255 -#define LOG_SET_FUNCS(open_cb, close_cb, fmt_cb, fmtex_cb) \ +#define LOG_SET_FUNCS(open_cb, close_cb, fmt_cb, fmtex_cb, fmtexerr_cb) \ { \ log_open = open_cb; log_close = close_cb; \ log_fmt = fmt_cb; log_fmtex = fmtex_cb; \ + log_fmtexerr = fmtexerr_cb; \ } #define LOG_SET_FUNCS_VA(...) LOG_SET_FUNCS(__VA_ARGS__) #define D(fmt, ...) log_fmt(DEBUG, fmt, __VA_ARGS__) @@ -20,13 +21,19 @@ #define N2(fmt, ...) log_fmtex(NOTICE, __FILE__, __LINE__, fmt, __VA_ARGS__) #define W2(fmt, ...) log_fmtex(WARNING, __FILE__, __LINE__, fmt, __VA_ARGS__) #define E2(fmt, ...) log_fmtex(ERROR, __FILE__, __LINE__, fmt, __VA_ARGS__) -#define W_STRERR(msg) { if (errno) W2("%s failed: %s", msg, strerror(errno)); } -#define E_STRERR(msg) { if (errno) E2("%s failed: %s", msg, strerror(errno)); } +#define W_STRERR(fmt, ...) log_fmtexerr(WARNING, __FILE__, __LINE__, fmt, \ + __VA_ARGS__) +#define E_STRERR(fmt, ...) log_fmtexerr(ERROR, __FILE__, __LINE__, fmt, \ + __VA_ARGS__) #define E_GAIERR(ret, msg) { if (ret) { E2("%s failed: %s", msg, gai_strerror(ret)); } } +#define FATAL(fmt, ...) { E_STRERR(fmt, __VA_ARGS__); abort(); } #define ABORT_ON_FATAL(expr, msg) \ { errno = 0; long rv = (long) expr; \ - if (rv) { E2("`%s` returned: %ld", #expr, rv); \ - E_STRERR(msg); abort(); } } + if (rv) { \ + E_STRERR("`%s` returned %ld. %s", \ + #expr, rv, msg); abort(); \ + } \ + } #define GAI_ABORT_ON_FATAL(expr, msg) \ { int rv = expr; \ if (rv) { E2("`%s` returned: %d", #expr, rv); \ @@ -38,16 +45,23 @@ typedef enum log_priority { typedef int (*log_open_cb) (void); typedef void (*log_close_cb) (void); + typedef void (*log_fmt_cb) (log_priority prio, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); + typedef void (*log_fmtex_cb) (log_priority prio, const char *srcfile, size_t line, const char *fmt, ...) __attribute__ ((format (printf, 4, 5))); +typedef void (*log_fmtexerr_cb) (log_priority prio, const char *srcfile, + size_t line, const char *fmt, ...) + __attribute__ ((format (printf, 4, 5))); + extern log_open_cb log_open; extern log_close_cb log_close; extern log_fmt_cb log_fmt; extern log_fmtex_cb log_fmtex; +extern log_fmtexerr_cb log_fmtexerr; #endif |