generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update mkerr.pl for new format

Browse Source 
Make the output from mkerr.pl consistent with the newly reformatted code.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2015-03-06 13:00:47 +00:00
parent 183db9af80
commit 0440d4ebe4
1 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
util/mkerr.pl
View File

@ -458,7 +458,8 @@ foreach $lib (keys %csrc)
print OUT @out; print OUT @out;
undef @out; undef @out;
print OUT <<"EOF"; print OUT <<"EOF";
/* The following lines are auto generated by the script mkerr.pl. Any changes /*
* 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. * made after this point may be overwritten when the script is next run.
*/ */
EOF EOF
@ -472,7 +473,7 @@ EOF
${staticloader}void ERR_load_${lib}_strings(void); ${staticloader}void ERR_load_${lib}_strings(void);
${staticloader}void ERR_unload_${lib}_strings(void); ${staticloader}void ERR_unload_${lib}_strings(void);
${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line); ${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__) # define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
EOF EOF
} }
@ -483,7 +484,7 @@ EOF
EOF EOF
foreach $i (@function) { foreach $i (@function) {
$z=6-int(length($i)/8); $z=48 - length($i);
if($fcodes{$i} eq "X") { if($fcodes{$i} eq "X") {
$fassigned{$lib} =~ m/^:([^:]*):/; $fassigned{$lib} =~ m/^:([^:]*):/;
$findcode = $1; $findcode = $1;
@ -497,13 +498,13 @@ EOF
$fassigned{$lib} .= "$findcode:"; $fassigned{$lib} .= "$findcode:";
print STDERR "New Function code $i\n" if $debug; print STDERR "New Function code $i\n" if $debug;
} }
printf OUT "#define $i%s $fcodes{$i}\n","\t" x $z; printf OUT "# define $i%s $fcodes{$i}\n"," " x $z;
} }
print OUT "\n/* Reason codes. */\n"; print OUT "\n/* Reason codes. */\n";
foreach $i (@reasons) { foreach $i (@reasons) {
$z=6-int(length($i)/8); $z=48 - length($i);
if($rcodes{$i} eq "X") { if($rcodes{$i} eq "X") {
$rassigned{$lib} =~ m/^:([^:]*):/; $rassigned{$lib} =~ m/^:([^:]*):/;
$findcode = $1; $findcode = $1;
@ -517,7 +518,7 @@ EOF
$rassigned{$lib} .= "$findcode:"; $rassigned{$lib} .= "$findcode:";
print STDERR "New Reason code $i\n" if $debug; print STDERR "New Reason code $i\n" if $debug;
} }
printf OUT "#define $i%s $rcodes{$i}\n","\t" x $z; printf OUT "# define $i%s $rcodes{$i}\n"," " x $z;
} }
print OUT <<"EOF"; print OUT <<"EOF";
@ -583,7 +584,7 @@ EOF
* are met: * are met:
* *
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in * notice, this list of conditions and the following disclaimer in
@ -629,7 +630,8 @@ EOF
* *
*/ */
/* NOTE: this file was auto generated by the mkerr.pl script: any changes /*
* NOTE: this file was auto generated by the mkerr.pl script: any changes
* made to it will be overwritten when the script next updates this file, * made to it will be overwritten when the script next updates this file,
* only reason strings will be preserved. * only reason strings will be preserved.
*/ */
@ -641,11 +643,10 @@ EOF
/* BEGIN ERROR CODES */ /* BEGIN ERROR CODES */
#ifndef OPENSSL_NO_ERR #ifndef OPENSSL_NO_ERR
#define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0) # define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
#define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason) # define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
static ERR_STRING_DATA ${lib}_str_functs[]= static ERR_STRING_DATA ${lib}_str_functs[] = {
{
EOF EOF
# Add each function code: if a function name is found then use it. # Add each function code: if a function name is found then use it.
foreach $i (@function) { foreach $i (@function) {
@ -656,20 +657,22 @@ EOF
$fn = $ftrans{$fn}; $fn = $ftrans{$fn};
} }
# print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n"; # print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n";
print OUT "{ERR_FUNC($i),\t\"$fn\"},\n"; if(length($i) + length($fn) > 58) {
print OUT " {ERR_FUNC($i),\n \"$fn\"},\n";
} else {
print OUT " {ERR_FUNC($i), \"$fn\"},\n";
}
} }
print OUT <<"EOF"; print OUT <<"EOF";
{0,NULL} {0, NULL}
}; };
static ERR_STRING_DATA ${lib}_str_reasons[]= static ERR_STRING_DATA ${lib}_str_reasons[] = {
{
EOF EOF
# Add each reason code. # Add each reason code.
foreach $i (@reasons) { foreach $i (@reasons) {
my $rn; my $rn;
my $rstr = "ERR_REASON($i)"; my $rstr = "ERR_REASON($i)";
my $nspc = 0;
if (exists $err_reason_strings{$i}) { if (exists $err_reason_strings{$i}) {
$rn = $err_reason_strings{$i}; $rn = $err_reason_strings{$i};
} else { } else {
@ -677,90 +680,87 @@ EOF
$rn = $1; $rn = $1;
$rn =~ tr/_[A-Z]/ [a-z]/; $rn =~ tr/_[A-Z]/ [a-z]/;
} }
$nspc = 40 - length($rstr) unless length($rstr) > 40; if(length($i) + length($rn) > 56) {
$nspc = " " x $nspc; print OUT " {${rstr},\n \"$rn\"},\n";
print OUT "{${rstr}${nspc},\"$rn\"},\n"; } else {
print OUT " {${rstr}, \"$rn\"},\n";
}
} }
if($static) { if($static) {
print OUT <<"EOF"; print OUT <<"EOF";
{0,NULL} {0, NULL}
}; };
#endif #endif
${staticloader}void ERR_load_${lib}_strings(void) ${staticloader}void ERR_load_${lib}_strings(void)
{ {
#ifndef OPENSSL_NO_ERR #ifndef OPENSSL_NO_ERR
if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL) if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL) {
{ ERR_load_strings($load_errcode, ${lib}_str_functs);
ERR_load_strings($load_errcode,${lib}_str_functs); ERR_load_strings($load_errcode, ${lib}_str_reasons);
ERR_load_strings($load_errcode,${lib}_str_reasons); }
}
#endif #endif
} }
EOF EOF
} else { } else {
print OUT <<"EOF"; print OUT <<"EOF";
{0,NULL} {0, NULL}
}; };
#endif #endif
#ifdef ${lib}_LIB_NAME #ifdef ${lib}_LIB_NAME
static ERR_STRING_DATA ${lib}_lib_name[]= static ERR_STRING_DATA ${lib}_lib_name[] = {
{ {0, ${lib}_LIB_NAME},
{0 ,${lib}_LIB_NAME}, {0, NULL}
{0,NULL} };
};
#endif #endif
static int ${lib}_lib_error_code = 0;
static int ${lib}_lib_error_code=0; static int ${lib}_error_init = 1;
static int ${lib}_error_init=1;
${staticloader}void ERR_load_${lib}_strings(void) ${staticloader}void ERR_load_${lib}_strings(void)
{ {
if (${lib}_lib_error_code == 0) if (${lib}_lib_error_code == 0)
${lib}_lib_error_code=ERR_get_next_error_library(); ${lib}_lib_error_code = ERR_get_next_error_library();
if (${lib}_error_init) if (${lib}_error_init) {
{ ${lib}_error_init = 0;
${lib}_error_init=0;
#ifndef OPENSSL_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_functs);
ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons); ERR_load_strings(${lib}_lib_error_code, ${lib}_str_reasons);
#endif #endif
#ifdef ${lib}_LIB_NAME #ifdef ${lib}_LIB_NAME
${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0); ${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code, 0, 0);
ERR_load_strings(0,${lib}_lib_name); ERR_load_strings(0, ${lib}_lib_name);
#endif #endif
} }
} }
${staticloader}void ERR_unload_${lib}_strings(void) ${staticloader}void ERR_unload_${lib}_strings(void)
{ {
if (${lib}_error_init == 0) if (${lib}_error_init == 0) {
{
#ifndef OPENSSL_NO_ERR #ifndef OPENSSL_NO_ERR
ERR_unload_strings(${lib}_lib_error_code,${lib}_str_functs); ERR_unload_strings(${lib}_lib_error_code, ${lib}_str_functs);
ERR_unload_strings(${lib}_lib_error_code,${lib}_str_reasons); ERR_unload_strings(${lib}_lib_error_code, ${lib}_str_reasons);
#endif #endif
#ifdef ${lib}_LIB_NAME #ifdef ${lib}_LIB_NAME
ERR_unload_strings(0,${lib}_lib_name); ERR_unload_strings(0, ${lib}_lib_name);
#endif #endif
${lib}_error_init=1; ${lib}_error_init = 1;
} }
} }
${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line) ${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line)
{ {
if (${lib}_lib_error_code == 0) if (${lib}_lib_error_code == 0)
${lib}_lib_error_code=ERR_get_next_error_library(); ${lib}_lib_error_code = ERR_get_next_error_library();
ERR_PUT_error(${lib}_lib_error_code,function,reason,file,line); ERR_PUT_error(${lib}_lib_error_code, function, reason, file, line);
} }
EOF EOF
} }