From 68e575362fb80bdf8133a830f15ff3f25bfae58e Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Mon, 2 Jan 2006 12:13:07 +0000
Subject: ./util update, which covers various issues, but most importantly
 mkerr.pl and mkdef.pl spinning in endless loop.

---
 util/mkerr.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'util/mkerr.pl')

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;
 
-- 
cgit v1.1