X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Ferr%2Ferr_genc.pl;h=5ebfa1a15e3fcb0119ed13048de8ff21f970af4b;hb=ad65ce755ea292df565a50e730e4210a3e732f4e;hp=d3251da8428939836623a6318b49ce51f6e04cdb;hpb=7dfb0b774e6592dcbfe47015168a0ac8b44e2a17;p=oweals%2Fopenssl.git diff --git a/crypto/err/err_genc.pl b/crypto/err/err_genc.pl index d3251da842..5ebfa1a15e 100644 --- a/crypto/err/err_genc.pl +++ b/crypto/err/err_genc.pl @@ -65,7 +65,23 @@ print "#endif\n"; if ($static) { $lib="ERR_LIB_$type"; } else - { $lib="${type}_lib_error_code"; } + { + print <<"EOF"; + +#ifdef ${type}_LIB_NAME +static ERR_STRING_DATA ${type}_lib_name[]= + { +{0 ,${type}_LIB_NAME}, +{0,NULL} + }; +#endif + +EOF + $lib="${type}_lib_error_code"; + + + + } $str=""; $str.="#ifndef NO_ERR\n"; @@ -77,7 +93,7 @@ if (!$static) { print <<"EOF"; -static int ${type}_lib_error_code=0; +int ${type}_lib_error_code=0; void ERR_load_${type}_strings() { @@ -86,10 +102,14 @@ void ERR_load_${type}_strings() if (${type}_lib_error_code == 0) ${type}_lib_error_code=ERR_get_next_error_library(); - if (init); - {; + if (init) + { init=0; $str +#ifdef ${type}_LIB_NAME + ${type}_lib_name->error = ERR_PACK(${type}_lib_error_code,0,0); + ERR_load_strings(0,${type}_lib_name); +#endif; } } @@ -113,8 +133,8 @@ void ERR_load_${type}_strings() { static int init=1; - if (init); - {; + if (init) + { init=0; $str }