Fix memory leak.

[openssl.git] / util / mkerr.pl

diff --git a/util/mkerr.pl b/util/mkerr.pl
index 407ca2031372549b39ca345003f2877c57fcc014..e812b9fc006d8b0194c0cf8955fc28743dccbd83 100644 (file)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -53,6 +53,7 @@ while(<IN>)
 {
        if(/^L\s+(\S+)\s+(\S+)\s+(\S+)/) {
                $hinc{$1} = $2;
+               $libinc{$2} = $1;
                $cskip{$3} = $1;
                if($3 ne "NONE") {
                        $csrc{$1} = $3;
@@ -74,7 +75,7 @@ close IN;
 # Scan each header file in turn and make a list of error codes
 # and function names
 
-while (($lib, $hdr) = each %hinc)
+while (($hdr, $lib) = each %libinc)
 {
        next if($hdr eq "NONE");
        print STDERR "Scanning header file $hdr\n" if $debug; 
@@ -257,6 +258,7 @@ 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.
  */
+void ERR_load_${lib}_strings(void);
 
 /* Error codes for the $lib functions. */
 
@@ -288,7 +290,6 @@ EOF
 }
 #endif
 #endif
-
 EOF
        close OUT;
 
@@ -382,7 +383,7 @@ EOF
 #include $hincf
 
 /* BEGIN ERROR CODES */
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
 static ERR_STRING_DATA ${lib}_str_functs[]=
        {
 EOF
@@ -432,7 +433,7 @@ void ERR_load_${lib}_strings(void)
        if (init)
                {
                init=0;
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
                ERR_load_strings(ERR_LIB_${lib},${lib}_str_functs);
                ERR_load_strings(ERR_LIB_${lib},${lib}_str_reasons);
 #endif
@@ -468,7 +469,7 @@ void ERR_load_${lib}_strings(void)
        if (init)
                {
                init=0;
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
                ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);
                ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);
 #endif