ec/ecp_nistz256.c: harmonize with latest indent script.

[oweals/openssl.git] / crypto / bio / bss_bio.c

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index 0f9f0955b41187f99a1bd8abcc46480c005139d9..6d86587ee3276a9c92d3b5d6528eca6662f1590e 100644 (file)
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -269,7 +269,8 @@ static int bio_read(BIO *bio, char *buf, int size_)
        return size;
        }
 
-/* non-copying interface: provide pointer to available data in buffer
+/*-
+ * non-copying interface: provide pointer to available data in buffer
  *    bio_nread0:  return number of available bytes
  *    bio_nread:   also advance index
  * (example usage:  bio_nread0(), read from buffer, bio_nread()
@@ -277,10 +278,10 @@ static int bio_read(BIO *bio, char *buf, int size_)
  */
 /* WARNING: The non-copying interface is largely untested as of yet
  * and may contain bugs. */
-static ssize_t bio_nread0(BIO *bio, char **buf)
+static ossl_ssize_t bio_nread0(BIO *bio, char **buf)
        {
        struct bio_bio_st *b, *peer_b;
-       ssize_t num;
+       ossl_ssize_t num;
        
        BIO_clear_retry_flags(bio);
 
@@ -315,15 +316,15 @@ static ssize_t bio_nread0(BIO *bio, char **buf)
        return num;
        }
 
-static ssize_t bio_nread(BIO *bio, char **buf, size_t num_)
+static ossl_ssize_t bio_nread(BIO *bio, char **buf, size_t num_)
        {
        struct bio_bio_st *b, *peer_b;
-       ssize_t num, available;
+       ossl_ssize_t num, available;
 
        if (num_ > SSIZE_MAX)
                num = SSIZE_MAX;
        else
-               num = (ssize_t)num_;
+               num = (ossl_ssize_t)num_;
 
        available = bio_nread0(bio, buf);
        if (num > available)
@@ -422,13 +423,14 @@ static int bio_write(BIO *bio, const char *buf, int num_)
        return num;
        }
 
-/* non-copying interface: provide pointer to region to write to
+/*-
+ * non-copying interface: provide pointer to region to write to
  *   bio_nwrite0:  check how much space is available
  *   bio_nwrite:   also increase length
  * (example usage:  bio_nwrite0(), write to buffer, bio_nwrite()
  *  or just         bio_nwrite(), write to buffer)
  */
-static ssize_t bio_nwrite0(BIO *bio, char **buf)
+static ossl_ssize_t bio_nwrite0(BIO *bio, char **buf)
        {
        struct bio_bio_st *b;
        size_t num;
@@ -476,15 +478,15 @@ static ssize_t bio_nwrite0(BIO *bio, char **buf)
        return num;
        }
 
-static ssize_t bio_nwrite(BIO *bio, char **buf, size_t num_)
+static ossl_ssize_t bio_nwrite(BIO *bio, char **buf, size_t num_)
        {
        struct bio_bio_st *b;
-       ssize_t num, space;
+       ossl_ssize_t num, space;
 
        if (num_ > SSIZE_MAX)
                num = SSIZE_MAX;
        else
-               num = (ssize_t)num_;
+               num = (ossl_ssize_t)num_;
 
        space = bio_nwrite0(bio, buf);
        if (num > space)
@@ -919,6 +921,6 @@ int BIO_nwrite(BIO *bio, char **buf, int num)
 
        ret = BIO_ctrl(bio, BIO_C_NWRITE, num, buf);
        if (ret > 0)
-               bio->num_read += ret;
+               bio->num_write += ret;
        return ret;
        }