X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.h;h=d87a0e827d16e5c2d80629c84b8af4e5ef3b3769;hp=3d917bf547b5e9e1cf7ebd4a2109810b08b9c4d2;hb=b61e9afca45dacd9baefbcfa17dbea2af75259b8;hpb=dcfbcf5cce40b473afb8303245c035f37d72ac9b

diff --git a/src/util.h b/src/util.h
index 3d917bf5..d87a0e82 100644
--- a/src/util.h
+++ b/src/util.h
@@ -30,17 +30,51 @@
 #	define HOT
 #endif /* __GNUC__ */
 
+
+#if 0
+#ifdef WITH_FUSE
+#define atomic_inc(ptr) \
+	__sync_fetch_and_add(ptr, 1)
+
+#define atomic_dec(ptr) \
+	__sync_sub_and_fetch(ptr, 1)
+#endif
+#endif
+
+#ifndef _NTFS_TYPES_H
 typedef uint8_t  u8;
 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); \
 					(__a < __b) ? __a : __b; })
+#endif
+
+#ifndef max
 #define max(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); \
 					(__a > __b) ? __a : __b; })
+#endif
+
+#ifndef swap
 #define swap(a, b) ({typeof(a) _a = a; (a) = (b); (b) = _a;})
+#endif
+
+/**
+ * container_of - cast a member of a structure out to the containing structure
+ * @ptr:	the pointer to the member.
+ * @type:	the type of the container struct this is embedded in.
+ * @member:	the name of the member within the struct.
+ *
+ */
+#ifndef container_of
+#define container_of(ptr, type, member) ({			\
+	const typeof( ((type *)0)->member ) *__mptr = (ptr);	\
+	(type *)( (char *)__mptr - offsetof(type,member) );})
+#endif
 
 #define ARRAY_LEN(array) (sizeof(array) / sizeof((array)[0]))
 
@@ -51,26 +85,31 @@ typedef unsigned uint;
 
 #ifdef ENABLE_ERROR_MESSAGES
 extern bool __wimlib_print_errors;
-extern void wimlib_error(const char *format, ...) 
+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 WARNING wimlib_warning
+#	define ERROR		wimlib_error
+#	define ERROR_WITH_ERRNO wimlib_error_with_errno
+#	define WARNING		wimlib_warning
 #else
 #	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; \
+#	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
@@ -94,7 +133,7 @@ extern void wimlib_warning(const char *format, ...)
 #ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
 extern void *(*wimlib_malloc_func)(size_t);
 extern void (*wimlib_free_func)(void *);
-extern void *(*wimlib_realloc)(void *, size_t);
+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
@@ -116,20 +155,20 @@ extern char *wimlib_strdup(const char *str);
 extern char *utf16_to_utf8(const char *utf16_str, size_t utf16_len,
 			   size_t *utf8_len_ret);
 
-extern char *utf8_to_utf16(const char *utf8_str, size_t utf8_len, 
+extern char *utf8_to_utf16(const char *utf8_str, size_t utf8_len,
 			   size_t *utf16_len_ret);
 
-extern void randomize_byte_array(void *p, size_t n);
+extern void randomize_byte_array(u8 *p, size_t n);
 
 extern void randomize_char_array_with_alnum(char p[], size_t n);
 
-extern int sha1sum(const char *filename, void *buf);
-
-extern const char *path_next_part(const char *path, 
+extern const char *path_next_part(const char *path,
 				  size_t *first_part_len_ret);
 
 extern const char *path_basename(const char *path);
 
+extern const char *path_stream_name(const char *path);
+
 extern void to_parent_name(char buf[], size_t len);
 
 extern void print_string(const void *string, size_t len);