utf8_to_utf16(), utf16_to_utf8() changes

[wimlib] / src / ntfs-apply.c

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index f1ff0dd1adc6f28713b496ba35b826e9902c03fb..0bfc060e9a55d0430e2dadbf67e786c96399f34c 100644 (file)
--- a/src/ntfs-apply.c
+++ b/src/ntfs-apply.c
@@ -461,14 +461,12 @@ out_set_dos_name:
 
                char *short_name_utf8;
                size_t short_name_utf8_len;
-               short_name_utf8 = utf16_to_utf8(dentry->short_name,
-                                               dentry->short_name_len,
-                                               &short_name_utf8_len);
-               if (!short_name_utf8) {
-                       ERROR("Out of memory");
-                       ret = WIMLIB_ERR_NOMEM;
+               ret = utf16_to_utf8(dentry->short_name,
+                                   dentry->short_name_len,
+                                   &short_name_utf8,
+                                   &short_name_utf8_len);
+               if (ret != 0)
                        goto out_close_dir_ni;
-               }
 
                if (is_hardlink) {
                        char *p;