commit 62be1ce40fa189c19ab661f2530c41d42f7ac64d
author Michal Vasko <mvasko@cesnet.cz> Thu Mar 03 13:24:52 2016 +0100
committer Michal Vasko <mvasko@cesnet.cz> Thu Mar 03 13:24:52 2016 +0100
tree 21901192e48cd5d1d40d7494f61f5eab1bfa8a32
parent 2f1087ab7781bb7f17fc8e2bfa6f7a28cf472f3d

session CHANGE do not returned elapsed time in nc_timedlock

src/session_server.c

diff --git a/src/session_server.c b/src/session_server.c
index 1909c85..63ed831 100644
--- a/src/session_server.c
+++ b/src/session_server.c
@@ -788,7 +788,7 @@
                 uint16_t j;
 
                 /* things are not that simple with SSH... */
-                ret = nc_ssh_pollin(ps->sessions[i], &timeout);
+                ret = nc_ssh_pollin(ps->sessions[i], timeout);
 
                 /* clear POLLIN on sessions sharing this session's SSH session */
                 if ((ret == 1) || (ret >= 4)) {
@@ -844,7 +844,7 @@
     session = ps->sessions[i];
 
     /* reading an RPC and sending a reply must be atomic (no other RPC should be read) */
-    ret = nc_timedlock(session->ti_lock, timeout, NULL);
+    ret = nc_timedlock(session->ti_lock, timeout);
     if (ret != 1) {
         /* error or timeout */
         goto finish;