X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.h;h=b97731b56730936c68077197a60fe6125fa141a4;hp=8a6dc4da2174a1c747db67dfed9347b8afa01cea;hb=a6f5add5e9811584ebd75591a6a25cb9686da9a8;hpb=9f9d3eb4bb33782c66d52b825bb84578f74de817

diff --git a/src/util.h b/src/util.h
index 8a6dc4da..b97731b5 100644
--- a/src/util.h
+++ b/src/util.h
@@ -44,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); \
@@ -132,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);
@@ -155,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);