Fix mkerr.pl to find functions returning function pointers (thanks Ulf!)

also add a few missing prototypes.

diff --git a/crypto/bn/bn.h b/crypto/bn/bn.h
index 262423fa26f0b6c8a3598a78edad51b4e9584f14..2ff75526904479f7560820963acfc37620e5f0a9 100644 (file)
--- a/crypto/bn/bn.h
+++ b/crypto/bn/bn.h
@@ -473,6 +473,7 @@ int BN_lshift1();
 int    BN_exp();
 int    BN_mod_exp();
 int    BN_mod_exp_mont();
+int    BN_mod_exp2_mont();
 int    BN_mod_exp_recp();
 int    BN_mod_exp_simple();
 int    BN_mask_bits();

diff --git a/crypto/x509/x509_vfy.h b/crypto/x509/x509_vfy.h
index e0476370214d83c08ee411fdcc1ac94bb76fbfab..060bc6093dbdc2e7dce2b0d1b0b11f20ddbbcde8 100644 (file)
--- a/crypto/x509/x509_vfy.h
+++ b/crypto/x509/x509_vfy.h
@@ -222,11 +222,9 @@ struct x509_store_state_st
 #define X509_L_FILE_LOAD       1
 #define X509_L_ADD_DIR         2
 
-X509_LOOKUP_METHOD *X509_LOOKUP_file();
 #define X509_LOOKUP_load_file(x,name,type) \
                X509_LOOKUP_ctrl((x),X509_L_FILE_LOAD,(name),(long)(type),NULL)
 
-X509_LOOKUP_METHOD *X509_LOOKUP_dir();
 #define X509_LOOKUP_add_dir(x,name,type) \
                X509_LOOKUP_ctrl((x),X509_L_ADD_DIR,(name),(long)(type),NULL)
 
@@ -275,6 +273,7 @@ X509_LOOKUP *X509_STORE_add_lookup(X509_STORE *v, X509_LOOKUP_METHOD *m);
 
 X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir(void);
 X509_LOOKUP_METHOD *X509_LOOKUP_file(void);
+X509_LOOKUP_METHOD *X509_LOOKUP_dir(void);
 
 int X509_STORE_add_cert(X509_STORE *ctx, X509 *x);
 int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x);
@@ -338,6 +337,7 @@ X509_LOOKUP *X509_STORE_add_lookup();
 
 X509_LOOKUP_METHOD *X509_LOOKUP_hash_dir();
 X509_LOOKUP_METHOD *X509_LOOKUP_file();
+X509_LOOKUP_METHOD *X509_LOOKUP_dir();
 
 int X509_STORE_add_cert();
 int X509_STORE_add_crl();

diff --git a/util/mkerr.pl b/util/mkerr.pl
index ccf766b9a04156bcc66bb9dc66ad3473ff75a96e..60a3028bc6af54e5c44df8e3e27138f500c67bdf 100644 (file)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -66,7 +66,6 @@ while(<IN>)
        } elsif (/^R\s+(\S+)\s+(\S+)/) {
                $rextra{$1} = $2;
                $rcodes{$1} = $2;
-       # Add extra reason with $1, value $2
        }
 }
 
@@ -114,20 +113,24 @@ while (($lib, $hdr) = each %hinc)
        foreach (split /;/, $def) {
            s/^[\n\s]*//g;
            s/[\n\s]*$//g;
-           next if (/\w+\W+(\w+)\W*\(\s*\)$/s); # K&R C
-           next if (/\(\*(\w*)\([^\)]+/);
-           if (/\w+\W+\w+\W*\(.*\)$/s) {
+           next if(/typedef\W/);
+           if (/\(\*(\w*)\([^\)]+/) {
+               my $name = $1;
+               $name =~ tr/[a-z]/[A-Z]/;
+               $ftrans{$name} = $1;
+           } elsif (/\w+\W+(\w+)\W*\(\s*\)$/s){
+               # K&R C
+               next ;
+           } elsif (/\w+\W+\w+\W*\(.*\)$/s) {
                while (not /\(\)$/s) {
                    s/[^\(\)]*\)$/\)/s;
                    s/\([^\(\)]*\)\)$/\)/s;
                }
                s/\(void\)//;
                /(\w+)\W*\(\)/s;
-               next if(/typedef\W/);
                my $name = $1;
                $name =~ tr/[a-z]/[A-Z]/;
                $ftrans{$name} = $1;
-               
            } elsif (/\(/ and not (/=/ or /DECLARE_STACK/)) {
                print STDERR "Header $hdr: cannot parse: $_;\n";
            }