size_t for buffer functions.

Change BUF_MEM_grow and BUF_MEM_grow_clean to return size_t.
Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c
index d190765dc2010e2d46a2469c984efa7ceeb0d0c4..56e0d2e3232f12c1246accd00a87d1f72c754b5b 100644 (file)
--- a/crypto/bio/bss_mem.c
+++ b/crypto/bio/bss_mem.c
@@ -187,7 +187,7 @@ static int mem_write(BIO *b, const char *in, int inl)
 
     BIO_clear_retry_flags(b);
     blen = bm->length;
 
     BIO_clear_retry_flags(b);
     blen = bm->length;

-    if (BUF_MEM_grow_clean(bm, blen + inl) != (blen + inl))
+    if (BUF_MEM_grow_clean(bm, blen + inl) == 0)

         goto end;
     memcpy(&(bm->data[blen]), in, inl);
     ret = inl;
         goto end;
     memcpy(&(bm->data[blen]), in, inl);
     ret = inl;

diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c
index f762fe8003bbbdbb8248106d7bbc1ebfde2c08c0..0859974e79bb3a7adc68a5c4e06000272210988e 100644 (file)
--- a/crypto/buffer/buffer.c
+++ b/crypto/buffer/buffer.c
@@ -94,7 +94,7 @@ void BUF_MEM_free(BUF_MEM *a)
     OPENSSL_free(a);
 }
 
     OPENSSL_free(a);
 }
 

-int BUF_MEM_grow(BUF_MEM *str, size_t len)
+size_t BUF_MEM_grow(BUF_MEM *str, size_t len)

 {
     char *ret;
     size_t n;
 {
     char *ret;
     size_t n;


@@ -130,7 +130,7 @@ int BUF_MEM_grow(BUF_MEM *str, size_t len)
     return (len);
 }
 
     return (len);
 }
 

-int BUF_MEM_grow_clean(BUF_MEM *str, size_t len)
+size_t BUF_MEM_grow_clean(BUF_MEM *str, size_t len)

 {
     char *ret;
     size_t n;
 {
     char *ret;
     size_t n;

diff --git a/crypto/buffer/buffer.h b/crypto/buffer/buffer.h
index 530ffd2c5114f5c3b3005ddc013b61ad79cdb4f8..672c06b3958be0fab598f1a6b9312429994092ea 100644 (file)
--- a/crypto/buffer/buffer.h
+++ b/crypto/buffer/buffer.h
@@ -82,8 +82,8 @@ struct buf_mem_st {
 
 BUF_MEM *BUF_MEM_new(void);
 void BUF_MEM_free(BUF_MEM *a);
 
 BUF_MEM *BUF_MEM_new(void);
 void BUF_MEM_free(BUF_MEM *a);

-int BUF_MEM_grow(BUF_MEM *str, size_t len);
-int BUF_MEM_grow_clean(BUF_MEM *str, size_t len);
+size_t BUF_MEM_grow(BUF_MEM *str, size_t len);
+size_t BUF_MEM_grow_clean(BUF_MEM *str, size_t len);

 size_t BUF_strnlen(const char *str, size_t maxlen);
 char *BUF_strdup(const char *str);
 char *BUF_strndup(const char *str, size_t siz);
 size_t BUF_strnlen(const char *str, size_t maxlen);
 char *BUF_strdup(const char *str);
 char *BUF_strndup(const char *str, size_t siz);