From 4781e491c32fdfe0dbe3cf97a8aca90040a9406b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 17 Apr 2003 11:34:32 +0000
Subject: new perl_checker compliance

---
 perl-install/standalone/diskdrake        | 14 +++++++++-----
 perl-install/standalone/draksec          |  6 +++---
 perl-install/standalone/drakupdate_fstab | 16 +++++++++-------
 3 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'perl-install/standalone')

diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 9026e67ae..171402c22 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -65,7 +65,7 @@ my $in = 'interactive'->vnew('su');
 
 if ($type eq 'fileshare') {
     require any;
-    any::fileshare_config($in);
+    any::fileshare_config($in, '');
     $in->exit(0);
 }
 
@@ -76,13 +76,13 @@ $SIG{__DIE__} = sub { my $m = chomp_($_[0]); log::l("ERROR: $m") };
 fs::get_raw_hds('', $all_hds);
 
 fs::get_info_from_fstab($all_hds, '');
-fs::merge_info_from_mtab([ fsedit::get_really_all_fstab($all_hds) ], '');
+fs::merge_info_from_mtab([ fsedit::get_really_all_fstab($all_hds) ]);
 
 $all_hds->{current_fstab} = fs::fstab_to_string($all_hds, '');
 
 if ($type eq 'hd') {
     require diskdrake::interactive;
-    diskdrake::interactive::main($in, $all_hds);
+    diskdrake::interactive::main($in, $all_hds, 0, '', '');
 } elsif ($type eq 'removable') {
     require diskdrake::removable;
     $para =~ s|^/dev/||;
@@ -94,10 +94,14 @@ if ($type eq 'hd') {
 	my $mntpoint = detect_devices::suggest_mount_point($raw_hd);
 	$raw_hd->{mntpoint} ||= find { !fsedit::has_mntpoint($_, $all_hds) } map { "/mnt/$mntpoint$_" } '', 2 .. 10;
 
-	my $use_supermount = 1;
+	my $useSupermount = 1;
 	require security::level;
 	require lang;
-	fs::set_default_options($raw_hd, 1, $use_supermount, security::level::get(), lang::fs_options(lang::read()));
+	fs::set_default_options($raw_hd, 
+				is_removable => 1, 
+				useSupermount => $useSupermount, 
+				security => security::level::get(), 
+				lang::fs_options(lang::read()));
     }
     diskdrake::removable::main($in, $all_hds, $raw_hd);
 } elsif ($type eq 'dav') {
diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec
index b84279c3a..6a08e4f8b 100755
--- a/perl-install/standalone/draksec
+++ b/perl-install/standalone/draksec
@@ -74,11 +74,11 @@ Security Administrator:
 }
 
 sub new_editable_combo {
-    my ($string_list, $default_value) = @_;
+    my ($string_list, $o_default_value) = @_;
     my $w = new Gtk2::Combo();
     $w->entry->set_editable(0);
     $w->set_popdown_strings(@$string_list) unless is_empty_array_ref $string_list;
-    $w->entry->set_text($default_value) if $default_value;
+    $w->entry->set_text($o_default_value) if $o_default_value;
     $w;
 }
 
@@ -155,7 +155,7 @@ foreach ([ 'network', N("Network Options") ], [ 'system', N("System Options") ])
                                                                                            my $entry;
                                                                                            my $default = $msec->get_function_default($i);
                                                                                            if (member($default, @all_choices)) {
-                                                                                               $values{$i} = new_editable_combo(member($default, @yesno_choices) ? \@yesno_choices : member($default, @alllocal_choices) ? \@alllocal_choices : ());
+                                                                                               $values{$i} = new_editable_combo(member($default, @yesno_choices) ? \@yesno_choices : if_(member($default, @alllocal_choices), \@alllocal_choices));
                                                                                                $entry = $values{$i}->entry;
                                                                                            } else {
                                                                                                $values{$i} = new Gtk2::Entry();
diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab
index 94f1a5d54..aee783cd6 100755
--- a/perl-install/standalone/drakupdate_fstab
+++ b/perl-install/standalone/drakupdate_fstab
@@ -79,11 +79,13 @@ sub device_name_to_entry {
 }
 
 sub set_options {
-    my ($part, $use_supermount) = @_;
-    my $security = security::level::get();
-    my ($iocharset, $codepage) = lang::fs_options(lang::read());
+    my ($part, $useSupermount) = @_;
 
-    fs::set_default_options($part, 1, $use_supermount, $security, $iocharset, $codepage);
+    fs::set_default_options($part, 
+			    is_removable => 1, 
+			    useSupermount => $useSupermount, 
+			    security => security::level::get(), 
+			    lang::fs_options(lang::read()));
 
     my ($options, $unknown) = fs::mount_options_unpack($part);
     $options->{kudzu} = 1 if !$no_flag;
@@ -128,15 +130,15 @@ sub main {
 	    print STDERR "Already in fstab\n" if $::testing;
 	    return;
 	}
-	my $use_supermount = 0; #- force non-supermount, supermount is too buggy
-	set_options($part, $use_supermount);
+	my $useSupermount = 0; #- force non-supermount, supermount is too buggy
+	set_options($part, $useSupermount);
 	set_mount_point($part, $fstab) or return;
 	
 	my ($line) = fs::prepare_write_fstab([$part]);
 	append_to_file($fstab_file, $line) if $line;
 
 	if ($::auto) {
-	    print $part->{mntpoint}, " ", $use_supermount ? 'supermount' : 'user', "\n";
+	    print $part->{mntpoint}, " ", $useSupermount ? 'supermount' : 'user', "\n";
 	}
     } else {
 	if (!@$existing_fstab_entries) {
-- 
cgit v1.2.1