Commit 35729218b857e52aeae75f19b43f7b1a4fba0463
Committed by
Tom Rini
1 parent
fea6730e1c
Exists in
v2017.01-smarct4x
and in
30 other branches
get_maintainer: fix perl 5.22/5.24 deprecated/incompatible "\C" use
from linux commit ce8155f7a3d5: Perl 5.22 emits a deprecated message when "\C" is used in a regex. Perl 5.24 will disallow it altogether. Fix it by using [A-Z] instead of \C. >From linux adapted to U-Boot by: Signed-off-by: Heiko Schocher <hs@denx.de> Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Showing 1 changed file with 11 additions and 11 deletions Side-by-side Diff
scripts/get_maintainer.pl
... | ... | @@ -298,7 +298,7 @@ |
298 | 298 | while (<$maint>) { |
299 | 299 | my $line = $_; |
300 | 300 | |
301 | - if ($line =~ m/^(\C):\s*(.*)/) { | |
301 | + if ($line =~ m/^([A-Z]):\s*(.*)/) { | |
302 | 302 | my $type = $1; |
303 | 303 | my $value = $2; |
304 | 304 | |
... | ... | @@ -533,7 +533,7 @@ |
533 | 533 | |
534 | 534 | for (my $i = $start; $i < $end; $i++) { |
535 | 535 | my $line = $typevalue[$i]; |
536 | - if ($line =~ m/^(\C):\s*(.*)/) { | |
536 | + if ($line =~ m/^([A-Z]):\s*(.*)/) { | |
537 | 537 | my $type = $1; |
538 | 538 | my $value = $2; |
539 | 539 | if ($type eq 'S') { |
... | ... | @@ -551,7 +551,7 @@ |
551 | 551 | |
552 | 552 | for (my $i = $start; $i < $end; $i++) { |
553 | 553 | my $line = $typevalue[$i]; |
554 | - if ($line =~ m/^(\C):\s*(.*)/) { | |
554 | + if ($line =~ m/^([A-Z]):\s*(.*)/) { | |
555 | 555 | my $type = $1; |
556 | 556 | my $value = $2; |
557 | 557 | if ($type eq 'M') { |
... | ... | @@ -600,7 +600,7 @@ |
600 | 600 | |
601 | 601 | for ($i = $start; $i < $end; $i++) { |
602 | 602 | my $line = $typevalue[$i]; |
603 | - if ($line =~ m/^(\C):\s*(.*)/) { | |
603 | + if ($line =~ m/^([A-Z]):\s*(.*)/) { | |
604 | 604 | my $type = $1; |
605 | 605 | my $value = $2; |
606 | 606 | if ($type eq 'X') { |
... | ... | @@ -615,7 +615,7 @@ |
615 | 615 | if (!$exclude) { |
616 | 616 | for ($i = $start; $i < $end; $i++) { |
617 | 617 | my $line = $typevalue[$i]; |
618 | - if ($line =~ m/^(\C):\s*(.*)/) { | |
618 | + if ($line =~ m/^([A-Z]):\s*(.*)/) { | |
619 | 619 | my $type = $1; |
620 | 620 | my $value = $2; |
621 | 621 | if ($type eq 'F') { |
... | ... | @@ -917,7 +917,7 @@ |
917 | 917 | |
918 | 918 | while ($index < @typevalue) { |
919 | 919 | my $tv = $typevalue[$index]; |
920 | - if (($tv =~ m/^(\C):\s*(.*)/)) { | |
920 | + if (($tv =~ m/^([A-Z]):\s*(.*)/)) { | |
921 | 921 | last; |
922 | 922 | } |
923 | 923 | $index++; |
... | ... | @@ -931,7 +931,7 @@ |
931 | 931 | |
932 | 932 | while ($index > 0) { |
933 | 933 | my $tv = $typevalue[$index]; |
934 | - if (!($tv =~ m/^(\C):\s*(.*)/)) { | |
934 | + if (!($tv =~ m/^([A-Z]):\s*(.*)/)) { | |
935 | 935 | last; |
936 | 936 | } |
937 | 937 | $index--; |
... | ... | @@ -945,7 +945,7 @@ |
945 | 945 | |
946 | 946 | while ($index < @typevalue) { |
947 | 947 | my $tv = $typevalue[$index]; |
948 | - if (!($tv =~ m/^(\C):\s*(.*)/)) { | |
948 | + if (!($tv =~ m/^([A-Z]):\s*(.*)/)) { | |
949 | 949 | last; |
950 | 950 | } |
951 | 951 | $index++; |
... | ... | @@ -971,7 +971,7 @@ |
971 | 971 | |
972 | 972 | for ($i = $start + 1; $i < $end; $i++) { |
973 | 973 | my $tv = $typevalue[$i]; |
974 | - if ($tv =~ m/^(\C):\s*(.*)/) { | |
974 | + if ($tv =~ m/^([A-Z]):\s*(.*)/) { | |
975 | 975 | my $ptype = $1; |
976 | 976 | my $pvalue = $2; |
977 | 977 | if ($ptype eq "S") { |
... | ... | @@ -1030,7 +1030,7 @@ |
1030 | 1030 | |
1031 | 1031 | for ($i = $start + 1; $i < $end; $i++) { |
1032 | 1032 | my $tv = $typevalue[$i]; |
1033 | - if ($tv =~ m/^(\C):\s*(.*)/) { | |
1033 | + if ($tv =~ m/^([A-Z]):\s*(.*)/) { | |
1034 | 1034 | my $ptype = $1; |
1035 | 1035 | my $pvalue = $2; |
1036 | 1036 | if ($ptype eq "L") { |
... | ... | @@ -1072,7 +1072,7 @@ |
1072 | 1072 | if ($name eq "") { |
1073 | 1073 | if ($i > 0) { |
1074 | 1074 | my $tv = $typevalue[$i - 1]; |
1075 | - if ($tv =~ m/^(\C):\s*(.*)/) { | |
1075 | + if ($tv =~ m/^([A-Z]):\s*(.*)/) { | |
1076 | 1076 | if ($1 eq "P") { |
1077 | 1077 | $name = $2; |
1078 | 1078 | $pvalue = format_email($name, $address, $email_usename); |