X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=include%2Fwimlib%2Ferror.h;h=45e8f14ff8bf5c7164a44324270ae7c3f1a17592;hb=3e8aa757aaa63297f0d54007adf46411778fb6a8;hp=a36f8028c0ffde1100d4e9366ce36c50c0a45f52;hpb=edf0f7f5331e626b55819dcafa88e202cdb82a32;p=wimlib diff --git a/include/wimlib/error.h b/include/wimlib/error.h index a36f8028..45e8f14f 100644 --- a/include/wimlib/error.h +++ b/include/wimlib/error.h @@ -1,12 +1,12 @@ #ifndef _WIMLIB_ERROR_H #define _WIMLIB_ERROR_H +#include + #include "wimlib.h" /* Get error code definitions */ #include "wimlib/compiler.h" #include "wimlib/types.h" -#include - static inline int _format_attribute(printf, 1, 2) dummy_tprintf(const tchar *format, ...) { @@ -34,23 +34,16 @@ wimlib_warning_with_errno(const tchar *format, ...) # define WARNING(format, ...) wimlib_warning(T(format), ## __VA_ARGS__) # define WARNING_WITH_ERRNO(format, ...) wimlib_warning_with_errno(T(format), ## __VA_ARGS__) extern bool wimlib_print_errors; +extern FILE *wimlib_error_file; #else /* ENABLE_ERROR_MESSAGES */ # define wimlib_print_errors 0 +# define wimlib_error_file NULL # define ERROR(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__) # define ERROR_WITH_ERRNO(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__) # define WARNING(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__) # define WARNING_WITH_ERRNO(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__) #endif /* !ENABLE_ERROR_MESSAGES */ -#if defined(ENABLE_MORE_DEBUG) && !defined(ENABLE_DEBUG) -# define ENABLE_DEBUG 1 -#endif - -#if defined(ENABLE_MORE_ASSERTIONS) && !defined(ENABLE_ASSERTIONS) -# define ENABLE_ASSERTIONS 1 -#endif - - #ifdef ENABLE_DEBUG extern void wimlib_debug(const tchar *file, int line, const char *func, @@ -62,4 +55,7 @@ wimlib_debug(const tchar *file, int line, const char *func, # define DEBUG(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__) #endif /* !ENABLE_DEBUG */ +extern void +print_byte_field(const u8 *field, size_t len, FILE *out); + #endif /* _WIMLIB_ERROR_H */