Tune: Rename functions

Author: tapika

cutf.cpp

@@ -437,7 +437,7 @@ size_t utf8ztowchar(const char* s, wchar_t* out, size_t outsize)
     return utf8towchar(s, SIZE_MAX, out, outsize);
 }
 
-size_t utf8zlength(const char* s)
+size_t utf8zestimate(const char* s)
 {
     return utf8towchar(s, SIZE_MAX, NULL, 0);
 }
@@ -461,7 +461,7 @@ size_t wcharztoutf8(const wchar_t* s, char* out, size_t outsize)
     return wchartoutf8(s, SIZE_MAX, out, outsize);
 }
 
-size_t wcharzlength(const wchar_t* ws)
+size_t wcharzestimate(const wchar_t* ws)
 {
     return wchartoutf8(ws, SIZE_MAX, NULL, 0);
 }

cutf.h

@@ -18,9 +18,9 @@ extern "C"
 //----------------------------------------------------------------------------------------
 
 //
-//  Estimates how much buffer length is required to convert utf-8 to wchar_t
+//  Estimates how much buffer length is required to convert utf-8 to wchar_t (string length + 1)
 //
-size_t utf8zlength(const char* s);
+size_t utf8zestimate(const char* s);
 
 //
 //  Converts utf-8 string to wide version.
@@ -38,9 +38,9 @@ size_t utf8ztowchar(const char* s, wchar_t* out, size_t outsize);
 
 
 //
-//  Estimates how much buffer length is required to convert wide string to utf-8.
+//  Estimates how much many elements in characters is required to convert wide string to utf-8 (string length + 1)
 //
-size_t wcharzlength(const wchar_t* ws);
+size_t wcharzestimate(const wchar_t* ws);
 
 //
 //  Converts wide string to utf-8 string.

test2.cpp

@@ -26,7 +26,7 @@ int simpleStringTest()
     size_t r = 0;
     const wchar_t* chineseText = L"主体";
 
-    ok(wcharzlength(chineseText) == 7);
+    ok(wcharzestimate(chineseText) == 7);
 
     auto s = widetoutf8(chineseText);
 
@@ -39,7 +39,7 @@ int simpleStringTest()
         ok(((uint8_t)s[i]) == utf8_array[i]);
 
     // 2 chars + zero
-    ok(utf8zlength((char*)utf8_array) == 3);
+    ok(utf8zestimate((char*)utf8_array) == 3);
 
     auto ws = utf8towide(s);
     ok(ws.length() == 2);