add/remove some spaces to make perl_checker happy

5 files changed, 31 insertions, 31 deletions

diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm
index 8439f9a37..e26c0914a 100644
--- a/perl-install/printer/detect.pm
+++ b/perl-install/printer/detect.pm
@@ -87,7 +87,7 @@ sub whatNetPrinter {
 	    } else {
 		if (!defined($modelinfo)) {
 		    # SNMP request to auto-detect model
-		    $modelinfo = getSNMPModel ($ip);
+		    $modelinfo = getSNMPModel($ip);
 		}
 		if (defined($modelinfo)) {
 		    push @res, { port => "socket://$host:$port",
diff --git a/perl-install/printer/gimp.pm b/perl-install/printer/gimp.pm
index 6d92d5fe3..bf4cab83c 100644
--- a/perl-install/printer/gimp.pm
+++ b/perl-install/printer/gimp.pm
@@ -105,7 +105,7 @@ sub addcupsremoteto {
 		 /^\*PPD-Adobe/)) {
 		$ppdfile = "/etc/foomatic/$queue.ppd";
 	    } else {
-		unlink ("$::prefix/etc/foomatic/$queue.ppd");
+		unlink "$::prefix/etc/foomatic/$queue.ppd";
 		return 0;
 	    }
 	}
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index ad525b0d6..907164ddb 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -239,7 +239,7 @@ sub read_configured_queues($) {
 	    open F, ($::testing ? $prefix : "chroot $prefix/ ") . 
 		"foomatic-configure -P -q -s $spooler |" or
 		    die "Could not run foomatic-configure";
-	    eval (join('',(<F>))); 
+	    eval join('',(<F>)); 
 	    close F;
 	    if ($service eq "pdq") {
 		#- Have we found queues? PDQ has no damon, so we consider
@@ -260,7 +260,7 @@ sub read_configured_queues($) {
 	open F, ($::testing ? $prefix : "chroot $prefix/ ") . 
 	    "foomatic-configure -P -q -s $printer->{SPOOLER} |" or
 		die "Could not run foomatic-configure";
-	eval (join('',(<F>))); 
+	eval join('',(<F>)); 
 	close F;
     }
     $printer->{configured} = {};
@@ -524,7 +524,7 @@ sub read_foomatic_options ($) {
 		  " $printer->{SPECIAL_OPTIONS}" : "") 
 		    . " |" or
 	    die "Could not run foomatic-configure";
-    eval (join('',(<F>))); 
+    eval join('',(<F>)); 
     close F;
     # Return the arguments field
     return $COMBODATA->{args};
@@ -1337,7 +1337,7 @@ sub configure_hpoj {
 	$bus = "par";
 	$address_arg = printer::detect::parport_addr($device);
 	$address_arg =~ /^\s*-base\s+(\S+)/;
-	eval ("$base_address = $1");
+	eval "$base_address = $1";
     } elsif ($device =~ /socket/) {
 	$bus = "hpjd";
 	$hostname = $model;
@@ -1399,7 +1399,7 @@ sub configure_hpoj {
 		    close F;
 		    chomp $serialnumber_long;
 		}
-		if (cardReaderDetected ($ptalprobedevice)) {
+		if (cardReaderDetected($ptalprobedevice)) {
 		    $cardreader = 1;
 		}
 	    }
@@ -1441,7 +1441,7 @@ sub configure_hpoj {
     }
 
     # Delete any old/conflicting devices
-    deleteDevice ($ptaldevice);
+    deleteDevice($ptaldevice);
     if ($bus eq "par") {
 	while (1) {
 	    my $oldDevname = lookupDevname ("mlc:par:",undef,undef,
@@ -1449,7 +1449,7 @@ sub configure_hpoj {
 	    if (!defined($oldDevname)) {
 		last;
 	    }
-	    deleteDevice ($oldDevname);
+	    deleteDevice($oldDevname);
 	}
     }
 
@@ -1575,7 +1575,7 @@ sub configure_hpoj {
 	    "init.photod.append+=-maxaltports 26\n";
     }
     close(CONFIG);
-    readOneDevice ($ptaldevice);
+    readOneDevice($ptaldevice);
 
     # Restart HPOJ
     printer::services::restart("hpoj");
@@ -1661,7 +1661,7 @@ RIGHTDRIVE=\" \"
 
 sub configureapplications {
     my ($printer) = @_;
-    setcupslink ($printer);
+    setcupslink($printer);
     printer::office::configureoffice('Star Office', $printer);
     printer::office::configureoffice('OpenOffice.Org', $printer);
     printer::gimp::configure($printer);
@@ -1669,23 +1669,23 @@ sub configureapplications {
 
 sub addcupsremotetoapplications {
     my ($printer, $queue) = @_;
-    setcupslink ($printer);
-    return (printer::office::add_cups_remote_to_office('Star Office', $printer, $queue) &&
-	    printer::office::add_cups_remote_to_office('OpenOffice.Org', $printer, $queue) &&
-	    printer::gimp::addcupsremoteto($printer, $queue));
+    setcupslink($printer);
+    return printer::office::add_cups_remote_to_office('Star Office', $printer, $queue) &&
+	   printer::office::add_cups_remote_to_office('OpenOffice.Org', $printer, $queue) &&
+	   printer::gimp::addcupsremoteto($printer, $queue);
 }
 
 sub removeprinterfromapplications {
     my ($printer, $queue) = @_;
-    setcupslink ($printer);
-    return (printer::office::remove_printer_from_office('Star Office', $printer, $queue) &&
-	    printer::office::remove_printer_from_office('OpenOffice.Org', $printer, $queue) &&
-	    printer::gimp::removeprinterfrom($printer, $queue));
+    setcupslink($printer);
+    return printer::office::remove_printer_from_office('Star Office', $printer, $queue) &&
+	   printer::office::remove_printer_from_office('OpenOffice.Org', $printer, $queue) &&
+	   printer::gimp::removeprinterfrom($printer, $queue);
 }
 
 sub removelocalprintersfromapplications {
     my ($printer) = @_;
-    setcupslink ($printer);
+    setcupslink($printer);
     printer::office::remove_local_printers_from_office('Star Office', $printer);
     printer::office::remove_local_printers_from_office('OpenOffice.Org', $printer);
     printer::gimp::removelocalprintersfrom($printer);
diff --git a/perl-install/printer/office.pm b/perl-install/printer/office.pm
index 037d40601..d5be027cf 100644
--- a/perl-install/printer/office.pm
+++ b/perl-install/printer/office.pm
@@ -144,7 +144,7 @@ sub add_cups_remote_to_office {
 					       $configprefix,
 					       $configfilecontent);
 	    } else {
-		unlink ("$::prefix/etc/foomatic/$queue.ppd");
+		unlink "$::prefix/etc/foomatic/$queue.ppd";
 		return 0;
 	    }
 	    last if $suite eq 'Star Office';
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 57e57fe28..97f1f00d7 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -689,7 +689,7 @@ complete => sub {
 
     # Auto-detect printer model (works if host is an ethernet-connected
     # printer)
-    my $modelinfo = printer::detect::getSNMPModel ($remotehost);
+    my $modelinfo = printer::detect::getSNMPModel($remotehost);
     my $auto_hpoj;
     if ((defined($modelinfo)) &&
 	($modelinfo->{MANUFACTURER} ne "") &&
@@ -707,7 +707,7 @@ complete => sub {
 		  "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
 		  $printer->{currentqueue}{connect}, $auto_hpoj,
                   ({port => $printer->{currentqueue}{connect},
-                    val => $modelinfo}));
+                    val => $modelinfo }));
 
     1;
 }
@@ -1119,7 +1119,7 @@ sub setup_socket {
     # Auto-detect printer model
     my $modelinfo;
     if ($printer->{AUTODETECT}) {
-	$modelinfo = printer::detect::getSNMPModel ($remotehost);
+	$modelinfo = printer::detect::getSNMPModel($remotehost);
     }
     my $auto_hpoj;
     if ((defined($modelinfo)) &&
@@ -1206,7 +1206,7 @@ complete => sub {
 	# Auto-detect printer model (works if host is an ethernet-connected
 	# printer)
 	my $remotehost = $1;
-	my $modelinfo = printer::main::getSNMPModel ($remotehost);
+	my $modelinfo = printer::main::getSNMPModel($remotehost);
         my $auto_hpoj;
         if ((defined($modelinfo)) &&
             ($modelinfo->{MANUFACTURER} ne "") &&
@@ -1580,7 +1580,7 @@ sub get_db_entry {
 		$model =~ s/PS//;
 		$model =~ s/PostScript//;
 		$model =~ s/Series//;
-		for $key (keys %printer::main::thedb) {
+		foreach my $key (keys %printer::main::thedb) {
 		    if ((($::expert) && ($key =~ /^$make\|$model\|.*\(recommended\)$/)) ||
 			((!$::expert) && ($key =~ /^$make\|$model$/))) {
 			$printer->{DBENTRY} = $key;
@@ -1656,7 +1656,7 @@ sub choose_model {
 	$printer->{DBENTRY} = N("Raw printer (No driver)");
     }
     # Choose the printer/driver from the list
-    return ($printer->{DBENTRY} = $in->ask_from_treelist(N("Printer model selection"),
+    return($printer->{DBENTRY} = $in->ask_from_treelist(N("Printer model selection"),
 							 N("Which printer model do you have?") .
 							 N("
 
@@ -2058,8 +2058,8 @@ You should make sure that the page size and the ink type/printing mode (if avail
 			     }
 			 }
 		     }
-		     return (0);
-		 } );
+		     return 0;
+		 });
 	}
 	# Read out the user's choices and generate the appropriate command
 	# line arguments
@@ -2238,7 +2238,7 @@ It may take some time before the printer starts.\n");
 		and return 1;
 	}
     } else {
-	return ($::isWizard ? $res1 : 1);
+	return($::isWizard ? $res1 : 1);
     }
     return 2;
 }
@@ -2418,7 +2418,7 @@ sub copy_queues_from {
 	foreach (@oldqueues) {
 	    push (@queuesselected, 1);
 	    push (@queueentries, { text => $_, type => 'bool', 
-				   val => \$queuesselected[$#queuesselected] } );
+				   val => \$queuesselected[$#queuesselected] });
 	}
 	# LPRng and LPD use the same config files, therefore one sees the 
 	# queues of LPD when one uses LPRng and vice versa, but these queues