./util update, which covers various issues, but most importantly mkerr.pl

[openssl.git] / util / mkerr.pl

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 7e0bdff8cc3fa4fbded4782357157a3554fe2ed5..030899b7ab449f6cbfac737ef758477c4d1046d1 100644 (file)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -143,11 +143,14 @@ while (($hdr, $lib) = each %libinc)
            s/[\n\s]*$//g;
 
            # Skip over recognized non-function declarations
-           next if(/typedef\W/ or /struct\W/ or /DECLARE_STACK_OF/ or /TYPEDEF_.*_OF/);
+           next if(/typedef\W/ or /DECLARE_STACK_OF/ or /TYPEDEF_.*_OF/);
 
            # Reduce argument lists to empty ()
            # fold round brackets recursively: (t(*v)(t),t) -> (t{}{},t) -> {}
-           while(/\(.*\)/s) { s/\([^\(\)]+\)/\{\}/gs; }
+           while(/\(.*\)/s) {
+               s/\([^\(\)]+\)/\{\}/gs;
+               s/\(\s*\*\s*(\w+)\s*\{\}\s*\)/$1/gs;    #(*f{}) -> f
+           }
            # pretend as we didn't use curly braces: {} -> ()
            s/\{\}/\(\)/gs;