diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2018-09-03 17:57:06 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2018-09-04 19:58:03 +0200 |
| commit | 4af4b59e215748b1d6c6ff84f2fa6046df7ed7f3 (patch) | |
| tree | 16daf98e2b94c856553df340e63f600c934331f1 /src/channels.c | |
| parent | ca464ca2ba91bd9e95186009a0e314932d4d1ef9 (diff) | |
| download | libssh-4af4b59e215748b1d6c6ff84f2fa6046df7ed7f3.tar.gz libssh-4af4b59e215748b1d6c6ff84f2fa6046df7ed7f3.tar.xz libssh-4af4b59e215748b1d6c6ff84f2fa6046df7ed7f3.zip | |
channels: Reformat ssh_channel_free()
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
Diffstat (limited to 'src/channels.c')
| -rw-r--r-- | src/channels.c | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/src/channels.c b/src/channels.c index 657b68e5..03ef42de 100644 --- a/src/channels.c +++ b/src/channels.c @@ -1007,22 +1007,26 @@ void ssh_channel_free(ssh_channel channel) { * @brief Effectively free a channel, without caring about flags */ -void ssh_channel_do_free(ssh_channel channel){ - struct ssh_iterator *it; - ssh_session session = channel->session; - it = ssh_list_find(session->channels, channel); - if(it != NULL){ - ssh_list_remove(session->channels, it); - } - ssh_buffer_free(channel->stdout_buffer); - ssh_buffer_free(channel->stderr_buffer); - if (channel->callbacks != NULL){ - ssh_list_free(channel->callbacks); - } +void ssh_channel_do_free(ssh_channel channel) +{ + struct ssh_iterator *it = NULL; + ssh_session session = channel->session; + + it = ssh_list_find(session->channels, channel); + if (it != NULL) { + ssh_list_remove(session->channels, it); + } + + ssh_buffer_free(channel->stdout_buffer); + ssh_buffer_free(channel->stderr_buffer); + + if (channel->callbacks != NULL) { + ssh_list_free(channel->callbacks); + } - /* debug trick to catch use after frees */ - memset(channel, 'X', sizeof(struct ssh_channel_struct)); - SAFE_FREE(channel); + /* debug trick to catch use after frees */ + memset(channel, 'X', sizeof(struct ssh_channel_struct)); + SAFE_FREE(channel); } /** |