1 files changed, 6 insertions, 15 deletions

diff --git a/tools/genlang b/tools/genlang
index 81d5066453..6a63f8004e 100755
--- a/tools/genlang
+++ b/tools/genlang
@@ -148,16 +148,6 @@ sub trim {
     return $string;
 }
 
-sub match {
-    my ($string, $pattern)=@_;
-
-    return ($string =~ /^$pattern\z/);
-}
-
-sub blank {
-    # nothing to do
-}
-
 my %head;
 sub header {
     my ($full, $n, $v)=@_;
@@ -181,13 +171,14 @@ sub parsetarget {
     my $string;
     my @all= split(" *, *", $n);
     my $test;
+    my $regexp;
     for $test (@all) {
         $test =~ s/\*/.*/g;
         $test =~ s/\?/./g;
-
+        $regexp = qr/^$test\z/;
 #        print "TEST ($debug) $target for $test\n";
         for my $part (@target_parts) {
-            if($part =~ /^$test\z/) {
+            if($part =~ $regexp) {
                 $string = $v;
 #                print "MATCH: $test => $v\n";
                 $$strref = $string;
@@ -233,7 +224,7 @@ if($english) {
     while(<ENG>) {
 
         # get rid of DOS newlines
-        $_ =~ s/\r//g;
+        $_ =~ tr/\r//d;
 
         if($_ =~ /^ *\<phrase\>/) {
             # this is the start of a phrase
@@ -350,7 +341,7 @@ sub compare {
                 $l = "### The 'desc' field differs from the english!\n### the previously used desc is commented below:\n### desc: $ldesc\n  desc: $edesc\n";
             }
             push @show, $l;
-        }
+    }
         elsif($l =~ / *\<source\>/i) {
             $mode=1;
             push @show, $l;
@@ -409,7 +400,7 @@ while(<LANG>) {
     $line++;
 
     # get rid of DOS newlines
-    $_ =~ s/\r//g;
+    $_ =~ tr/\r//d;
 
     if($_ =~ /^( *\#|[ \t\n\r]*\z)/) {
         # comment or empty line - output it if it's part of the header