diff options
| author | Matt Caswell <matt@openssl.org> | 2020-09-15 14:00:37 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-18 13:30:44 +0100 |
| commit | 282de1cc2d71a95482ce431b9ed620f85eb6acbd (patch) | |
| tree | 46ba9d3e7f8552d1f0e4e3063b8c5f6897a079f5 /util | |
| parent | 028b31b32da97ada44140120297511eae518ed42 (diff) | |
| download | openssl-282de1cc2d71a95482ce431b9ed620f85eb6acbd.zip openssl-282de1cc2d71a95482ce431b9ed620f85eb6acbd.tar.gz openssl-282de1cc2d71a95482ce431b9ed620f85eb6acbd.tar.bz2 | |
Fix some doc-nits and make update errors
The new lhash changes have confused some of the perl scripts so we add
some fixes.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12860)
Diffstat (limited to 'util')
| -rwxr-xr-x | util/find-doc-nits | 2 | ||||
| -rw-r--r-- | util/perl/OpenSSL/ParseC.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/util/find-doc-nits b/util/find-doc-nits index 006edbd..ac66182 100755 --- a/util/find-doc-nits +++ b/util/find-doc-nits @@ -100,6 +100,8 @@ my $ignored = qr/(?| ^i2d_ | ^_?DECLARE_ | ^sk_ | ^SKM_DEFINE_STACK_OF_INTERNAL + | ^lh_ + | ^DEFINE_LHASH_OF_INTERNAL )/x; # Collect all POD files, both internal and public, and regardless of location diff --git a/util/perl/OpenSSL/ParseC.pm b/util/perl/OpenSSL/ParseC.pm index b2ac909..7e6377d 100644 --- a/util/perl/OpenSSL/ParseC.pm +++ b/util/perl/OpenSSL/ParseC.pm @@ -281,7 +281,7 @@ EOF { regexp => qr/(.*)\bLHASH_OF<<<\((.*?)\)>>>(.*)/, massager => sub { return ("$1struct lhash_st_$2$3"); } }, - { regexp => qr/DEFINE_LHASH_OF<<<\((.*)\)>>>/, + { regexp => qr/DEFINE_LHASH_OF(?:_INTERNAL)?<<<\((.*)\)>>>/, massager => sub { return (<<"EOF"); static ossl_inline LHASH_OF($1) * lh_$1_new(unsigned long (*hfn)(const $1 *), |