aboutsummaryrefslogtreecommitdiff
path: root/util/mkerr.pl
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2006-01-02 12:13:07 +0000
committerAndy Polyakov <appro@openssl.org>2006-01-02 12:13:07 +0000
commit68e575362fb80bdf8133a830f15ff3f25bfae58e (patch)
tree259afe303530527c87da762ab00380b2e71acd10 /util/mkerr.pl
parentaab3bb04cfb671e979cb9128ea37f457956370c0 (diff)
downloadopenssl-68e575362fb80bdf8133a830f15ff3f25bfae58e.zip
openssl-68e575362fb80bdf8133a830f15ff3f25bfae58e.tar.gz
openssl-68e575362fb80bdf8133a830f15ff3f25bfae58e.tar.bz2
./util update, which covers various issues, but most importantly mkerr.pl
and mkdef.pl spinning in endless loop.
Diffstat (limited to 'util/mkerr.pl')
-rw-r--r--util/mkerr.pl7
1 files changed, 5 insertions, 2 deletions
diff --git a/util/mkerr.pl b/util/mkerr.pl
index 7e0bdff..030899b 100644
--- 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;