[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs/KDE/4=2E6=5D_kio/kio=3A_readTimeout_is_in_s?=
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-04-18 19:42:55
Message-ID: 20110418194255.E0705A609B () git ! kde ! org
[Download RAW message or body]

Git commit ff96d8cbba80300d3d4f75bd89f15872dfb59d5e by Dawit Alemayehu.
Committed on 18/04/2011 at 21:41.
Pushed by adawit into branch 'KDE/4.6'.

readTimeout is in secs. Convert to msecs before use

M  +2    -2    kio/kio/tcpslavebase.cpp     

http://commits.kde.org/kdelibs/ff96d8cbba80300d3d4f75bd89f15872dfb59d5e

diff --git a/kio/kio/tcpslavebase.cpp b/kio/kio/tcpslavebase.cpp
index 3e6cdf6..c5ae7ca 100644
--- a/kio/kio/tcpslavebase.cpp
+++ b/kio/kio/tcpslavebase.cpp
@@ -267,7 +267,7 @@ ssize_t TCPSlaveBase::read(char* data, ssize_t len)
     }
 
     if (!d->socket.bytesAvailable()) {
-        const int timeout = d->isBlocking ? -1 : readTimeout();
+        const int timeout = d->isBlocking ? -1 : (readTimeout() * 1000);
         d->socket.waitForReadyRead(timeout);
     }
 #if 0
@@ -292,7 +292,7 @@ ssize_t TCPSlaveBase::readLine(char *data, ssize_t len)
         return -1;
     }
 
-    const int timeout = (d->isBlocking ? -1: readTimeout());
+    const int timeout = (d->isBlocking ? -1: (readTimeout() * 1000));
     ssize_t readTotal = 0;
     do {
         if (!d->socket.bytesAvailable())

[prev in list] [next in list] [prev in thread] [next in thread]