X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsymlink.c;h=70301b35269d266b93f0c15b507939de9654648f;hp=1e0109fde59a7b91f7fb085ed0550fc3e22e68c5;hb=650997e4865a090b6856c7ca34b02f42994e8e29;hpb=276f9f9f9658f4a8bafd6216db46760abe8c848d

diff --git a/src/symlink.c b/src/symlink.c
index 1e0109fd..70301b35 100644
--- a/src/symlink.c
+++ b/src/symlink.c
@@ -48,7 +48,7 @@ static ssize_t
 get_symlink_name(const void *resource, size_t resource_len, char *buf,
 		 size_t buf_len, u32 reparse_tag)
 {
-	const u8 *p = resource;
+	const void *p = resource;
 	u16 substitute_name_offset;
 	u16 substitute_name_len;
 	u16 print_name_offset;
@@ -82,17 +82,12 @@ get_symlink_name(const void *resource, size_t resource_len, char *buf,
 	if (header_size + substitute_name_offset + substitute_name_len > resource_len)
 		return -EIO;
 
-	ret = utf16le_to_mbs((const utf16lechar*)(p + substitute_name_offset),
-			    substitute_name_len,
-			    &link_target, &link_target_len);
+	ret = utf16le_to_tstr((const utf16lechar*)(p + substitute_name_offset),
+			      substitute_name_len,
+			      &link_target, &link_target_len);
 	if (ret)
 		return -errno;
 
-	wimlib_assert(ret == 0);
-
-	if (!link_target)
-		return -EIO;
-
 	if (link_target_len + 1 > buf_len) {
 		ret = -ENAMETOOLONG;
 		goto out;
@@ -150,7 +145,7 @@ make_symlink_reparse_data_buf(const char *symlink_target,
 	size_t len = 12 + name_utf16le_nbytes * 2;
 	void *buf = MALLOC(len);
 	if (buf) {
-		u8 *p = buf;
+		void *p = buf;
 		p = put_u16(p, name_utf16le_nbytes); /* Substitute name offset */
 		p = put_u16(p, name_utf16le_nbytes); /* Substitute name length */
 		p = put_u16(p, 0); /* Print name offset */
@@ -269,4 +264,4 @@ out_free_symlink_buf:
 	return ret;
 }
 
-#endif /* !defined(__WIN32__) && !defined(WITH_FUSE) */
+#endif /* !defined(__WIN32__) */