dnrops
/
node-oracledb
mirror of https://github.com/oracle/node-oracledb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Silence warnings from the Microsoft C++ compiler

This commit is contained in:
Christopher Jones 2017-06-14 09:33:01 +10:00
parent 0448cdc210
commit be53eb3341
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/njs/src/njsConnection.cpp
View File

@ -298,7 +298,7 @@ bool njsConnection::ProcessLOBs(njsBaton *baton, njsVariable *vars,
continue;
}
if (baton->isReturning && var->bindDir == NJS_BIND_OUT)
numElements = baton->rowsAffected;
numElements = (uint32_t) baton->rowsAffected;
else if (!var->isArray)
numElements = baseNumElements;
else {
@ -408,7 +408,8 @@ bool njsConnection::PrepareAndBind(njsBaton *baton)
{
// prepare DPI statement for use
if (dpiConn_prepareStmt(baton->dpiConnHandle, 0, baton->sql.c_str(),
baton->sql.length(), NULL, 0, &baton->dpiStmtHandle) < 0) {
(uint32_t) baton->sql.length(), NULL, 0,
&baton->dpiStmtHandle) < 0) {
baton->GetDPIError();
return false;
}
@ -441,7 +442,8 @@ bool njsConnection::PrepareAndBind(njsBaton *baton)
status = dpiStmt_bindByPos(baton->dpiStmtHandle, var->pos,
var->dpiVarHandle);
else status = dpiStmt_bindByName(baton->dpiStmtHandle,
var->name.c_str(), var->name.length(), var->dpiVarHandle);
var->name.c_str(), (uint32_t) var->name.length(),
var->dpiVarHandle);
if (status < 0) {
baton->GetDPIError();
return false;
@ -935,7 +937,7 @@ bool njsConnection::ProcessScalarBindValue(Local<Value> value,
if (bindOk) {
Local<Object> obj = value->ToObject();
if (dpiVar_setFromBytes(var->dpiVarHandle, pos, Buffer::Data(obj),
Buffer::Length(obj)) < 0) {
(uint32_t) Buffer::Length(obj)) < 0) {
baton->GetDPIError();
return false;
}
@ -980,7 +982,7 @@ bool njsConnection::GetBindTypeAndSizeFromValue(Local<Value> value,
*bindType = NJS_DATATYPE_DATE;
} else if (value->IsObject() && Buffer::HasInstance(value->ToObject())) {
*bindType = NJS_DATATYPE_BUFFER;
*maxSize = Buffer::Length(value->ToObject());
*maxSize = (uint32_t) Buffer::Length(value->ToObject());
} else if (!scalarOnly && value->IsArray()) {
Nan::HandleScope scope;
Local<Array> arrayVal = Local<Array>::Cast(value);
@ -1188,7 +1190,7 @@ bool njsConnection::GetValueFromVar(njsBaton *baton, njsVariable *var,
baton->GetDPIError();
return false;
}
numElements = baton->rowsAffected;
numElements = (uint32_t) baton->rowsAffected;
} else {
if (dpiVar_getNumElementsInArray(var->dpiVarHandle,
&numElements) < 0) {
@ -1251,7 +1253,7 @@ Local<Value> njsConnection::GetOutBinds(njsBaton *baton)
Nan::Set(bindArray, arrayPos, val);
else {
Local<String> key = Nan::New<String>(var->name.c_str() + 1,
var->name.length() - 1).ToLocalChecked();
(int) var->name.length() - 1).ToLocalChecked();
Nan::Set(bindObj, key, val);
}
arrayPos++;

4
src/njs/src/njsIntLob.cpp
View File

@ -352,12 +352,12 @@ void njsILob::Async_AfterRead(njsBaton *baton, Local<Value> argv[])
argv[1] = scope.Escape(Nan::Null());
else if (lob->dataType == NJS_DATATYPE_CLOB) {
Local<String> strValue = Nan::New<String>(baton->bufferPtr,
baton->bufferSize).ToLocalChecked();
(int) baton->bufferSize).ToLocalChecked();
lob->offset += strValue->ToString()->Length();
argv[1] = scope.Escape(strValue);
} else {
Local<Value> bufferValue = Nan::CopyBuffer(baton->bufferPtr,
baton->bufferSize).ToLocalChecked();
(uint32_t) baton->bufferSize).ToLocalChecked();
lob->offset += baton->bufferSize;
argv[1] = scope.Escape(bufferValue);
}

18
src/njs/src/njsOracle.cpp
View File

@ -118,7 +118,7 @@ void njsOracledb::Init(Handle<Object> target)
njsCommonCreateParams.nencoding = "UTF-8";
njsCommonCreateParams.driverName = NJS_DRIVER_NAME;
njsCommonCreateParams.driverNameLength =
strlen(njsCommonCreateParams.driverName);
(uint32_t) strlen(njsCommonCreateParams.driverName);
Local<FunctionTemplate> temp = Nan::New<FunctionTemplate>(New);
temp->InstanceTemplate()->SetInternalFieldCount(1);
@ -698,10 +698,10 @@ void njsOracledb::Async_GetConnection(njsBaton *baton)
}
params.externalAuth = baton->externalAuth;
if (dpiConn_create(globalDPIContext, baton->user.c_str(),
baton->user.length(), baton->password.c_str(),
baton->password.length(), baton->connectString.c_str(),
baton->connectString.length(), &njsCommonCreateParams, &params,
&baton->dpiConnHandle) < 0)
(uint32_t) baton->user.length(), baton->password.c_str(),
(uint32_t) baton->password.length(), baton->connectString.c_str(),
(uint32_t) baton->connectString.length(), &njsCommonCreateParams,
&params, &baton->dpiConnHandle) < 0)
baton->GetDPIError();
else if (dpiConn_setStmtCacheSize(baton->dpiConnHandle,
baton->stmtCacheSize) < 0)
@ -788,10 +788,10 @@ void njsOracledb::Async_CreatePool(njsBaton *baton)
params.sessionIncrement = baton->poolIncrement;
params.externalAuth = baton->externalAuth;
if (dpiPool_create(globalDPIContext, baton->user.c_str(),
baton->user.length(), baton->password.c_str(),
baton->password.length(), baton->connectString.c_str(),
baton->connectString.length(), &njsCommonCreateParams, &params,
&baton->dpiPoolHandle) < 0)
(uint32_t) baton->user.length(), baton->password.c_str(),
(uint32_t) baton->password.length(), baton->connectString.c_str(),
(uint32_t) baton->connectString.length(), &njsCommonCreateParams,
&params, &baton->dpiPoolHandle) < 0)
baton->GetDPIError();
else if (dpiPool_setTimeout(baton->dpiPoolHandle, baton->poolTimeout) < 0)
baton->GetDPIError();