From 87ee25a82bc6b17ff1d08eb5f21a1c149dc3a28a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 28 Sep 2004 02:25:23 +0000
Subject: - make printer::printerdrake::install_spooler() work with an optional
 $in - many functions now take $security (which used to be taken from $in
 during install) - fix some functions with empty prototype but still using a
 parameter - remove some unused variable - rename some $_foo vars to $foo
 since those vars are used - add some undef to some function calls to be
 minimally perl_checker compliant - perl_checker compliant optional parameters
 in start_spooler_on_boot(), install_spooler()

---
 perl-install/printer/main.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'perl-install/printer/main.pm')

diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index bcd0e162b..102d42100 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -273,7 +273,7 @@ sub read_configured_queues($) {
 	    eval join('', <$F>);
 	    close $F;
 	} else {
-	    my ($daemonless_cups, $remote_cups_server) =
+	    my ($_daemonless_cups, $remote_cups_server) =
 		printer::main::read_client_conf();
 	    $printer->{remote_cups_server} = $remote_cups_server;
 	}
@@ -1682,7 +1682,7 @@ sub ppd_devid_data {
     return $devidmake, $devidmodel;
 }
 
-sub poll_ppd_base() {
+sub poll_ppd_base {
     my ($printer) = @_;
     #- Before trying to poll the ppd database available to cups, we have 
     #- to make sure the file /etc/cups/ppds.dat is no more modified.
@@ -2332,10 +2332,8 @@ sub configure_hpoj {
 	    }
 	};
     }
-    my $devdata;
     foreach (@autodetected) {
 	$device eq $_->{port} or next;
-	$devdata = $_;
 	# $model is for the PTAL device name, so make sure that it is unique
 	# so in the case of the model name auto-detection having failed leave
 	# the port number or the host name as model name.
@@ -2625,7 +2623,7 @@ sub devicefound {
     return 0;
 }
 
-sub usbdevice() {
+sub usbdevice {
     my ($usbid) = @_;
     # Run "lsusb -vv¨ and search the given device to get its USB bus and
     # device numbers
-- 
cgit v1.2.1