moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 12:05:06 -05:00
Code Issues Releases Wiki Activity

ssh: Fixed a style warning

Browse Source 
Also, combined a couple of #ifdef sections
This commit is contained in:
Dan Fandrich 2014-03-06 13:39:22 +01:00
parent e84d0b41f6
commit e591165f94
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ssh.c
View File

@ -328,6 +328,7 @@ static LIBSSH2_FREE_FUNC(my_libssh2_free)
/* This is the ONLY way to change SSH state! */ /* This is the ONLY way to change SSH state! */
static void state(struct connectdata *conn, sshstate nowstate) static void state(struct connectdata *conn, sshstate nowstate)
{ {
struct ssh_conn *sshc = &conn->proto.sshc;
#if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS) #if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)
/* for debug purposes */ /* for debug purposes */
static const char * const names[] = { static const char * const names[] = {
@ -387,10 +388,7 @@ static void state(struct connectdata *conn, sshstate nowstate)
"SSH_SESSION_FREE", "SSH_SESSION_FREE",
"QUIT" "QUIT"
}; };
#endif
struct ssh_conn *sshc = &conn->proto.sshc;
#if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)
if(sshc->state != nowstate) { if(sshc->state != nowstate) {
infof(conn->data, "SFTP %p state change from %s to %s\n", infof(conn->data, "SFTP %p state change from %s to %s\n",
(void *)sshc, names[sshc->state], names[nowstate]); (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 * SFTP is a binary protocol, so we don't send text commands
* the server. Instead, we scan for commands for commands used by * to the server. Instead, we scan for commands used by
* OpenSSH's sftp program and call the appropriate libssh2 * OpenSSH's sftp program and call the appropriate libssh2
* functions. * functions.
*/ */
@ -3134,7 +3132,8 @@ static ssize_t sftp_recv(struct connectdata *conn, int sockindex,
*err = CURLE_AGAIN; *err = CURLE_AGAIN;
nread = -1; nread = -1;
} else if(nread < 0) { }
else if(nread < 0) {
*err = libssh2_session_error_to_CURLE(nread); *err = libssh2_session_error_to_CURLE(nread);
} }
return nread; return nread;