Simplify code by using calculation performed in ODPI-C

This commit is contained in:
Christopher Jones 2018-11-26 14:39:39 +11:00
parent 22d743c179
commit c19932d33a
2 changed files with 2 additions and 14 deletions

View File

@ -2808,11 +2808,7 @@ NAN_GETTER(njsConnection::GetOracleServerVersion)
njsOracledb::ThrowDPIError();
return;
}
uint32_t oracleServerVersion = static_cast<uint32_t> (
100000000 * versionInfo.versionNum +
1000000 * versionInfo.releaseNum + 10000 * versionInfo.updateNum +
100 * versionInfo.portReleaseNum + versionInfo.portUpdateNum);
info.GetReturnValue().Set(oracleServerVersion);
info.GetReturnValue().Set(versionInfo.fullVersionNum);
}

View File

@ -819,7 +819,6 @@ NAN_SETTER(njsOracledb::SetFetchAsBuffer)
NAN_GETTER(njsOracledb::GetOracleClientVersion)
{
dpiVersionInfo versionInfo;
unsigned int version;
njsOracledb *oracledb = (njsOracledb*) ValidateGetter(info);
if (!oracledb)
@ -830,14 +829,7 @@ NAN_GETTER(njsOracledb::GetOracleClientVersion)
return;
}
version = static_cast <unsigned int> (
100000000 * versionInfo.versionNum +
1000000 * versionInfo.releaseNum +
10000 * versionInfo.updateNum +
100 * versionInfo.portReleaseNum +
versionInfo.portUpdateNum );
info.GetReturnValue().Set(version);
info.GetReturnValue().Set(versionInfo.fullVersionNum);
}