aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/src/Channel.cpp
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-12-05 18:12:11 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-12-05 18:12:11 +0100
commit05cf54af3de6f3e32e08d7bc32e10d58221a068b (patch)
tree05ee5221e4824d1210682e1be268c981684194f3 /nxcomp/src/Channel.cpp
parent7f777e01e3bb8780ba91e70171a0aae78a95692e (diff)
parentb8c929773fac19dad8af05d0bc64b1b3fed88309 (diff)
downloadnx-libs-05cf54af3de6f3e32e08d7bc32e10d58221a068b.tar.gz
nx-libs-05cf54af3de6f3e32e08d7bc32e10d58221a068b.tar.bz2
nx-libs-05cf54af3de6f3e32e08d7bc32e10d58221a068b.zip
Merge branch 'uli42-pr/fix_global_tcpFD' into 3.6.x
Attributes GH PR #579: https://github.com/ArcticaProject/nx-libs/pull/579
Diffstat (limited to 'nxcomp/src/Channel.cpp')
-rw-r--r--nxcomp/src/Channel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/nxcomp/src/Channel.cpp b/nxcomp/src/Channel.cpp
index 24a422e37..e575a9e6b 100644
--- a/nxcomp/src/Channel.cpp
+++ b/nxcomp/src/Channel.cpp
@@ -1238,7 +1238,7 @@ int Channel::handleWait(int timeout)
}
#ifdef TEST
- *logofs << "handleWait: Waiting " << remaining << " Ms "
+ *logofs << "handleWait: Waiting " << remaining << " ms "
<< "for a new message on FD#" << fd_
<< ".\n" << logofs_flush;
#endif
@@ -1306,7 +1306,7 @@ int Channel::handleDrain(int limit, int timeout)
#ifdef TEST
*logofs << "handleDrain: Trying to write to FD#"
- << fd_ << " with " << remaining << " Ms "
+ << fd_ << " with " << remaining << " ms "
<< "remaining.\n" << logofs_flush;
#endif