get rid of OpenSSLDie

[openssl.git] / util / mkerr.pl

diff --git a/util/mkerr.pl b/util/mkerr.pl
index fc481eec0a0844acbce3ea979087a38c87d54b4c..449aa57bbaf08825203bd8696a00b010d3771c38 100644 (file)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -7,7 +7,7 @@ my $static = 1;
 my $recurse = 0;
 my $reindex = 0;
 my $dowrite = 0;
-my $staticloader = "";
+
 
 while (@ARGV) {
        my $arg = $ARGV[0];
@@ -29,9 +29,6 @@ while (@ARGV) {
        } elsif($arg eq "-nostatic") {
                $static = 0;
                shift @ARGV;
-       } elsif($arg eq "-staticloader") {
-               $staticloader = "static ";
-               shift @ARGV;
        } elsif($arg eq "-write") {
                $dowrite = 1;
                shift @ARGV;
@@ -41,7 +38,7 @@ while (@ARGV) {
 }
 
 if($recurse) {
-       @source = (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>);
+       @source = (<crypto/*.c>, <crypto/*/*.c>, <rsaref/*.c>, <ssl/*.c>);
 } else {
        @source = @ARGV;
 }
@@ -159,7 +156,6 @@ while (($hdr, $lib) = each %libinc)
                if(/^#define\s+(\S+)\s+(\S+)/) {
                        $name = $1;
                        $code = $2;
-                       next if $name =~ /^${lib}err/;
                        unless($name =~ /^${lib}_([RF])_(\w+)$/) {
                                print STDERR "Invalid error code $name\n";
                                next;
@@ -193,11 +189,9 @@ while (($hdr, $lib) = each %libinc)
 # so all those unreferenced can be printed out.
 
 
-print STDERR "Files loaded: " if $debug;
 foreach $file (@source) {
        # Don't parse the error source file.
        next if exists $cskip{$file};
-       print STDERR $file if $debug;
        open(IN, "<$file") || die "Can't open source file $file\n";
        while(<IN>) {
                if(/(([A-Z0-9]+)_F_([A-Z0-9_]+))/) {
@@ -221,7 +215,6 @@ foreach $file (@source) {
        }
        close IN;
 }
-print STDERR "\n" if $debug;
 
 # Now process each library in turn.
 
@@ -265,22 +258,8 @@ foreach $lib (keys %csrc)
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
-EOF
-       if($static) {
-               print OUT <<"EOF";
-${staticloader}void ERR_load_${lib}_strings(void);
-
-EOF
-       } else {
-               print OUT <<"EOF";
-${staticloader}void ERR_load_${lib}_strings(void);
-${staticloader}void ERR_unload_${lib}_strings(void);
-${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);
-#define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
+void ERR_load_${lib}_strings(void);
 
-EOF
-       }
-       print OUT <<"EOF";
 /* Error codes for the $lib functions. */
 
 /* Function codes. */
@@ -341,7 +320,7 @@ EOF
        print OUT <<"EOF";
 /* $cfile */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2002 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -404,7 +383,7 @@ EOF
 #include $hincf
 
 /* BEGIN ERROR CODES */
-#ifndef OPENSSL_NO_ERR
+#ifndef NO_ERR
 static ERR_STRING_DATA ${lib}_str_functs[]=
        {
 EOF
@@ -447,14 +426,14 @@ if($static) {
 
 #endif
 
-${staticloader}void ERR_load_${lib}_strings(void)
+void ERR_load_${lib}_strings(void)
        {
        static int init=1;
 
        if (init)
                {
                init=0;
-#ifndef OPENSSL_NO_ERR
+#ifndef NO_ERR
                ERR_load_strings(ERR_LIB_${lib},${lib}_str_functs);
                ERR_load_strings(ERR_LIB_${lib},${lib}_str_reasons);
 #endif
@@ -478,18 +457,19 @@ static ERR_STRING_DATA ${lib}_lib_name[]=
 #endif
 
 
-static int ${lib}_lib_error_code=0;
-static int ${lib}_error_init=1;
+int ${lib}_lib_error_code=0;
 
-${staticloader}void ERR_load_${lib}_strings(void)
+void ERR_load_${lib}_strings(void)
        {
+       static int init=1;
+
        if (${lib}_lib_error_code == 0)
                ${lib}_lib_error_code=ERR_get_next_error_library();
 
-       if (${lib}_error_init)
+       if (init)
                {
-               ${lib}_error_init=0;
-#ifndef OPENSSL_NO_ERR
+               init=0;
+#ifndef NO_ERR
                ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);
                ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);
 #endif
@@ -501,23 +481,7 @@ ${staticloader}void ERR_load_${lib}_strings(void)
                }
        }
 
-${staticloader}void ERR_unload_${lib}_strings(void)
-       {
-       if (${lib}_error_init == 0)
-               {
-#ifndef OPENSSL_NO_ERR
-               ERR_unload_strings(${lib}_lib_error_code,${lib}_str_functs);
-               ERR_unload_strings(${lib}_lib_error_code,${lib}_str_reasons);
-#endif
-
-#ifdef ${lib}_LIB_NAME
-               ERR_unload_strings(0,${lib}_lib_name);
-#endif
-               ${lib}_error_init=1;
-               }
-       }
-
-${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line)
+void ERR_${lib}_error(int function, int reason, char *file, int line)
        {
        if (${lib}_lib_error_code == 0)
                ${lib}_lib_error_code=ERR_get_next_error_library();