X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Futil.h;h=a3984bb30c2eb2fb4048f119afc62347effdfb66;hb=5577584b8a50baa958f832ddb9418986e3e38847;hp=640cdef8ca86a9497812ebc397b614496a1af3ce;hpb=885632f08c75c1d7bb5d25436231c78f6ad7e0c0;p=wimlib

diff --git a/src/util.h b/src/util.h
index 640cdef8..a3984bb3 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,26 +1,3 @@
-/*
- * util.h
- *
- * Header for util.c.
- *
- * Copyright (C) 2012 Eric Biggers
- *
- * wimlib - Library for working with WIM files 
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option) any
- * later version.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License along
- * with this library; if not, write to the Free Software Foundation, Inc., 59
- * Temple Place, Suite 330, Boston, MA 02111-1307 USA 
- */
-
 #ifndef _WIMLIB_UTIL_H
 #define _WIMLIB_UTIL_H
 
@@ -28,8 +5,30 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <inttypes.h>
+#include <sys/types.h>
 #include "config.h"
 
+#ifdef __GNUC__
+#	define WIMLIBAPI __attribute__((visibility("default")))
+#	define NOINLINE __attribute__((noinline))
+#	define ALWAYS_INLINE inline __attribute__((always_inline))
+#	define FORMAT(type, format_str, args_start) \
+			__attribute__((format(type, format_str, args_start)))
+#	if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
+#		define COLD     __attribute__((cold))
+#		define HOT      __attribute__((hot))
+#	else
+#		define COLD
+#		define HOT
+#	endif
+#else
+#	define WIMLIBAPI
+#	define NOINLINE
+#	define ALWAYS_INLINE inline
+#	define FORMAT(type, format_str, args_start)
+#	define COLD
+#	define HOT
+#endif /* __GNUC__ */
 
 typedef uint8_t  u8;
 typedef uint16_t u16;
@@ -47,33 +46,46 @@ typedef unsigned uint;
 
 #define ZERO_ARRAY(array) memset(array, 0, sizeof(array))
 
+/* Used for buffering FILE IO in a few places */
+#define BUFFER_SIZE 4096
+
 #ifdef ENABLE_ERROR_MESSAGES
 extern bool __wimlib_print_errors;
-extern void wimlib_error(const char *format, ...);
-#  define ERROR wimlib_error
+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
 #else
-#  define ERROR(format, ...)
+#	define ERROR(format, ...)
+#	define ERROR_WITH_ERRNO(format, ...)
+#	define WARNING(format, ...)
 #endif /* ENABLE_ERROR_MESSAGES */
 
 #if defined(ENABLE_DEBUG) || defined(ENABLE_MORE_DEBUG)
-#include <errno.h>
-#  define DEBUG(format, ...)  \
-({ \
- 	int __errno_save = errno; \
-	fprintf(stdout, "[%s %d] %s(): " format, \
-		__FILE__, __LINE__, __func__, ## __VA_ARGS__); \
-	fflush(stdout); \
-	errno = __errno_save; \
+#	include <errno.h>
+#	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
-#  define DEBUG(format, ...)
+#	define DEBUG(format, ...)
 #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, ...)
+#	define DEBUG2(format, ...)
 #endif /* ENABLE_DEBUG */
 
 #ifdef ENABLE_ASSERTIONS
@@ -83,19 +95,6 @@ extern void wimlib_error(const char *format, ...);
 #	define wimlib_assert(expr)
 #endif
 
-#ifdef __GNUC__
-#  define WIMLIBAPI __attribute__((visibility("default")))
-#  define NOINLINE __attribute__((noinline))
-#  define ALWAYS_INLINE inline __attribute__((always_inline))
-#  define COLD     __attribute__((cold))
-#  define HOT      __attribute__((hot))
-#else
-#  define WIMLIBAPI
-#  define NOINLINE
-#  define ALWAYS_INLINE inline
-#  define COLD
-#  define HOT
-#endif /* __GNUC__ */
 
 #ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
 extern void *(*wimlib_malloc_func)(size_t);
@@ -103,19 +102,19 @@ extern void (*wimlib_free_func)(void *);
 extern void *(*wimlib_realloc)(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
+#	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
+#	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 */
 
 
@@ -144,7 +143,6 @@ extern int get_num_path_components(const char *path);
 
 extern ssize_t full_write(int fd, const void *buf, size_t n);
 
-
 static inline void print_byte_field(const u8 field[], size_t len)
 {
 	while (len--)