diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-07-12 21:32:14 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-07-26 10:12:44 +0200 |
| commit | 5a7b589bb3a32d49d2a196fe277a0d51f6afa541 (patch) | |
| tree | 379ff49a8ef82d5309101e63de24356cc75121f6 /nxcomp/src/Proxy.cpp | |
| parent | 93c4cea66aa328dcfe378d3569c75c40f18d662d (diff) | |
| download | nx-libs-5a7b589bb3a32d49d2a196fe277a0d51f6afa541.tar.gz nx-libs-5a7b589bb3a32d49d2a196fe277a0d51f6afa541.tar.bz2 nx-libs-5a7b589bb3a32d49d2a196fe277a0d51f6afa541.zip | |
nxcomp: Trivially fix local variables shadowing variables of same name from higher scope.
Diffstat (limited to 'nxcomp/src/Proxy.cpp')
| -rw-r--r-- | nxcomp/src/Proxy.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nxcomp/src/Proxy.cpp b/nxcomp/src/Proxy.cpp index 72b2cee21..32c32795c 100644 --- a/nxcomp/src/Proxy.cpp +++ b/nxcomp/src/Proxy.cpp @@ -1138,9 +1138,9 @@ int Proxy::handleRead() // the failure is detected. // - int result = channels_[channelId] -> handleWrite(message, dataLength); + int _result = channels_[channelId] -> handleWrite(message, dataLength); - if (result < 0 && finish == 0) + if (_result < 0 && finish == 0) { #ifdef TEST *logofs << "Proxy: Failed to write proxy data to FD#" @@ -5793,14 +5793,14 @@ void Proxy::setSplitTimeout(int channelId) for (T_list::iterator j = channelList.begin(); j != channelList.end(); j++) { - int channelId = *j; + int _channelId = *j; - if (channels_[channelId] != NULL && - channels_[channelId] -> needSplit() == 1) + if (channels_[_channelId] != NULL && + channels_[_channelId] -> needSplit() == 1) { #ifdef TEST *logofs << "Proxy: SPLIT! Channel for FD#" - << getFd(channelId) << " still needs splits.\n" + << getFd(_channelId) << " still needs splits.\n" << logofs_flush; #endif @@ -5840,14 +5840,14 @@ void Proxy::setMotionTimeout(int channelId) for (T_list::iterator j = channelList.begin(); j != channelList.end(); j++) { - int channelId = *j; + int _channelId = *j; - if (channels_[channelId] != NULL && - channels_[channelId] -> needMotion() == 1) + if (channels_[_channelId] != NULL && + channels_[_channelId] -> needMotion() == 1) { #ifdef TEST *logofs << "Proxy: SPLIT! Channel for FD#" - << getFd(channelId) << " still needs motions.\n" + << getFd(_channelId) << " still needs motions.\n" << logofs_flush; #endif |