From 808cb201dedbe6d8767e8b917d3669bd8320b6be Mon Sep 17 00:00:00 2001
From: "Bruno G. Albuquerque" <bga@bug-br.org.br>
Date: Wed, 15 Jul 2009 16:52:08 +0000
Subject: [PATCH] - Small clean-up. Change relevant function names to more
 appropriate and   non-ambiguous names (as pointed out by Ingo). - This file
 has a lot of code that is Haiku only and is not in the original   ntfs-3g
 code. maybe we should try to clean this up and merge the changes   upstream.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31592 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../kernel/file_systems/ntfs/libntfs/unistr.c        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/ntfs/libntfs/unistr.c b/src/add-ons/kernel/file_systems/ntfs/libntfs/unistr.c
index 20029aec8e..2b919eb11f 100644
--- a/src/add-ons/kernel/file_systems/ntfs/libntfs/unistr.c
+++ b/src/add-ons/kernel/file_systems/ntfs/libntfs/unistr.c
@@ -707,7 +707,7 @@ fail:
  * Returns the number of bytes consumed, or 0 on error.
  */
 static int
-ntfs_wc_to_utf8(wchar_t c,unsigned char* buf)
+ntfs_utf16_to_utf8(ntfschar c, unsigned char* buf)
 {
 	if(c==0)
 		return 0; /* No support for embedded 0 runes */
@@ -740,7 +740,7 @@ ntfs_wc_to_utf8(wchar_t c,unsigned char* buf)
  * Returns the number of bytes consumed, or 0 on error.
  */
 static int
-ntfs_wc_from_utf8(const unsigned char* str, ntfschar* c)
+ntfs_utf16_from_utf8(const unsigned char* str, ntfschar* c)
 {
 	int l=0,i;
 
@@ -787,7 +787,7 @@ static inline int ntfs_dupuni2utf8(const ntfschar* in, int in_len,char **out,int
 
 	/* count the length of the resulting UTF-8 */
 	for(i=len8=0;i<in_len;i++) {
-		tmp=ntfs_wc_to_utf8(le16_to_cpu( *(in+i) ),0);
+		tmp=ntfs_utf16_to_utf8(le16_to_cpu( *(in+i) ),0);
 		if(!tmp)
 			/* invalid character */
 			return EILSEQ;
@@ -800,7 +800,7 @@ static inline int ntfs_dupuni2utf8(const ntfschar* in, int in_len,char **out,int
 	result[len8]='\0';
 	*out_len=len8;
 	for(i=len8=0;i<in_len;i++)
-		len8+=ntfs_wc_to_utf8(le16_to_cpu( *(in+i) ),result+len8);
+		len8+=ntfs_utf16_to_utf8(le16_to_cpu( *(in+i) ),result+len8);
 	return 0;
 }
 
@@ -815,7 +815,7 @@ static inline int ntfs_duputf82uni(unsigned char* in, int in_len,ntfschar** out,
 	ntfschar* result;
 	ntfschar wtmp;
 	for(i=len16=0;i<in_len;i+=tmp,len16++) {
-		tmp=ntfs_wc_from_utf8(in+i,&wtmp);
+		tmp=ntfs_utf16_from_utf8(in+i,&wtmp);
 		if(!tmp)
 			return EILSEQ;
 	}
@@ -826,7 +826,7 @@ static inline int ntfs_duputf82uni(unsigned char* in, int in_len,ntfschar** out,
 	*out_len=len16;
 	for(i=len16=0;i<in_len;i+=tmp,len16++)
 	{
-		tmp=ntfs_wc_from_utf8(in+i, &wtmp);
+		tmp=ntfs_utf16_from_utf8(in+i, &wtmp);
 		*(result+len16) = cpu_to_le16(wtmp);
 	}
 	return 0;