Decompression optimizations

[wimlib] / src / util.h

diff --git a/src/util.h b/src/util.h
index 28935938871e9542132727fc727b5ebd1993284e..b97731b56730936c68077197a60fe6125fa141a4 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -10,24 +10,21 @@
 
 #ifdef __GNUC__
 #      define WIMLIBAPI __attribute__((visibility("default")))
-#      define NOINLINE __attribute__((noinline))
 #      define ALWAYS_INLINE inline __attribute__((always_inline))
+#      define PACKED __attribute__((packed))
 #      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
+#      define PACKED
 #endif /* __GNUC__ */
 
 
@@ -47,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); \
@@ -135,6 +131,12 @@ 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
+
 
 #ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
 extern void *(*wimlib_malloc_func)(size_t);
@@ -158,12 +160,14 @@ extern char *wimlib_strdup(const char *str);
 #endif /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
 
 
-extern char *utf16_to_utf8(const char *utf16_str, size_t utf16_len,
-                          size_t *utf8_len_ret);
+/* encoding.c */
+extern int utf16_to_utf8(const char *utf16_str, size_t utf16_nbytes,
+                        char **utf8_str_ret, size_t *utf8_nbytes_ret);
 
-extern char *utf8_to_utf16(const char *utf8_str, size_t utf8_len,
-                          size_t *utf16_len_ret);
+extern int utf8_to_utf16(const char *utf8_str, size_t utf8_nbytes,
+                        char **utf16_str_ret, size_t *utf16_nbytes_ret);
 
+/* util.c */
 extern void randomize_byte_array(u8 *p, size_t n);
 
 extern void randomize_char_array_with_alnum(char p[], size_t n);
@@ -181,8 +185,6 @@ extern void print_string(const void *string, size_t len);
 
 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--)