X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.h;h=a3984bb30c2eb2fb4048f119afc62347effdfb66;hp=3d917bf547b5e9e1cf7ebd4a2109810b08b9c4d2;hb=6f7956a06fcf92a304fae93e393e8eaee34e92d5;hpb=6b48d458662451251f506fcf7e275b4250a31cd0 diff --git a/src/util.h b/src/util.h index 3d917bf5..a3984bb3 100644 --- a/src/util.h +++ b/src/util.h @@ -53,24 +53,29 @@ typedef unsigned uint; extern bool __wimlib_print_errors; extern void wimlib_error(const char *format, ...) FORMAT(printf, 1, 2) COLD; +extern void wimlib_error_with_errno(const char *format, ...) + FORMAT(printf, 1, 2) COLD; extern void wimlib_warning(const char *format, ...) FORMAT(printf, 1, 2) COLD; -# define ERROR wimlib_error -# define WARNING wimlib_warning +# define ERROR wimlib_error +# define ERROR_WITH_ERRNO wimlib_error_with_errno +# define WARNING wimlib_warning #else # define ERROR(format, ...) +# define ERROR_WITH_ERRNO(format, ...) # define WARNING(format, ...) #endif /* ENABLE_ERROR_MESSAGES */ #if defined(ENABLE_DEBUG) || defined(ENABLE_MORE_DEBUG) # include -# define DEBUG(format, ...) \ - ({ \ - int __errno_save = errno; \ - fprintf(stdout, "[%s %d] %s(): " format, \ - __FILE__, __LINE__, __func__, ## __VA_ARGS__); \ - fflush(stdout); \ - errno = __errno_save; \ +# define DEBUG(format, ...) \ + ({ \ + int __errno_save = errno; \ + fprintf(stdout, "[%s %d] %s(): " format, \ + __FILE__, __LINE__, __func__, ## __VA_ARGS__); \ + putchar('\n'); \ + fflush(stdout); \ + errno = __errno_save; \ }) #else