aboutsummaryrefslogtreecommitdiff
path: root/lib/ssh.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-02-15 11:03:42 +0100
committerDaniel Stenberg <daniel@haxx.se>2013-02-15 11:10:18 +0100
commitc25383ae1329199107943211e543612d288eb1ae (patch)
tree2331b0da5e51f749924dd205702109ebc974e9a6 /lib/ssh.c
parent6106eeba16f45a6a2fccdfac2b9b64dcf12f2a20 (diff)
rename "easy" statemachines: call them block instead
... since they're not used by the easy interface really, I wanted to remove the association. Also, I unified the pingpong statemachine driver into a single function with a 'wait' argument: Curl_pp_statemach.
Diffstat (limited to 'lib/ssh.c')
-rw-r--r--lib/ssh.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssh.c b/lib/ssh.c
index 0c7d36ecc..9b37ad69e 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -2635,7 +2635,7 @@ static CURLcode ssh_multi_statemach(struct connectdata *conn, bool *done)
return result;
}
-static CURLcode ssh_easy_statemach(struct connectdata *conn,
+static CURLcode ssh_block_statemach(struct connectdata *conn,
bool duringconnect)
{
struct ssh_conn *sshc = &conn->proto.sshc;
@@ -2902,7 +2902,7 @@ static CURLcode scp_disconnect(struct connectdata *conn, bool dead_connection)
state(conn, SSH_SESSION_DISCONNECT);
- result = ssh_easy_statemach(conn, FALSE);
+ result = ssh_block_statemach(conn, FALSE);
}
return result;
@@ -2923,7 +2923,7 @@ static CURLcode ssh_done(struct connectdata *conn, CURLcode status)
non-blocking DONE operations, not in the multi state machine and with
Curl_done() invokes on several places in the code!
*/
- result = ssh_easy_statemach(conn, FALSE);
+ result = ssh_block_statemach(conn, FALSE);
}
else
result = status;
@@ -3065,7 +3065,7 @@ static CURLcode sftp_disconnect(struct connectdata *conn, bool dead_connection)
if(conn->proto.sshc.ssh_session) {
/* only if there's a session still around to use! */
state(conn, SSH_SFTP_SHUTDOWN);
- result = ssh_easy_statemach(conn, FALSE);
+ result = ssh_block_statemach(conn, FALSE);
}
DEBUGF(infof(conn->data, "SSH DISCONNECT is done\n"));