From: Richard Levitte <levitte@openssl.org>
Date: Tue, 28 Apr 2015 12:34:58 +0000 (+0200)
Subject: Allow for types with leading underscore when checking error macros.
X-Git-Tag: OpenSSL_1_1_0-pre1~1258
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0223ca0987aa8c3b0c4adc084c1f03a5e4e32288;p=oweals%2Fopenssl.git

Allow for types with leading underscore when checking error macros.

We have an increasing number of function declarations starting with
'__owur'.  Unfortunately, util/ck_errf.pl fails to detect them.  A
simple change fixes that issue.

Reviewed-by: Emilia Käsper <emilia@openssl.org>
---

diff --git a/util/ck_errf.pl b/util/ck_errf.pl
index 1a8665ab6a..922e5f644b 100755
--- a/util/ck_errf.pl
+++ b/util/ck_errf.pl
@@ -21,7 +21,7 @@ foreach $file (@ARGV)
 	$func="";
 	while (<IN>)
 		{
-		if (!/;$/ && /^\**([a-zA-Z].*[\s*])?([A-Za-z_0-9]+)\(.*([),]|$)/)
+		if (!/;$/ && /^\**([a-zA-Z_].*[\s*])?([A-Za-z_0-9]+)\(.*([),]|$)/)
 			{
 			/^([^()]*(\([^()]*\)[^()]*)*)\(/;
 			$1 =~ /([A-Za-z_0-9]*)$/;