Commit e5bf3c92 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

size_t for buffer functions. 



Change BUF_MEM_grow and BUF_MEM_grow_clean to return size_t.
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent d5ec8efc

crypto/bio/bss_mem.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

crypto/buffer/buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

crypto/buffer/buffer.h

+2 −2
Original line number Diff line number Diff line
@@ -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);