ssh: move NULL check to the free function

Let `ssh_stream_free()` take a NULL stream, as free functions should,
and remove the check from the connection setup.

The connection setup would not need the check anyhow, as we always have
a stream by the time we reach this code.
This commit is contained in:
Carlos Martín Nieto 2015-06-09 16:01:29 +02:00
parent 2785544fb5
commit 81be2f467c

View File

@ -177,11 +177,12 @@ static int ssh_stream_write(
static void ssh_stream_free(git_smart_subtransport_stream *stream) static void ssh_stream_free(git_smart_subtransport_stream *stream)
{ {
ssh_stream *s = (ssh_stream *)stream; ssh_stream *s = (ssh_stream *)stream;
ssh_subtransport *t = OWNING_SUBTRANSPORT(s); ssh_subtransport *t;
int ret;
GIT_UNUSED(ret); if (!stream)
return;
t = OWNING_SUBTRANSPORT(s);
t->current_stream = NULL; t->current_stream = NULL;
if (s->channel) { if (s->channel) {
@ -621,8 +622,7 @@ static int _git_ssh_setup_conn(
done: done:
if (error < 0) { if (error < 0) {
if (*stream) ssh_stream_free(*stream);
ssh_stream_free(*stream);
if (session) if (session)
libssh2_session_free(session); libssh2_session_free(session);