Date: Wednesday, December 14, 2005 @ 17:47:52
Author: gilles
Path: /cvsroot/carob/carob/src
Modified: Common.cpp (1.11 -> 1.12) DriverResultSet.cpp (1.21 -> 1.22)
JavaSocket.cpp (1.20 -> 1.21)
Removed dangerous calls to function memset(...), replaced by =Â {0} (where
applicable)
---------------------+
Common.cpp | 7 ++-----
DriverResultSet.cpp | 3 +--
JavaSocket.cpp | 12 +++---------
3 files changed, 6 insertions(+), 16 deletions(-)
Index: carob/src/Common.cpp
diff -u carob/src/Common.cpp:1.11 carob/src/Common.cpp:1.12
--- carob/src/Common.cpp:1.11 Tue Dec 13 16:08:30 2005
+++ carob/src/Common.cpp Wed Dec 14 17:47:52 2005
@@ -112,8 +112,7 @@
unsigned destWArrayLen = in.length() + 1;
wchar_t* destwarray = new wchar_t[destWArrayLen];
- mbstate_t mbstate;
- memset((void*)&mbstate, 0, sizeof(mbstate));
+ mbstate_t mbstate = {0};
// FIXME: this C function considers with NULL-terminated strings
// replace this code by a codecvt
@@ -138,9 +137,7 @@
const wchar_t* inwarray = in.c_str();
unsigned destMBArrayLen = MB_CUR_MAX * in.length() + 1;
char* destarray = new char[destMBArrayLen];
-
- mbstate_t mbstate;
- memset((void*)&mbstate, 0, sizeof(mbstate));
+ mbstate_t mbstate = {0};
// FIXME: this C function considers with NULL-terminated strings
// replace this code by a codecvt
Index: carob/src/DriverResultSet.cpp
diff -u carob/src/DriverResultSet.cpp:1.21 carob/src/DriverResultSet.cpp:1.22
--- carob/src/DriverResultSet.cpp:1.21 Tue Dec 13 18:18:51 2005
+++ carob/src/DriverResultSet.cpp Wed Dec 14 17:47:52 2005
@@ -289,8 +289,7 @@
vector<bool> nullsForThisRow;
vector<ResultSetDataType> rowOfData;
//Declare empty result which is used in case of null values
- ResultSetDataType emptyResult;
- memset(&emptyResult,0,sizeof(emptyResult));
+ ResultSetDataType emptyResult = {0};
//Reserve memory now so it won't be done during iterations
nullsForThisRow.reserve(nbOfColumns);
rowOfData.reserve(nbOfColumns);
Index: carob/src/JavaSocket.cpp
diff -u carob/src/JavaSocket.cpp:1.20 carob/src/JavaSocket.cpp:1.21
--- carob/src/JavaSocket.cpp:1.20 Tue Dec 6 17:47:42 2005
+++ carob/src/JavaSocket.cpp Wed Dec 14 17:47:52 2005
@@ -102,8 +102,7 @@
struct addrinfo *addressInfoList,
*addressInfoPtr;
- sockaddr_in addr;
- memset(&addr, 0, sizeof(addr));
+ sockaddr_in addr = {0};
// try
std::string hostAsString = toString(host);
#if 0
@@ -196,11 +195,8 @@
const wchar_t* oriStr = str.c_str();
uint8_t* utfStr = new uint8_t[strlenPlusOne];
- size_t countConverted;
- mbstate_t mbstate;
-
- // Reset to initial shift state
- memset((void*)&mbstate, 0, sizeof(mbstate));
+ size_t countConverted;
+ mbstate_t mbstate = {0};
if (isVerboseEnabled())
logVerbose(fctName, L"Converting string...");
@@ -246,8 +242,6 @@
if (receiveFromSocket(fctName, L"UTF string size", &lenRecNet,
sizeof(lenRecNet), 0))
{
lenRec = ntohs(lenRecNet);
- mbstate_t mbstate;
- memset((void*)&mbstate, 0, sizeof(mbstate));
uint8_t* utfStr = new uint8_t[lenRec+1];
memset(utfStr, 0, lenRec+1);
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
