Date: Tuesday, November 29, 2005 @ 14:23:20
Author: marc
Path: /cvsroot/carob/carob
Modified: include/Common.hpp (1.12 -> 1.13) src/Common.cpp (1.6 -> 1.7)
src/JavaSocket.cpp (1.14 -> 1.15)
renamed toWString() to fromString(), to be consistent with future functions:
toUTF8() and fromUTF8()
--------------------+
include/Common.hpp | 8 +++++---
src/Common.cpp | 2 +-
src/JavaSocket.cpp | 7 +++++--
3 files changed, 11 insertions(+), 6 deletions(-)
Index: carob/include/Common.hpp
diff -u carob/include/Common.hpp:1.12 carob/include/Common.hpp:1.13
--- carob/include/Common.hpp:1.12 Fri Nov 25 15:32:27 2005
+++ carob/include/Common.hpp Tue Nov 29 14:23:20 2005
@@ -112,13 +112,15 @@
extern std::wstring trim(const std::wstring& source,
const wchar_t* delims = L" \t\r\n");
/**
- * String to Wide-String conversion. FIXME: throw exception on error
+ * Default (locale) String to Wide-String conversion.
+ * FIXME: throw exception on error
* @param in original string
* @return converted wstring
*/
-extern std::wstring toWString(const std::string& in);
+extern std::wstring fromString(const std::string& in);
/**
- * Wide-String to String conversion. FIXME: throw exception on error
+ * Wide-String to default (locale) String conversion.
+ * FIXME: throw exception on error
* @param in original wide string
* @return converted string
*/
Index: carob/src/Common.cpp
diff -u carob/src/Common.cpp:1.6 carob/src/Common.cpp:1.7
--- carob/src/Common.cpp:1.6 Fri Nov 25 15:32:27 2005
+++ carob/src/Common.cpp Tue Nov 29 14:23:20 2005
@@ -101,7 +101,7 @@
return result;
}
-wstring toWString(const string& in)
+wstring fromString(const string& in)
{
bool ret = true;
const char* inarray = in.c_str();
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.14 carob/src/JavaSocket.cpp:1.15
--- carob/src/JavaSocket.cpp:1.14 Fri Nov 25 15:32:27 2005
+++ carob/src/JavaSocket.cpp Tue Nov 29 14:23:20 2005
@@ -118,7 +118,7 @@
if (error)
{
const char* gaiMsg = gai_strerror(error);
- wstring wMsg = toWString(gaiMsg);
+ wstring wMsg = fromString(gaiMsg);
if (isErrorEnabled())
logError(fctName, wMsg);
connected = false;
@@ -200,6 +200,7 @@
if (isVerboseEnabled())
logVerbose(fctName, L"Converting string...");
// FIXME: don't use this locale converter, we need to send UTF-8!
+ // we should use: toUTF8() instead
countConverted = wcsrtombs((char*)utfStr, &oriStr,
strlenPlusOne, &mbstate);
if (countConverted == (size_t)-1)
@@ -251,7 +252,9 @@
string received((const char*)utfStr);
// FIXME: don't use this locale converter cause received is ALWAYS UTF-8!
- s = toWString(received);
+ // this is correct:
+ // s = fromUTF8(received);
+ s = fromString(received);
#if 0 // FIXME catch conversion exception
{
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
