projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep shutting up VC8.
[openssl.git]
/
util
/
mkerr.pl
diff --git
a/util/mkerr.pl
b/util/mkerr.pl
index 05d0340f6a3a2f1133844423687f4309841420a6..d8e6239e4269f8b484210d66015e4933c1fb8a16 100644
(file)
--- a/
util/mkerr.pl
+++ b/
util/mkerr.pl
@@
-9,6
+9,9
@@
my $reindex = 0;
my $dowrite = 0;
my $staticloader = "";
my $dowrite = 0;
my $staticloader = "";
+my $pack_errcode;
+my $load_errcode;
+
while (@ARGV) {
my $arg = $ARGV[0];
if($arg eq "-conf") {
while (@ARGV) {
my $arg = $ARGV[0];
if($arg eq "-conf") {
@@
-145,7
+148,7
@@
while (($hdr, $lib) = each %libinc)
my $name = $1;
$name =~ tr/[a-z]/[A-Z]/;
$ftrans{$name} = $1;
my $name = $1;
$name =~ tr/[a-z]/[A-Z]/;
$ftrans{$name} = $1;
- } elsif (/\(/ and not (/=/ or /DECLARE_STACK/)) {
+ } elsif (/\(/ and not (/=/ or /DECLARE_STACK/
or /TYPEDEF_D2I2D_OF/
)) {
print STDERR "Header $hdr: cannot parse: $_;\n";
}
}
print STDERR "Header $hdr: cannot parse: $_;\n";
}
}
@@
-398,6
+401,20
@@
EOF
$hincf = "\"$hfile\"";
}
$hincf = "\"$hfile\"";
}
+ # If static we know the error code at compile time so use it
+ # in error definitions.
+
+ if ($static)
+ {
+ $pack_errcode = "ERR_LIB_${lib}";
+ $load_errcode = "0";
+ }
+ else
+ {
+ $pack_errcode = "0";
+ $load_errcode = "ERR_LIB_${lib}";
+ }
+
open (OUT,">$cfile") || die "Can't open $cfile for writing";
open (OUT,">$cfile") || die "Can't open $cfile for writing";
@@
-468,6
+485,10
@@
EOF
/* BEGIN ERROR CODES */
#ifndef OPENSSL_NO_ERR
/* BEGIN ERROR CODES */
#ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
+#define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
+
static ERR_STRING_DATA ${lib}_str_functs[]=
{
EOF
static ERR_STRING_DATA ${lib}_str_functs[]=
{
EOF
@@
-479,7
+500,8
@@
EOF
if(exists $ftrans{$fn}) {
$fn = $ftrans{$fn};
}
if(exists $ftrans{$fn}) {
$fn = $ftrans{$fn};
}
- print OUT "{ERR_PACK(0,$i,0),\t\"$fn\"},\n";
+# print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n";
+ print OUT "{ERR_FUNC($i),\t\"$fn\"},\n";
}
print OUT <<"EOF";
{0,NULL}
}
print OUT <<"EOF";
{0,NULL}
@@
-491,6
+513,7
@@
EOF
# Add each reason code.
foreach $i (@reasons) {
my $rn;
# Add each reason code.
foreach $i (@reasons) {
my $rn;
+ my $rstr = "ERR_REASON($i)";
my $nspc = 0;
if (exists $err_reason_strings{$i}) {
$rn = $err_reason_strings{$i};
my $nspc = 0;
if (exists $err_reason_strings{$i}) {
$rn = $err_reason_strings{$i};
@@
-499,9
+522,9
@@
EOF
$rn = $1;
$rn =~ tr/_[A-Z]/ [a-z]/;
}
$rn = $1;
$rn =~ tr/_[A-Z]/ [a-z]/;
}
- $nspc = 40 - length($
i) unless length($i
) > 40;
+ $nspc = 40 - length($
rstr) unless length($rstr
) > 40;
$nspc = " " x $nspc;
$nspc = " " x $nspc;
- print OUT "{${
i
}${nspc},\"$rn\"},\n";
+ print OUT "{${
rstr
}${nspc},\"$rn\"},\n";
}
if($static) {
print OUT <<"EOF";
}
if($static) {
print OUT <<"EOF";
@@
-518,8
+541,8
@@
${staticloader}void ERR_load_${lib}_strings(void)
{
init=0;
#ifndef OPENSSL_NO_ERR
{
init=0;
#ifndef OPENSSL_NO_ERR
- ERR_load_strings(
ERR_LIB_${lib}
,${lib}_str_functs);
- ERR_load_strings(
ERR_LIB_${lib}
,${lib}_str_reasons);
+ ERR_load_strings(
$load_errcode
,${lib}_str_functs);
+ ERR_load_strings(
$load_errcode
,${lib}_str_reasons);
#endif
}
#endif
}