Date: Monday, January 9, 2006 @ 14:44:12
Author: gilles
Path: /cvsroot/carob/carob/src
Modified: JavaSocket.cpp (1.27 -> 1.28)
Removed #if MODIFIED_UTF8 directive (SEQUOIA-233 is closed so this is ok)
Updated copyright
----------------+
JavaSocket.cpp | 19 +------------------
1 files changed, 1 insertion(+), 18 deletions(-)
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.27 carob/src/JavaSocket.cpp:1.28
--- carob/src/JavaSocket.cpp:1.27 Wed Jan 4 19:26:34 2006
+++ carob/src/JavaSocket.cpp Mon Jan 9 14:44:12 2006
@@ -1,6 +1,6 @@
/*
* Sequoia: Database clustering technology.
- * Copyright (C) 2005 Emic Networks
+ * Copyright (C) 2005-2006 Emic Networks
* Contact: [EMAIL PROTECTED]
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -180,8 +180,6 @@
return true;
}
-#define MODIFIED_UTF8 0 // see SEQUOIA-133
-
// Localization (Chapter 22) in
// /usr/share/doc/gcc-4.0-base/libstdc++/html/documentation.html
@@ -194,12 +192,7 @@
std::string utf8str(toUTF8(str));
- // FIXME: move netlen to int32_t once SEQUOIA-133 is complete
-#if MODIFIED_UTF8
- uint16_t netlen = htons(utf8str.length());
-#else
int32_t netlen = htonl(utf8str.length());
-#endif
//First write number of bytes to follow as
if (sendToSocket(fctName, L"UTF string", &netlen, sizeof(netlen),
MSG_NOSIGNAL))
@@ -217,24 +210,14 @@
{
wstring fctName(L"JavaSocket::readJavaUTF");
- // FIXME: move lenRecNet to int32_t once SEQUOIA-133 is complete
- //the size read on the network
-#if MODIFIED_UTF8
- uint16_t lenRecNet;
-#else
int32_t lenRecNet;
-#endif
//the converted size
uint16_t lenRec;
size_t sizeRead = 0;
//First get size
if (receiveFromSocket(fctName, L"UTF string size", &lenRecNet,
sizeof(lenRecNet), 0))
{
-#if MODIFIED_UTF8
- lenRec = ntohs(lenRecNet); // number of bytes to come
-#else
lenRec = ntohl(lenRecNet); // number of bytes to come
-#endif
uint8_t* utfStr = new uint8_t[lenRec];
if (receiveFromSocket(fctName, L"UTF string", utfStr, lenRec, 0))
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
