Refactor error functions; make re-entrant

[wimlib] / src / util.h

diff --git a/src/util.h b/src/util.h
index 08b15636acdcc66ae0c440755bfc45bf276ec13e..4f4056660e282dd2ca457584acdc7484be597b42 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -44,7 +44,6 @@ typedef uint16_t u16;
 typedef uint32_t u32;
 typedef uint64_t u64;
 #endif
-typedef unsigned uint;
 
 #ifndef min
 #define min(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); \
@@ -87,20 +86,25 @@ typedef unsigned uint;
 #define BUFFER_SIZE 4096
 
 #ifdef ENABLE_ERROR_MESSAGES
-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 ERROR_WITH_ERRNO wimlib_error_with_errno
-#      define WARNING          wimlib_warning
+extern void wimlib_warning_with_errno(const char *format, ...)
+               FORMAT(printf, 1, 2) COLD;
+#      define ERROR                    wimlib_error
+#      define ERROR_WITH_ERRNO         wimlib_error_with_errno
+#      define WARNING                  wimlib_warning
+#      define WARNING_WITH_ERRNO       wimlib_warning
 #else
-#      define ERROR(format, ...)
-#      define ERROR_WITH_ERRNO(format, ...)
-#      define WARNING(format, ...)
+static inline FORMAT(printf, 1, 2) void
+dummy_printf(const char *format, ...) { }
+#      define ERROR(format, ...)               dummy_printf
+#      define ERROR_WITH_ERRNO(format, ...)    dummy_printf
+#      define WARNING(format, ...)             dummy_printf
+#      define WARNING_WITH_ERRNO(format, ...)  dummy_printf
 #endif /* ENABLE_ERROR_MESSAGES */
 
 #if defined(ENABLE_DEBUG) || defined(ENABLE_MORE_DEBUG)
@@ -132,6 +136,13 @@ extern void wimlib_warning(const char *format, ...)
 #      define wimlib_assert(expr)
 #endif
 
+#ifdef ENABLE_MORE_ASSERTIONS
+#define wimlib_assert2(expr) wimlib_assert(expr)
+#else
+#define wimlib_assert2(expr)
+#endif
+
+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
 
 #ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
 extern void *(*wimlib_malloc_func)(size_t);
@@ -156,6 +167,19 @@ extern char *wimlib_strdup(const char *str);
 
 
 /* encoding.c */
+
+#ifdef WITH_NTFS_3G
+static inline int iconv_global_init()
+{
+       return 0;
+}
+
+static inline void iconv_global_cleanup() { }
+#else
+extern int iconv_global_init();
+extern void iconv_global_cleanup();
+#endif
+
 extern int utf16_to_utf8(const char *utf16_str, size_t utf16_nbytes,
                         char **utf8_str_ret, size_t *utf8_nbytes_ret);