# define strerror_r(errnum, buf, bufsize) strerror_s(buf, bufsize, errnum)
#endif
-static size_t utf16le_strlen(const utf16lechar *s)
+static size_t
+utf16le_strlen(const utf16lechar *s)
{
const utf16lechar *p = s;
while (*p)
/* Handle %W for UTF16-LE printing and %U for UTF-8 printing.
*
- * WARNING: this is not yet done properly--- it's assumed that if the format
- * string contains %W and/or %U, then it contains no other format specifiers.
+ * TODO: this is not yet done properly--- it's assumed that if the format string
+ * contains %W and/or %U, then it contains no other format specifiers.
*/
static int
wimlib_vfprintf(FILE *fp, const char *format, va_list va)
return ret;
}
-/* True if wimlib is to print an informational message when an error occurs.
- * This can be turned off by calling wimlib_set_print_errors(false). */
-#ifdef ENABLE_ERROR_MESSAGES
-#include <stdarg.h>
-static bool wimlib_print_errors = false;
-
+#if defined(ENABLE_ERROR_MESSAGES) || defined(ENABLE_DEBUG)
static void
wimlib_vmsg(const char *tag, const char *format,
va_list va, bool perror)
{
+#ifndef DEBUG
if (wimlib_print_errors) {
+#endif
int errno_save = errno;
fflush(stdout);
fputs(tag, stderr);
}
putc('\n', stderr);
errno = errno_save;
+#ifndef DEBUG
}
+#endif
}
+#endif
+
+/* True if wimlib is to print an informational message when an error occurs.
+ * This can be turned off by calling wimlib_set_print_errors(false). */
+#ifdef ENABLE_ERROR_MESSAGES
+static bool wimlib_print_errors = false;
+
void
wimlib_error(const char *format, ...)
#endif
+#ifdef ENABLE_DEBUG
+void wimlib_debug(const char *file, int line, const char *func,
+ const char *format, ...)
+{
+
+ va_list va;
+ char buf[strlen(file) + strlen(func) + 30];
+
+ sprintf(buf, "[%s %d] %s(): ", file, line, func);
+ va_start(va, format);
+ wimlib_vmsg(buf, format, va, false);
+ va_end(va);
+}
+#endif
+
WIMLIBAPI int
wimlib_set_print_errors(bool show_error_messages)
{
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, ...) dummy_printf(format, ## __VA_ARGS__)
-# define ERROR_WITH_ERRNO(format, ...) dummy_printf(format, ## __VA_ARGS__)
-# define WARNING(format, ...) dummy_printf(format, ## __VA_ARGS__)
-# define WARNING_WITH_ERRNO(format, ...) dummy_printf(format, ## __VA_ARGS__)
-#endif /* ENABLE_ERROR_MESSAGES */
+# define ERROR wimlib_error
+# define ERROR_WITH_ERRNO wimlib_error_with_errno
+# define WARNING wimlib_warning
+# define WARNING_WITH_ERRNO wimlib_warning
+#else /* ENABLE_ERROR_MESSAGES */
+# define ERROR(format, ...) dummy_printf(format, ## __VA_ARGS__)
+# define ERROR_WITH_ERRNO(format, ...) dummy_printf(format, ## __VA_ARGS__)
+# define WARNING(format, ...) dummy_printf(format, ## __VA_ARGS__)
+# define WARNING_WITH_ERRNO(format, ...) dummy_printf(format, ## __VA_ARGS__)
+#endif /* !ENABLE_ERROR_MESSAGES */
#if defined(ENABLE_DEBUG) || defined(ENABLE_MORE_DEBUG)
-# include <errno.h>
-# define DEBUG(format, ...) \
- ({ \
- int __errno_save = errno; \
- wimlib_fprintf(stdout, "[%s %d] %s(): " format, \
- __FILE__, __LINE__, __func__, ## __VA_ARGS__); \
- putchar('\n'); \
- fflush(stdout); \
- errno = __errno_save; \
- })
+extern void
+wimlib_debug(const char *file, int line, const char *func,
+ const char *format, ...);
+# define DEBUG(format, ...) \
+ wimlib_debug(__FILE__, __LINE__, __func__, format, ## __VA_ARGS__);
#else
-# define DEBUG(format, ...) dummy_printf(format, ## __VA_ARGS__)
+# define DEBUG(format, ...) dummy_printf(format, ## __VA_ARGS__)
#endif /* ENABLE_DEBUG || ENABLE_MORE_DEBUG */
#ifdef ENABLE_MORE_DEBUG
-# define DEBUG2(format, ...) DEBUG(format, ## __VA_ARGS__)
+# define DEBUG2(format, ...) DEBUG(format, ## __VA_ARGS__)
#else
-# define DEBUG2(format, ...) dummy_printf(format, ## __VA_ARGS__)
+# define DEBUG2(format, ...) dummy_printf(format, ## __VA_ARGS__)
#endif /* ENABLE_DEBUG */
#ifdef ENABLE_ASSERTIONS
#include <assert.h>
-# define wimlib_assert(expr) assert(expr)
+# define wimlib_assert(expr) assert(expr)
#else
-# define wimlib_assert(expr)
+# define wimlib_assert(expr)
#endif
#ifdef ENABLE_MORE_ASSERTIONS
-#define wimlib_assert2(expr) wimlib_assert(expr)
+# define wimlib_assert2(expr) wimlib_assert(expr)
#else
-#define wimlib_assert2(expr)
+# define wimlib_assert2(expr)
#endif
#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
extern void *(*wimlib_realloc_func)(void *, size_t);
extern void *wimlib_calloc(size_t nmemb, size_t size);
extern char *wimlib_strdup(const char *str);
-# define MALLOC wimlib_malloc_func
-# define FREE wimlib_free_func
-# define REALLOC wimlib_realloc_func
-# define CALLOC wimlib_calloc
-# define STRDUP wimlib_strdup
-#else
-# include <stdlib.h>
-# include <string.h>
-# define MALLOC malloc
-# define FREE free
-# define REALLOC realloc
-# define CALLOC calloc
-# define STRDUP strdup
-#endif /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
+# define MALLOC wimlib_malloc_func
+# define FREE wimlib_free_func
+# define REALLOC wimlib_realloc_func
+# define CALLOC wimlib_calloc
+# define STRDUP wimlib_strdup
+#else /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
+# include <stdlib.h>
+# include <string.h>
+# define MALLOC malloc
+# define FREE free
+# define REALLOC realloc
+# define CALLOC calloc
+# define STRDUP strdup
+#endif /* !ENABLE_CUSTOM_MEMORY_ALLOCATOR */
/* util.c */