summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install/Xconfig')
-rw-r--r--perl-install/Xconfig/card.pm4
-rw-r--r--perl-install/Xconfig/monitor.pm2
-rw-r--r--perl-install/Xconfig/parse.pm14
-rw-r--r--perl-install/Xconfig/resolution_and_depth.pm2
-rw-r--r--perl-install/Xconfig/test.pm2
-rw-r--r--perl-install/Xconfig/xfree3.pm2
6 files changed, 13 insertions, 13 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 79853c5b5..9b5b4ded7 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -137,7 +137,7 @@ sub probe() {
else { internal_error() }
$_->{VideoRam} = 4096 if $_->{Driver} eq 'i810';
- $_->{Options_xfree4}{UseFBDev} = undef if arch =~ /ppc/ && $_->{Driver} eq 'r128';
+ $_->{Options_xfree4}{UseFBDev} = undef if arch() =~ /ppc/ && $_->{Driver} eq 'r128';
$card;
} @c;
@@ -532,7 +532,7 @@ sub readCardsDB {
my ($file) = @_;
my ($card, %cards);
- my $F = common::openFileMaybeCompressed($file);
+ my $F = openFileMaybeCompressed($file);
my ($lineno, $cmd, $val) = 0;
my $fs = {
diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm
index 135e1865f..8038818cd 100644
--- a/perl-install/Xconfig/monitor.pm
+++ b/perl-install/Xconfig/monitor.pm
@@ -180,7 +180,7 @@ sub readMonitorsDB {
my ($file) = @_;
my @monitors;
- my $F = common::openFileMaybeCompressed($file);
+ my $F = openFileMaybeCompressed($file);
local $_;
my $lineno = 0; while (<$F>) {
$lineno++;
diff --git a/perl-install/Xconfig/parse.pm b/perl-install/Xconfig/parse.pm
index aefc2742a..0099b4666 100644
--- a/perl-install/Xconfig/parse.pm
+++ b/perl-install/Xconfig/parse.pm
@@ -148,13 +148,6 @@ my @want_string = qw(Identifier DeviceName VendorName ModelName BoardName Driver
@want_string = map { lc } @want_string;
sub from_raw {
- foreach my $e (@_) {
- ($e->{l}, my $l) = ({}, $e->{l});
- from_raw__rec($e, $_) foreach @$l;
-
- delete $e->{kind};
- }
-
sub from_raw__rec {
my ($current, $e) = @_;
if ($e->{l}) {
@@ -177,6 +170,13 @@ sub from_raw {
}
delete $e->{name};
}
+
+ foreach my $e (@_) {
+ ($e->{l}, my $l) = ({}, $e->{l});
+ from_raw__rec($e, $_) foreach @$l;
+
+ delete $e->{kind};
+ }
}
sub before_to_string {
diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm
index c39704d9a..daeac5806 100644
--- a/perl-install/Xconfig/resolution_and_depth.pm
+++ b/perl-install/Xconfig/resolution_and_depth.pm
@@ -260,7 +260,7 @@ sub choose_gtk {
$pixmap_mo,
gtkpack2(new Gtk::HBox(0,0),
create_packtable({ col_spacings => 5, row_spacings => 5 },
- [ $x_res_combo = new Gtk::Combo, new Gtk::Label("")],
+ [ $x_res_combo = new Gtk::Combo, new Gtk::Label("") ],
[ $depth_combo = new Gtk::Combo, gtkadd(gtkset_shadow_type(new Gtk::Frame, 'etched_out'), $pix_colors) ],
),
),
diff --git a/perl-install/Xconfig/test.pm b/perl-install/Xconfig/test.pm
index 8065eaacb..f7db6e4be 100644
--- a/perl-install/Xconfig/test.pm
+++ b/perl-install/Xconfig/test.pm
@@ -53,7 +53,7 @@ sub test {
$ENV{HOME} || $::isInstall or die q($HOME is unset, so I don't know where to put my temporary files);
my $f_err = "$::prefix$ENV{HOME}/tmp/.drakx.Xoutput";
my $pid;
- unless ($pid = fork) {
+ unless ($pid = fork()) {
system("xauth add :9 . `mcookie`");
open STDERR, ">$f_err";
chroot $::prefix if $::prefix;
diff --git a/perl-install/Xconfig/xfree3.pm b/perl-install/Xconfig/xfree3.pm
index 9b69b3cb6..afb890d91 100644
--- a/perl-install/Xconfig/xfree3.pm
+++ b/perl-install/Xconfig/xfree3.pm
@@ -101,7 +101,7 @@ sub get_device_section_fields {
sub default_ModeLine {
my ($raw_X) = @_;
- $raw_X->SUPER::default_ModeLine . our $default_ModeLine;
+ $raw_X->SUPER::default_ModeLine . (our $default_ModeLine);
}
sub new_device_sections {