- enhance perl2fcalls (which now handle /xxx(...)/ as a regexp in more cases)

- remove the use of /xxx (...)/x by /xxx(...)/ as perl2fcalls is getting smart
=> make gc happy which is very important, what would we be without him?

5 files changed, 6 insertions, 6 deletions

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 23002ab18..e004d0dac 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -374,7 +374,7 @@ NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . "
     $tc->{code} and $tc->{code}();
     
 	
-    $card->{prog} = "/usr/X11R6/bin/" . ($card->{use_xf4} ? 'XFree86' : $card->{server} =~ /Sun (.*)/x ?
+    $card->{prog} = "/usr/X11R6/bin/" . ($card->{use_xf4} ? 'XFree86' : $card->{server} =~ /Sun(.*)/ ?
 					 "Xsun$1" : "XF86_$card->{server}");
 
     #- additional packages to install according available card.
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index a7758e897..1be6dfd73 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -136,7 +136,7 @@ sub add_entry($$) {
     my ($entries, $v) = @_;
     my (%usedold, $freeold);
 
-    do { $usedold{$1 || 0} = 1 if $_->{label} =~ /^old ([^_]*)_/x } foreach @$entries;
+    do { $usedold{$1 || 0} = 1 if $_->{label} =~ /^old([^_]*)_/ } foreach @$entries;
     foreach (0..scalar keys %usedold) { exists $usedold{$_} or $freeold = $_ || '', last }
 
     foreach (@$entries) {
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index c12767aa7..0e44c63ac 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -40,7 +40,7 @@ sub cdroms() {
     if (my @l2 = IDEburners()) {
 	require modules;
 	modules::add_alias('scsi_hostadapter', 'ide-scsi');
-	my $nb = 1 + max(-1, map { $_->{device} =~ /scd (\d+)/x } @l);
+	my $nb = 1 + max(-1, map { $_->{device} =~ /scd(\d+)/ } @l);
 	foreach my $i (@l2) {	    
 	    log::l("IDEBurner: $i->{device}");
 	    my ($e) = grep { $_->{device} eq $i->{device} } @l;
@@ -72,7 +72,7 @@ sub floppy { first(floppies()) }
 
 sub isBurner { 
     my $dev = $_[0]{device};
-    if (my($nb) = $dev =~ /scd (.*)/x) {
+    if (my($nb) = $dev =~ /scd(.*)/) {
 	grep { /^(scd|sr)$nb:.*writer/ } syslog();
     } else {
 	my $f = tryOpen($dev); #- SCSI burner are not detected this way.
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 7a56cdd54..19842bea2 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -625,7 +625,7 @@ sub read_conf($;$) {
     foreach (cat_($file)) {
 	do {
 	    $c{$2}{$1} = $3;
-	    $$scsi = max($$scsi, $1 || 0) if /^\s*alias\s+scsi_hostadapter (\d*)/x && $scsi; #- space added to make perl2fcalls happy!
+	    $$scsi = max($$scsi, $1 || 0) if /^\s*alias\s+scsi_hostadapter(\d*)/ && $scsi; #- space added to make perl2fcalls happy!
 	} if /^\s*(\S+)\s+(\S+)\s+(.*?)\s*$/;
     }
     #- cheating here: not handling aliases of aliases
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index cdcc453f5..00c1e6b73 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -163,7 +163,7 @@ sub fullname2mouse {
 
 sub serial_ports() { map { "ttyS$_" } 0..7 }
 sub serial_port2text {
-    $_[0] =~ /ttyS (\d+)/x ? "$_[0] / COM" . ($1 + 1) : $_[0];
+    $_[0] =~ /ttyS(\d+)/ ? "$_[0] / COM" . ($1 + 1) : $_[0];
 }
 
 sub read {