Fix more error codes.

(Also improve util/ck_errf.pl script, and occasionally
fix source code formatting.)

1 files changed, 8 insertions, 3 deletions

diff --git a/util/ck_errf.pl b/util/ck_errf.pl
index 6fcafec97e..344b422c34 100755
--- a/util/ck_errf.pl
+++ b/util/ck_errf.pl
@@ -13,16 +13,21 @@ 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]+)\(.*[),]/)
 			{
-			$func=$2;
+			/^([^()]*(\([^()]*\)[^()]*)*)\(/;
+			$1 =~ /([A-Za-z_0-9]*)$/;
+			$func = $1;
 			$func =~ tr/A-Z/a-z/;
 			}
 		if (/([A-Z0-9]+)err\(([^,]+)/)
 			{
-			next if ($func eq "");
 			$errlib=$1;
 			$n=$2;
+
+			if ($func eq "")
+				{ print "$file:$.:???:$n\n"; next; }
+
 			if ($n !~ /([^_]+)_F_(.+)$/)
 				{
 		#		print "check -$file:$.:$func:$n\n";