[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0ed78e78007bb74e48e6f59fa2388bb244153bf0 (commit)
       via  5bf6d418034a246bd3680d648c22e2c4500a3e0a (commit)
      from  208fb891e36f16d20262710c70ef0ff3df0e885c (commit)


- Log -----------------------------------------------------------------
commit 0ed78e78007bb74e48e6f59fa2388bb244153bf0
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Oct 9 13:21:24 2017 +0200

    Fix util/find-doc-nits to correctly parse function signature typedefs
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/4499)

commit 5bf6d418034a246bd3680d648c22e2c4500a3e0a
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Oct 9 12:55:27 2017 +0200

    Correct some typedef documentation
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/4499)

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

Summary of changes:
 doc/man3/BIO_ctrl.pod                | 6 +++---
 doc/man3/EVP_PKEY_keygen.pod         | 2 +-
 doc/man3/PEM_read_bio_PrivateKey.pod | 2 +-
 util/find-doc-nits                   | 5 ++++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/doc/man3/BIO_ctrl.pod b/doc/man3/BIO_ctrl.pod
index 4e02294..5aef75a 100644
--- a/doc/man3/BIO_ctrl.pod
+++ b/doc/man3/BIO_ctrl.pod
@@ -12,11 +12,11 @@ BIO_get_info_callback, BIO_set_info_callback, bio_info_cb
 
  #include <openssl/bio.h>
 
- typedef void (*bio_info_cb)(BIO *b, int oper, const char *ptr,
-                             int arg1, long arg2, long arg3);
+ typedef void bio_info_cb(BIO *b, int oper, const char *ptr,
+                          int arg1, long arg2, long arg3);
 
  long BIO_ctrl(BIO *bp, int cmd, long larg, void *parg);
- long BIO_callback_ctrl(BIO *b, int cmd, bio_info_cb cb);
+ long BIO_callback_ctrl(BIO *b, int cmd, bio_info_cb *cb);
  char *BIO_ptr_ctrl(BIO *bp, int cmd, long larg);
  long BIO_int_ctrl(BIO *bp, int cmd, long larg, int iarg);
 
diff --git a/doc/man3/EVP_PKEY_keygen.pod b/doc/man3/EVP_PKEY_keygen.pod
index 3687f9b..099cd0c 100644
--- a/doc/man3/EVP_PKEY_keygen.pod
+++ b/doc/man3/EVP_PKEY_keygen.pod
@@ -18,7 +18,7 @@ EVP_PKEY_gen_cb, EVP_PKEY_check
  int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx);
  int EVP_PKEY_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY **ppkey);
 
- typedef int (*EVP_PKEY_gen_cb)(EVP_PKEY_CTX *ctx);
+ typedef int EVP_PKEY_gen_cb(EVP_PKEY_CTX *ctx);
 
  void EVP_PKEY_CTX_set_cb(EVP_PKEY_CTX *ctx, EVP_PKEY_gen_cb *cb);
  EVP_PKEY_gen_cb *EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx);
diff --git a/doc/man3/PEM_read_bio_PrivateKey.pod b/doc/man3/PEM_read_bio_PrivateKey.pod
index b2130c8..a7872b4 100644
--- a/doc/man3/PEM_read_bio_PrivateKey.pod
+++ b/doc/man3/PEM_read_bio_PrivateKey.pod
@@ -30,7 +30,7 @@ PEM_write_bio_PKCS7, PEM_write_PKCS7 - PEM routines
 
  #include <openssl/pem.h>
 
- typedef int (*pem_password_cb)(char *buf, int size, int rwflag, void *u);
+ typedef int pem_password_cb(char *buf, int size, int rwflag, void *u);
 
  EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x,
                                    pem_password_cb *cb, void *u);
diff --git a/util/find-doc-nits b/util/find-doc-nits
index a5fc62f..aaf3eeb 100755
--- a/util/find-doc-nits
+++ b/util/find-doc-nits
@@ -105,7 +105,10 @@ sub name_synopsis()
             # environment variable env NAME=...
             $sym = $1;
         } elsif ( $line =~ /typedef.*\(\*(\S+)\)\(.*/ ) {
-            # a callback function: typedef ... (*NAME)(...
+            # a callback function pointer: typedef ... (*NAME)(...
+            $sym = $1;
+        } elsif ( $line =~ /typedef.* (\S+)\(.*/ ) {
+            # a callback function signature: typedef ... NAME(...
             $sym = $1;
         } elsif ( $line =~ /typedef.* (\S+);/ ) {
             # a simple typedef: typedef ... NAME;