AC_CONFIG_SRCDIR([src/wim.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects])
+AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects foreign])
AC_C_BIGENDIAN
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
LT_INIT
[Define to 1 if including lots of debug messages.])
fi
-AC_MSG_CHECKING([whether to include more debugging messages])
-AC_ARG_ENABLE([more_debug],
- AS_HELP_STRING([--enable-more-debug],
- [include even more debugging messages]),
- [ENABLE_MORE_DEBUG=$enableval],
- [ENABLE_MORE_DEBUG=no]
- )
-AC_MSG_RESULT([$ENABLE_MORE_DEBUG])
-if test "x$ENABLE_MORE_DEBUG" = "xyes"; then
- AC_DEFINE([ENABLE_MORE_DEBUG], [1],
- [Define to 1 if including even more debug messages.])
-fi
-
AC_MSG_CHECKING([whether to include error messages])
AC_ARG_ENABLE([error_messages],
AS_HELP_STRING([--disable-error-messages],
[Define to 1 if including error messages])
fi
-AC_MSG_CHECKING([whether to support custom memory allocation functions])
-AC_ARG_ENABLE([custom_memory_allocator],
- AS_HELP_STRING([--disable-custom-memory-allocator],
- [do not support the use of custom memory allocation
- functions]),
- [ENABLE_CUSTOM_MEMORY_ALLOCATOR=$enableval],
- [ENABLE_CUSTOM_MEMORY_ALLOCATOR=yes]
- )
-AC_MSG_RESULT([$ENABLE_CUSTOM_MEMORY_ALLOCATOR])
-if test "x$ENABLE_CUSTOM_MEMORY_ALLOCATOR" = "xyes"; then
- AC_DEFINE([ENABLE_CUSTOM_MEMORY_ALLOCATOR], [1],
- [Define to 1 if supporting custom memory allocation functions])
-fi
-
AC_MSG_CHECKING([whether to include assertions])
AC_ARG_ENABLE([assertions],
AS_HELP_STRING([--disable-assertions], [do not include assertions]),
* A function equivalent to @c realloc() that wimlib will use to reallocate
* memory. If @c NULL, the free function is set back to the default @c
* realloc() from the C library.
- * @return 0 on success; nonzero on error.
- * @retval ::WIMLIB_ERR_UNSUPPORTED
- * wimlib was compiled with the @c --without-custom-memory-allocator flag,
- * so custom memory allocators are unsupported.
+ * @return 0
*/
extern int
wimlib_set_memory_allocator(void *(*malloc_func)(size_t),
# define DEBUG(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__)
#endif /* !ENABLE_DEBUG */
-#ifdef ENABLE_MORE_DEBUG
-# define DEBUG2(format, ...) DEBUG(format, ## __VA_ARGS__)
-#else
-# define DEBUG2(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__)
-#endif /* !ENABLE_MORE_DEBUG */
-
#endif /* _WIMLIB_ERROR_H */
* places when large temporary buffers are needed). */
#define STACK_MAX 32768
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
extern void *
wimlib_malloc(size_t) _malloc_attribute;
extern char *
wimlib_strdup(const char *str) _malloc_attribute;
-# define MALLOC wimlib_malloc
-# define FREE wimlib_free_memory
-# define REALLOC wimlib_realloc
-# define CALLOC wimlib_calloc
-# define STRDUP wimlib_strdup
-# define WCSDUP wimlib_wcsdup
-#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
-# define WCSDUP wcsdup
-#endif /* !ENABLE_CUSTOM_MEMORY_ALLOCATOR */
+#define MALLOC wimlib_malloc
+#define FREE wimlib_free_memory
+#define REALLOC wimlib_realloc
+#define CALLOC wimlib_calloc
+#define STRDUP wimlib_strdup
+#define WCSDUP wimlib_wcsdup
extern void *
memdup(const void *mem, size_t size) _malloc_attribute;
extern void
libxml_global_cleanup(void);
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
extern void
xml_set_memory_allocator(void *(*malloc_func)(size_t),
void (*free_func)(void *),
void *(*realloc_func)(void *, size_t));
-#endif
#endif
string, pat);
return true;
} else {
- DEBUG2("\"%"TS"\" does not match the pattern \"%"TS"\"",
- string, pat);
+ DEBUG("\"%"TS"\" does not match the pattern \"%"TS"\"",
+ string, pat);
}
}
return false;
int ret;
struct wim_lookup_table_entry *lte;
- DEBUG2("Capturing NTFS data streams from `%s'", path);
+ DEBUG("Capturing NTFS data streams from `%s'", path);
/* Get context to search the streams of the NTFS file. */
actx = ntfs_attr_get_search_ctx(ni, NULL);
out_put_actx:
ntfs_attr_put_search_ctx(actx);
if (ret == 0)
- DEBUG2("Successfully captured NTFS streams from \"%s\"", path);
+ DEBUG("Successfully captured NTFS streams from \"%s\"", path);
else
ERROR("Failed to capture NTFS streams from \"%s\"", path);
return ret;
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
static void *(*wimlib_malloc_func) (size_t) = malloc;
static void (*wimlib_free_func) (void *) = free;
static void *(*wimlib_realloc_func)(void *, size_t) = realloc;
}
#endif
-#endif /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
-
void *
memdup(const void *mem, size_t size)
{
void (*free_func)(void *),
void *(*realloc_func)(void *, size_t))
{
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
wimlib_malloc_func = malloc_func ? malloc_func : malloc;
wimlib_free_func = free_func ? free_func : free;
wimlib_realloc_func = realloc_func ? realloc_func : realloc;
xml_set_memory_allocator(wimlib_malloc_func, wimlib_free_func,
wimlib_realloc_func);
return 0;
-#else
- ERROR("Cannot set custom memory allocator functions:");
- ERROR("wimlib was compiled with the --without-custom-memory-allocator "
- "flag");
- return WIMLIB_ERR_UNSUPPORTED;
-#endif
}
static bool seeded = false;
return max_len;
}
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
void
xml_set_memory_allocator(void *(*malloc_func)(size_t),
void (*free_func)(void *),
{
xmlMemSetup(free_func, malloc_func, realloc_func, STRDUP);
}
-#endif
static int
calculate_dentry_statistics(struct wim_dentry *dentry, void *arg)