Commit a065737a authored by Matt Caswell's avatar Matt Caswell
Browse files

Update mkerr.pl for new format 



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

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 241cff62

util/mkerr.pl

+66 −66
Original line number Diff line number Diff line
@@ -376,7 +376,8 @@ foreach $lib (keys %csrc) 
	print OUT @out;

	undef @out;

	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.

 */

EOF
@@ -401,7 +402,7 @@ EOF 
EOF



	foreach $i (@function) {

		$z=6-int(length($i)/8);

		$z=48 - length($i);

		if($fcodes{$i} eq "X") {

			$fassigned{$lib} =~ m/^:([^:]*):/;

			$findcode = $1;
@@ -415,13 +416,13 @@ EOF 
			$fassigned{$lib} .= "$findcode:";

			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";



	foreach $i (@reasons) {

		$z=6-int(length($i)/8);

		$z=48 - length($i);

		if($rcodes{$i} eq "X") {

			$rassigned{$lib} =~ m/^:([^:]*):/;

			$findcode = $1;
@@ -435,7 +436,7 @@ EOF 
			$rassigned{$lib} .= "$findcode:";

			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";
@@ -540,7 +541,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,

 * only reason strings will be preserved.

 */
@@ -555,8 +557,7 @@ EOF 
# 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[]=

	{

static ERR_STRING_DATA ${lib}_str_functs[] = {

EOF

	# Add each function code: if a function name is found then use it.

	foreach $i (@function) {
@@ -567,20 +568,22 @@ EOF 
			$fn = $ftrans{$fn};

		}

#		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";

    {0, NULL}

};



static ERR_STRING_DATA ${lib}_str_reasons[]=

	{

static ERR_STRING_DATA ${lib}_str_reasons[] = {

EOF

	# 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};

		} else {
@@ -588,9 +591,11 @@ EOF 
			$rn = $1;

			$rn =~ tr/_[A-Z]/ [a-z]/;

		}

		$nspc = 40 - length($rstr) unless length($rstr) > 40;

		$nspc = " " x $nspc;

		print OUT "{${rstr}${nspc},\"$rn\"},\n";

		if(length($i) + length($rn) > 56) {

			print OUT "    {${rstr},\n     \"$rn\"},\n";

		} else {

			print OUT "    {${rstr}, \"$rn\"},\n";

		}

	}

if($static) {

	print OUT <<"EOF";
@@ -603,8 +608,7 @@ ${staticloader}void ERR_load_${lib}_strings(void) 
{

#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_reasons);

    }
@@ -619,14 +623,12 @@ EOF 
#endif



#ifdef ${lib}_LIB_NAME

static ERR_STRING_DATA ${lib}_lib_name[]=

        {

static ERR_STRING_DATA ${lib}_lib_name[] = {

    {0, ${lib}_LIB_NAME},

    {0, NULL}

};

#endif





static int ${lib}_lib_error_code = 0;

static int ${lib}_error_init = 1;
@@ -635,8 +637,7 @@ ${staticloader}void ERR_load_${lib}_strings(void) 
    if (${lib}_lib_error_code == 0)

        ${lib}_lib_error_code = ERR_get_next_error_library();



	if (${lib}_error_init)

		{

    if (${lib}_error_init) {

        ${lib}_error_init = 0;

#ifndef OPENSSL_NO_ERR

        ERR_load_strings(${lib}_lib_error_code, ${lib}_str_functs);
@@ -652,8 +653,7 @@ ${staticloader}void ERR_load_${lib}_strings(void) 


${staticloader}void ERR_unload_${lib}_strings(void)

{

	if (${lib}_error_init == 0)

		{

    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);