Try fixing some warnings

1 files changed, 30 insertions, 17 deletions

diff --git a/libressl.patch b/libressl.patch
index f49ed9d..1cac700 100644
--- a/libressl.patch
+++ b/libressl.patch
@@ -108,27 +108,27 @@ index 6a64836fb..6a82f1fa4 100644
 +static int spawn_https_helper_openssl(const char *host, unsigned port)
 +{
 +               char* allocated = NULL;
-+        int fd1;
-+        char *servername, *p, *cmd;
++               int fd1;
++               char *servername, *p, *cmd;
 +               int sp[2];
-+        if(!strchr(host,":"))
-+                host = allocated = xasprintf("%s:%u",host,port);
-+        servername = xstrdup(host);
-+        fflush_all();
++               if(!strchr(host,":"))
++                               host = allocated = xasprintf("%s:%u",host,port);
++               servername = xstrdup(host);
++               fflush_all();
 +
-+        struct tls *ctx = tls_client();
-+        if(ctx == NULL)
-+                bb_error_msg_and_die("Out of memory");
-+        struct tls_config *config = tls_config_new();
-+        if(config == NULL)
-+                bb_error_msg_and_die("Out of memory");
-+        if(tls_configure(ctx,config) != 0)
-+                bb_error_msg_and_die("Failed to configure client");
-+        tls_connect_fds(ctx,sp[0],sp[1],servername);
-+        close(sp[1]);
++               tls *ctx = tls_client();
++               if(ctx == NULL)
++                               bb_error_msg_and_die("Out of memory");
++               tls_config *config = tls_config_new();
++               if(config == NULL)
++                               bb_error_msg_and_die("Out of memory");
++               if(tls_configure(ctx,config) != 0)
++                               bb_error_msg_and_die("Failed to configure client");
++               tls_connect_fds(ctx,sp[0],sp[1],servername);
++               close(sp[1]);
 +               free(allocated);
 +               free(servername);
-+        return sp[0];
++               return sp[0];
 +}
 +# endif
  #endif
@@ -166,3 +166,16 @@ index 87e7ca602..7bad3e4fa 100644
  
  struct passwd *getpwnam(const char *name)
  {
+diff --git a/networking/ssl_client.c b/networking/ssl_client.c
+index 757745896..72bd4969f 100644
+--- a/networking/ssl_client.c
++++ b/networking/ssl_client.c
+@@ -24,7 +24,7 @@
+ //usage:#define ssl_client_full_usage ""
+ 
+ #include "libbb.h"
+-
++#include <tls.h>
+ int ssl_client_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+ int ssl_client_main(int argc UNUSED_PARAM, char **argv)
+ {