diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/EvictorI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IcePatch2/Util.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/IceSSL/Instance.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/IceSSL/Util.cpp | 5 |
4 files changed, 11 insertions, 8 deletions
diff --git a/cpp/src/Freeze/EvictorI.cpp b/cpp/src/Freeze/EvictorI.cpp index bc6d7de6268..4e148fedbc1 100644 --- a/cpp/src/Freeze/EvictorI.cpp +++ b/cpp/src/Freeze/EvictorI.cpp @@ -1620,7 +1620,7 @@ Freeze::EvictorI::run() DbTxn* tx = 0; _dbEnv->getEnv()->txn_begin(0, &tx, 0); - long txnId; + long txnId = 0; if(_txTrace >= 1) { txnId = (tx->id() & 0x7FFFFFFF) + 0x80000000L; diff --git a/cpp/src/IcePatch2/Util.cpp b/cpp/src/IcePatch2/Util.cpp index 1fb589d1e98..20c80f713cd 100644 --- a/cpp/src/IcePatch2/Util.cpp +++ b/cpp/src/IcePatch2/Util.cpp @@ -946,9 +946,9 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G } const string pathBZ2Temp = path + ".bz2temp"; - FILE* stdioFile; - int bzError; - BZFILE* bzFile; + FILE* stdioFile = 0; + int bzError = 0; + BZFILE* bzFile = 0; if(doCompress) { stdioFile = OS::fopen(simplify(pathBZ2Temp), "wb"); diff --git a/cpp/src/IceSSL/Instance.cpp b/cpp/src/IceSSL/Instance.cpp index f60b1e07676..fd3e2b3324d 100644 --- a/cpp/src/IceSSL/Instance.cpp +++ b/cpp/src/IceSSL/Instance.cpp @@ -246,7 +246,7 @@ IceSSL::Instance::initialize() // password retries. // int count = 0; - int err; + int err = 0; while(count < passwordRetryMax) { ERR_clear_error(); @@ -316,7 +316,7 @@ IceSSL::Instance::initialize() // password retries. // int count = 0; - int err; + int err = 0; while(count < passwordRetryMax) { ERR_clear_error(); @@ -381,7 +381,7 @@ IceSSL::Instance::initialize() // password retries. // int count = 0; - int err; + int err = 0; while(count < passwordRetryMax) { ERR_clear_error(); diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index 628641df9dc..2298170812c 100644 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -475,7 +475,10 @@ IceSSL::populateConnectionInfo(SSL* ssl, SOCKET fd, const string& adapterName, b IceInternal::fdToLocalAddress(fd, info.localAddr); - bool peerConnected = IceInternal::fdToRemoteAddress(fd, info.remoteAddr); +#ifndef NDEBUG + bool peerConnected = +#endif + IceInternal::fdToRemoteAddress(fd, info.remoteAddr); assert(peerConnected); return info; |