[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  29f484d00d732ea4c19a7fd3dc0440045653e79e (commit)
      from  bcc6371443ebc0f104379b0a1068cfca0191b909 (commit)


- Log -----------------------------------------------------------------
commit 29f484d00d732ea4c19a7fd3dc0440045653e79e
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Mar 29 10:45:42 2018 +0100

    Fix some errors in the mem leaks docs
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5794)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/OPENSSL_malloc.pod | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/man3/OPENSSL_malloc.pod b/doc/man3/OPENSSL_malloc.pod
index 2d48ae2..b746016 100644
--- a/doc/man3/OPENSSL_malloc.pod
+++ b/doc/man3/OPENSSL_malloc.pod
@@ -78,10 +78,10 @@ OPENSSL_MALLOC_FD
  int CRYPTO_mem_debug_push(const char *info, const char *file, int line);
  int CRYPTO_mem_debug_pop(void);
 
- void CRYPTO_mem_leaks(BIO *b);
- void CRYPTO_mem_leaks_fp(FILE *fp);
- void CRYPTO_mem_leaks_cb(int (*cb)(const char *str, size_t len, void *u),
-                          void *u);
+ int CRYPTO_mem_leaks(BIO *b);
+ int CRYPTO_mem_leaks_fp(FILE *fp);
+ int CRYPTO_mem_leaks_cb(int (*cb)(const char *str, size_t len, void *u),
+                         void *u);
 
 =head1 DESCRIPTION
 
@@ -216,8 +216,8 @@ OPENSSL_malloc_init(), OPENSSL_free(), OPENSSL_clear_free()
 CRYPTO_free(), CRYPTO_clear_free() and CRYPTO_get_mem_functions()
 return no value.
 
-CRYPTO_mem_leaks() and CRYPTO_mem_leaks_fp() return 1 if there
-are no leaks, 0 if there are leaks and -1 if an error occurred.
+CRYPTO_mem_leaks(), CRYPTO_mem_leaks_fp() and CRYPTO_mem_leaks_cb() return 1 if
+there are no leaks, 0 if there are leaks and -1 if an error occurred.
 
 OPENSSL_malloc(), OPENSSL_zalloc(), OPENSSL_realloc(),
 OPENSSL_clear_realloc(),