X-Git-Url: http://git.sven.stormbind.net/?a=blobdiff_plain;f=libexfat%2Flookup.c;h=50ad31f5555611c660aba440d5babf7456cbced3;hb=1e7534bbaa34e6c2a8c9809dfcf6588112cbdee4;hp=4b27cc54e2679b201080b4c3ffa901147779309f;hpb=914023217c196c0831fe3295d9d8c7176b7e3609;p=sven%2Ffuse-exfat.git

diff --git a/libexfat/lookup.c b/libexfat/lookup.c
index 4b27cc5..50ad31f 100644
--- a/libexfat/lookup.c
+++ b/libexfat/lookup.c
@@ -3,7 +3,7 @@
 	exFAT file system implementation library.
 
 	Free exFAT implementation.
-	Copyright (C) 2010-2017  Andrew Nayenko
+	Copyright (C) 2010-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
@@ -46,7 +46,7 @@ void exfat_closedir(struct exfat* ef, struct exfat_iterator* it)
 	it->current = NULL;
 }
 
-struct exfat_node* exfat_readdir(struct exfat* ef, struct exfat_iterator* it)
+struct exfat_node* exfat_readdir(struct exfat_iterator* it)
 {
 	if (it->current == NULL)
 		it->current = it->parent->child;
@@ -86,14 +86,14 @@ static int lookup_name(struct exfat* ef, struct exfat_node* parent,
 
 	*node = NULL;
 
-	rc = utf8_to_utf16(buffer, name, EXFAT_NAME_MAX + 1, n);
+	rc = exfat_utf8_to_utf16(buffer, name, EXFAT_NAME_MAX + 1, n);
 	if (rc != 0)
 		return rc;
 
 	rc = exfat_opendir(ef, parent, &it);
 	if (rc != 0)
 		return rc;
-	while ((*node = exfat_readdir(ef, &it)))
+	while ((*node = exfat_readdir(&it)))
 	{
 		if (compare_name(ef, buffer, (*node)->name) == 0)
 		{
@@ -194,7 +194,7 @@ int exfat_split(struct exfat* ef, struct exfat_node** parent,
 				exfat_put_node(ef, *parent);
 				return -ENOENT;
 			}
-			rc = utf8_to_utf16(name, p, EXFAT_NAME_MAX + 1, n);
+			rc = exfat_utf8_to_utf16(name, p, EXFAT_NAME_MAX + 1, n);
 			if (rc != 0)
 			{
 				exfat_put_node(ef, *parent);