summaryrefslogtreecommitdiffstats
path: root/src/sftp.c
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2013-07-14 13:31:24 +0200
committerAndreas Schneider <asn@cryptomilk.org>2013-07-14 13:31:24 +0200
commitc64ec43eef8ec5a8b8a8f4c4c3216043aea8e08a (patch)
tree33131e402f35d800cf923f837ae4c72166703b27 /src/sftp.c
parent0d3deeec101b0d6568d7c04eda833bde47c7329c (diff)
downloadlibssh-c64ec43eef8ec5a8b8a8f4c4c3216043aea8e08a.tar.gz
libssh-c64ec43eef8ec5a8b8a8f4c4c3216043aea8e08a.tar.xz
libssh-c64ec43eef8ec5a8b8a8f4c4c3216043aea8e08a.zip
src: Remove enter_function() and leave_function().
Diffstat (limited to 'src/sftp.c')
-rw-r--r--src/sftp.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/sftp.c b/src/sftp.c
index a4670384..62460b4d 100644
--- a/src/sftp.c
+++ b/src/sftp.c
@@ -106,12 +106,11 @@ sftp_session sftp_new(ssh_session session){
if (session == NULL) {
return NULL;
}
- enter_function();
sftp = malloc(sizeof(struct sftp_session_struct));
if (sftp == NULL) {
ssh_set_error_oom(session);
- leave_function();
+
return NULL;
}
ZERO_STRUCTP(sftp);
@@ -120,7 +119,7 @@ sftp_session sftp_new(ssh_session session){
if (sftp->ext == NULL) {
ssh_set_error_oom(session);
SAFE_FREE(sftp);
- leave_function();
+
return NULL;
}
@@ -128,24 +127,23 @@ sftp_session sftp_new(ssh_session session){
sftp->channel = ssh_channel_new(session);
if (sftp->channel == NULL) {
SAFE_FREE(sftp);
- leave_function();
+
return NULL;
}
if (ssh_channel_open_session(sftp->channel)) {
ssh_channel_free(sftp->channel);
SAFE_FREE(sftp);
- leave_function();
+
return NULL;
}
if (ssh_channel_request_sftp(sftp->channel)) {
sftp_free(sftp);
- leave_function();
+
return NULL;
}
- leave_function();
return sftp;
}
@@ -155,12 +153,11 @@ sftp_session sftp_new_channel(ssh_session session, ssh_channel channel){
if (session == NULL) {
return NULL;
}
- enter_function();
sftp = malloc(sizeof(struct sftp_session_struct));
if (sftp == NULL) {
ssh_set_error_oom(session);
- leave_function();
+
return NULL;
}
ZERO_STRUCTP(sftp);
@@ -169,14 +166,13 @@ sftp_session sftp_new_channel(ssh_session session, ssh_channel channel){
if (sftp->ext == NULL) {
ssh_set_error_oom(session);
SAFE_FREE(sftp);
- leave_function();
+
return NULL;
}
sftp->session = session;
sftp->channel = channel;
- leave_function();
return sftp;
}