From e5bf3c923c184b19e8c3ef7043080955479a2325 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 13 Feb 2015 13:02:24 +0000 Subject: [PATCH] size_t for buffer functions. Change BUF_MEM_grow and BUF_MEM_grow_clean to return size_t. Reviewed-by: Richard Levitte --- crypto/bio/bss_mem.c | 2 +- crypto/buffer/buffer.c | 4 ++-- crypto/buffer/buffer.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index d190765dc2..56e0d2e323 100644 --- 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; - 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; diff --git a/crypto/buffer/buffer.c b/crypto/buffer/buffer.c index f762fe8003..0859974e79 100644 --- a/crypto/buffer/buffer.c +++ b/crypto/buffer/buffer.c @@ -94,7 +94,7 @@ void BUF_MEM_free(BUF_MEM *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; @@ -130,7 +130,7 @@ int BUF_MEM_grow(BUF_MEM *str, size_t 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; diff --git a/crypto/buffer/buffer.h b/crypto/buffer/buffer.h index 530ffd2c51..672c06b395 100644 --- 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); -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); -- 2.34.1