Skip to content

Commit

Permalink
Revert "libssh: no data pointer == nothing to do"
Browse files Browse the repository at this point in the history
This reverts commit c98ee5f since commit f3ce387 fixed the
problem in a more generic way.
  • Loading branch information
bagder committed Dec 23, 2018
1 parent f3ce387 commit 7608f9a
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions lib/ssh-libssh.c
Expand Up @@ -554,19 +554,14 @@ static CURLcode myssh_statemach_act(struct connectdata *conn, bool *block)
{
CURLcode result = CURLE_OK;
struct Curl_easy *data = conn->data;
struct SSHPROTO *protop;
struct SSHPROTO *protop = data->req.protop;
struct ssh_conn *sshc = &conn->proto.sshc;
int rc = SSH_NO_ERROR, err;
char *new_readdir_line;
int seekerr = CURL_SEEKFUNC_OK;
const char *err_msg;
*block = 0; /* we're not blocking by default */
if(!data) {
state(conn, SSH_STOP);
return CURLE_OK;
}

protop = data->req.protop;
do {

switch(sshc->state) {
Expand Down Expand Up @@ -1993,10 +1988,6 @@ static CURLcode myssh_block_statemach(struct connectdata *conn,
struct ssh_conn *sshc = &conn->proto.sshc;
CURLcode result = CURLE_OK;
struct Curl_easy *data = conn->data;
if(!data) {
state(conn, SSH_STOP);
return CURLE_OK;
}

while((sshc->state != SSH_STOP) && !result) {
bool block;
Expand Down

0 comments on commit 7608f9a

Please sign in to comment.