From 2844942c1b168997146dd0e73126fae2acecab77 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Fri, 31 Aug 2018 18:31:18 +0200
Subject: [PATCH] sftp: Reformat sftp_handle_close()

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
---
 src/sftp.c | 135 +++++++++++++++++++++++++++--------------------------
 1 file changed, 68 insertions(+), 67 deletions(-)

diff --git a/src/sftp.c b/src/sftp.c
index 7996bf8e..fd98c77c 100644
--- a/src/sftp.c
+++ b/src/sftp.c
@@ -1517,76 +1517,77 @@ void sftp_attributes_free(sftp_attributes file){
   SAFE_FREE(file);
 }
 
-static int sftp_handle_close(sftp_session sftp, ssh_string handle) {
-  sftp_status_message status;
-  sftp_message msg = NULL;
-  ssh_buffer buffer = NULL;
-  uint32_t id;
-  int rc;
+static int sftp_handle_close(sftp_session sftp, ssh_string handle)
+{
+    sftp_status_message status;
+    sftp_message msg = NULL;
+    ssh_buffer buffer = NULL;
+    uint32_t id;
+    int rc;
 
-  buffer = ssh_buffer_new();
-  if (buffer == NULL) {
-    ssh_set_error_oom(sftp->session);
-    return -1;
-  }
-
-  rc = ssh_buffer_allocate_size(buffer,
-                                sizeof(uint32_t) * 2 +
-                                ssh_string_len(handle));
-  if (rc < 0) {
-    ssh_set_error_oom(sftp->session);
-    ssh_buffer_free(buffer);
-    return -1;
-  }
-
-  id = sftp_get_new_id(sftp);
-  if (ssh_buffer_add_u32(buffer, htonl(id)) < 0 ||
-      ssh_buffer_add_ssh_string(buffer, handle) < 0) {
-    ssh_set_error_oom(sftp->session);
-    ssh_buffer_free(buffer);
-    return -1;
-  }
-  if (sftp_packet_write(sftp, SSH_FXP_CLOSE ,buffer) < 0) {
-    ssh_buffer_free(buffer);
-    return -1;
-  }
-  ssh_buffer_free(buffer);
-
-  while (msg == NULL) {
-    if (sftp_read_and_dispatch(sftp) < 0) {
-      /* something nasty has happened */
-      return -1;
-    }
-    msg = sftp_dequeue(sftp,id);
-  }
-
-  switch (msg->packet_type) {
-    case SSH_FXP_STATUS:
-      status = parse_status_msg(msg);
-      sftp_message_free(msg);
-      if(status == NULL) {
+    buffer = ssh_buffer_new();
+    if (buffer == NULL) {
+        ssh_set_error_oom(sftp->session);
         return -1;
-      }
-      sftp_set_error(sftp, status->status);
-      switch (status->status) {
-        case SSH_FX_OK:
-          status_msg_free(status);
-          return 0;
-          break;
-        default:
-          break;
-      }
-      ssh_set_error(sftp->session, SSH_REQUEST_DENIED,
-          "SFTP server: %s", status->errormsg);
-      status_msg_free(status);
-      return -1;
-    default:
-      ssh_set_error(sftp->session, SSH_FATAL,
-          "Received message %d during sftp_handle_close!", msg->packet_type);
-      sftp_message_free(msg);
-  }
+    }
 
-  return -1;
+    rc = ssh_buffer_allocate_size(buffer,
+            sizeof(uint32_t) * 2 +
+            ssh_string_len(handle));
+    if (rc < 0) {
+        ssh_set_error_oom(sftp->session);
+        ssh_buffer_free(buffer);
+        return -1;
+    }
+
+    id = sftp_get_new_id(sftp);
+    if (ssh_buffer_add_u32(buffer, htonl(id)) < 0 ||
+            ssh_buffer_add_ssh_string(buffer, handle) < 0) {
+        ssh_set_error_oom(sftp->session);
+        ssh_buffer_free(buffer);
+        return -1;
+    }
+    if (sftp_packet_write(sftp, SSH_FXP_CLOSE ,buffer) < 0) {
+        ssh_buffer_free(buffer);
+        return -1;
+    }
+    ssh_buffer_free(buffer);
+
+    while (msg == NULL) {
+        if (sftp_read_and_dispatch(sftp) < 0) {
+            /* something nasty has happened */
+            return -1;
+        }
+        msg = sftp_dequeue(sftp,id);
+    }
+
+    switch (msg->packet_type) {
+        case SSH_FXP_STATUS:
+            status = parse_status_msg(msg);
+            sftp_message_free(msg);
+            if(status == NULL) {
+                return -1;
+            }
+            sftp_set_error(sftp, status->status);
+            switch (status->status) {
+                case SSH_FX_OK:
+                    status_msg_free(status);
+                    return 0;
+                    break;
+                default:
+                    break;
+            }
+            ssh_set_error(sftp->session, SSH_REQUEST_DENIED,
+                    "SFTP server: %s", status->errormsg);
+            status_msg_free(status);
+            return -1;
+        default:
+            ssh_set_error(sftp->session, SSH_FATAL,
+                    "Received message %d during sftp_handle_close!", msg->packet_type);
+            sftp_message_free(msg);
+    }
+
+    return -1;
 }
 
 /* Close an open file handle. */