Merge branch 'master' of git://github.com/relan/exfat into pie-x86

[android-x86/external-exfat.git] / mkfs / rootdir.c

diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c
index 337e5be..4f9b0e8 100644 (file)
--- a/mkfs/rootdir.c
+++ b/mkfs/rootdir.c
@@ -3,7 +3,7 @@
        Root directory creation code.
 
        Free exFAT implementation.
-       Copyright (C) 2011-2015  Andrew Nayenko
+       Copyright (C) 2011-2018  Andrew Nayenko
 
        This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -20,11 +20,11 @@
        51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <string.h>
 #include "rootdir.h"
 #include "uct.h"
 #include "cbm.h"
 #include "uctc.h"
+#include <string.h>
 
 static off_t rootdir_alignment(void)
 {
@@ -41,12 +41,12 @@ static void init_label_entry(struct exfat_entry_label* label_entry)
        memset(label_entry, 0, sizeof(struct exfat_entry_label));
        label_entry->type = EXFAT_ENTRY_LABEL ^ EXFAT_ENTRY_VALID;
 
-       if (utf16_length(get_volume_label()) == 0)
+       if (exfat_utf16_length(get_volume_label()) == 0)
                return;
 
        memcpy(label_entry->name, get_volume_label(),
                        EXFAT_ENAME_MAX * sizeof(le16_t));
-       label_entry->length = utf16_length(get_volume_label());
+       label_entry->length = exfat_utf16_length(get_volume_label());
        label_entry->type |= EXFAT_ENTRY_VALID;
 }