Fix code structure (if ... else if ... where both parts

[openssl.git] / ssl / s23_pkt.c

diff --git a/ssl/s23_pkt.c b/ssl/s23_pkt.c
index c25c3127725d20b16e5578c6eed88ab0f89ea5a7..f45e1ce3d806ce0baa7c6abe86b1d09ca83a03a1 100644 (file)
--- a/ssl/s23_pkt.c
+++ b/ssl/s23_pkt.c
@@ -59,12 +59,11 @@
 #include <stdio.h>
 #include <errno.h>
 #define USE_SOCKETS
-#include "evp.h"
-#include "buffer.h"
+#include <openssl/evp.h>
+#include <openssl/buffer.h>
 #include "ssl_locl.h"
 
-int ssl23_write_bytes(s)
-SSL *s;
+int ssl23_write_bytes(SSL *s)
        {
        int i,num,tot;
        char *buf;
@@ -76,7 +75,7 @@ SSL *s;
                {
                s->rwstate=SSL_WRITING;
                i=BIO_write(s->wbio,&(buf[tot]),num);
-               if (i < 0)
+               if (i <= 0)
                        {
                        s->init_off=tot;
                        s->init_num=num;
@@ -90,10 +89,8 @@ SSL *s;
                }
        }
 
-/* only return when we have read 'n' bytes */
-int ssl23_read_bytes(s,n)
-SSL *s;
-int n;
+/* return regularly only when we have read (at least) 'n' bytes */
+int ssl23_read_bytes(SSL *s, int n)
        {
        unsigned char *p;
        int j;