mirror of https://github.com/moparisthebest/curl
Revert "libssh: no data pointer == nothing to do"
This reverts commitc98ee5f67f
since commitf3ce38739f
fixed the problem in a more generic way.
This commit is contained in:
parent
f3ce38739f
commit
7608f9a2d5
|
@ -554,19 +554,14 @@ static CURLcode myssh_statemach_act(struct connectdata *conn, bool *block)
|
||||||
{
|
{
|
||||||
CURLcode result = CURLE_OK;
|
CURLcode result = CURLE_OK;
|
||||||
struct Curl_easy *data = conn->data;
|
struct Curl_easy *data = conn->data;
|
||||||
struct SSHPROTO *protop;
|
struct SSHPROTO *protop = data->req.protop;
|
||||||
struct ssh_conn *sshc = &conn->proto.sshc;
|
struct ssh_conn *sshc = &conn->proto.sshc;
|
||||||
int rc = SSH_NO_ERROR, err;
|
int rc = SSH_NO_ERROR, err;
|
||||||
char *new_readdir_line;
|
char *new_readdir_line;
|
||||||
int seekerr = CURL_SEEKFUNC_OK;
|
int seekerr = CURL_SEEKFUNC_OK;
|
||||||
const char *err_msg;
|
const char *err_msg;
|
||||||
*block = 0; /* we're not blocking by default */
|
*block = 0; /* we're not blocking by default */
|
||||||
if(!data) {
|
|
||||||
state(conn, SSH_STOP);
|
|
||||||
return CURLE_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
protop = data->req.protop;
|
|
||||||
do {
|
do {
|
||||||
|
|
||||||
switch(sshc->state) {
|
switch(sshc->state) {
|
||||||
|
@ -1993,10 +1988,6 @@ static CURLcode myssh_block_statemach(struct connectdata *conn,
|
||||||
struct ssh_conn *sshc = &conn->proto.sshc;
|
struct ssh_conn *sshc = &conn->proto.sshc;
|
||||||
CURLcode result = CURLE_OK;
|
CURLcode result = CURLE_OK;
|
||||||
struct Curl_easy *data = conn->data;
|
struct Curl_easy *data = conn->data;
|
||||||
if(!data) {
|
|
||||||
state(conn, SSH_STOP);
|
|
||||||
return CURLE_OK;
|
|
||||||
}
|
|
||||||
|
|
||||||
while((sshc->state != SSH_STOP) && !result) {
|
while((sshc->state != SSH_STOP) && !result) {
|
||||||
bool block;
|
bool block;
|
||||||
|
|
Loading…
Reference in New Issue