From e591165f94c2c58706d827c5a153828cc1b2dc03 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Thu, 6 Mar 2014 13:39:22 +0100 Subject: ssh: Fixed a style warning Also, combined a couple of #ifdef sections --- lib/ssh.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'lib/ssh.c') diff --git a/lib/ssh.c b/lib/ssh.c index 3e3190d74..56209af8a 100644 --- a/lib/ssh.c +++ b/lib/ssh.c @@ -328,6 +328,7 @@ static LIBSSH2_FREE_FUNC(my_libssh2_free) /* This is the ONLY way to change SSH state! */ static void state(struct connectdata *conn, sshstate nowstate) { + struct ssh_conn *sshc = &conn->proto.sshc; #if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS) /* for debug purposes */ static const char * const names[] = { @@ -387,10 +388,7 @@ static void state(struct connectdata *conn, sshstate nowstate) "SSH_SESSION_FREE", "QUIT" }; -#endif - struct ssh_conn *sshc = &conn->proto.sshc; -#if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS) if(sshc->state != nowstate) { infof(conn->data, "SFTP %p state change from %s to %s\n", (void *)sshc, names[sshc->state], names[nowstate]); @@ -1232,8 +1230,8 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block) } /* - * SFTP is a binary protocol, so we don't send text commands to - * the server. Instead, we scan for commands for commands used by + * SFTP is a binary protocol, so we don't send text commands + * to the server. Instead, we scan for commands used by * OpenSSH's sftp program and call the appropriate libssh2 * functions. */ @@ -3134,7 +3132,8 @@ static ssize_t sftp_recv(struct connectdata *conn, int sockindex, *err = CURLE_AGAIN; nread = -1; - } else if(nread < 0) { + } + else if(nread < 0) { *err = libssh2_session_error_to_CURLE(nread); } return nread; -- cgit v1.2.3