perl_checker adaptations

3 files changed, 52 insertions, 52 deletions

diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index d1bbc5bed..610db6426 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -22,19 +22,19 @@ sub unknown {
 
 our @tree =
     (
-     ["FLOPPY", "Floppy", "floppy.png", "", \&detect_devices::floppies, 0 ],
-     ["HARDDISK", "Disk", "harddisk.png", "$sbindir/diskdrake", \&detect_devices::hds, 1 ],
-     ["CDROM", "CDROM", "cd.png", "", sub { grep { !(detect_devices::isBurner($_) || detect_devices::isDvdDrive($_)) } &detect_devices::cdroms }, 0 ],
-     ["BURNER", "CD/DVD burners", "cd.png", "", \&detect_devices::burners(), 0 ],
-     ["DVDROM", "DVD-ROM", "cd.png", "", sub { grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms() }, 0 ],
-     ["TAPE", "Tape", "tape.png", "", \&detect_devices::tapes, 0 ],
-     ["VIDEO", "Videocard", "video.png", "$sbindir/XFdrake",  sub { grep { $_->{driver} =~ /^(Card|Server):/ || $_->{media_type} =~ /DISPLAY_VGA/ } @devices }, 1 ],
-     ["TV", "Tvcard", "tv.png", "/usr/bin/XawTV", sub { grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} eq 'PCI' || $_->{driver} eq 'usbvision' } @devices }, 0 ],     
-     ["MULTIMEDIA_OTHER", "Other MultiMedia devices", "multimedia.png", "", sub { grep { $_->{media_type} =~ /MULTIMEDIA_OTHER/ } @devices }, 0 ],
-     ["AUDIO", "Soundcard", "sound.png", "$sbindir/draksound", sub { grep { $_->{media_type} =~ /MULTIMEDIA_AUDIO/ } @devices }, 0 ],
-     ["WEBCAM", "Webcam", "webcam.png", "", sub { grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} ne 'PCI' } @devices }, 0 ],
-     ["CPU", "Processors", "cpu.png", "", sub { detect_devices::getCPUs() }, 0 ],
-     ["ETHERNET", "Ethernetcard", "hw_network.png", "$sbindir/drakconnect", sub {
+     [ "FLOPPY", "Floppy", "floppy.png", "", \&detect_devices::floppies, 0 ],
+     [ "HARDDISK", "Disk", "harddisk.png", "$sbindir/diskdrake", \&detect_devices::hds, 1 ],
+     [ "CDROM", "CDROM", "cd.png", "", sub { grep { !(detect_devices::isBurner($_) || detect_devices::isDvdDrive($_)) } &detect_devices::cdroms }, 0 ],
+     [ "BURNER", "CD/DVD burners", "cd.png", "", \&detect_devices::burners(), 0 ],
+     [ "DVDROM", "DVD-ROM", "cd.png", "", sub { grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms() }, 0 ],
+     [ "TAPE", "Tape", "tape.png", "", \&detect_devices::tapes, 0 ],
+     [ "VIDEO", "Videocard", "video.png", "$sbindir/XFdrake",  sub { grep { $_->{driver} =~ /^(Card|Server):/ || $_->{media_type} =~ /DISPLAY_VGA/ } @devices }, 1 ],
+     [ "TV", "Tvcard", "tv.png", "/usr/bin/XawTV", sub { grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} eq 'PCI' || $_->{driver} eq 'usbvision' } @devices }, 0 ],     
+     [ "MULTIMEDIA_OTHER", "Other MultiMedia devices", "multimedia.png", "", sub { grep { $_->{media_type} =~ /MULTIMEDIA_OTHER/ } @devices }, 0 ],
+     [ "AUDIO", "Soundcard", "sound.png", "$sbindir/draksound", sub { grep { $_->{media_type} =~ /MULTIMEDIA_AUDIO/ } @devices }, 0 ],
+     [ "WEBCAM", "Webcam", "webcam.png", "", sub { grep { $_->{media_type} =~ /MULTIMEDIA_VIDEO/ && $_->{bus} ne 'PCI' } @devices }, 0 ],
+     [ "CPU", "Processors", "cpu.png", "", sub { detect_devices::getCPUs() }, 0 ],
+     [ "ETHERNET", "Ethernetcard", "hw_network.png", "$sbindir/drakconnect", sub {
          #- generic NIC detection for USB seems broken (class, subclass, 
          #- protocol report are not accurate) so I'll need to verify against
          #- known drivers :-(
@@ -42,25 +42,25 @@ our @tree =
          # should be taken from detect_devices.pm or modules.pm. it's identical
          
          grep { $_->{media_type} =~ /^NETWORK/ || member($_->{driver}, @usbnet) || $_->{type} eq 'network' } @devices }, 1 ],
-     ["MODEM", "Modem", "modem.png", "", sub { detect_devices::getModem() }, 0 ],
-     ["BRIDGE", "Bridge(s)", "memory.png", "", sub { grep { $_->{media_type} =~ /BRIDGE/ } @devices }, 0 ],
-     ["UNKNOWN", "Unknown/Others", "unknown.png", "", \&unknown, 0 ],
+     [ "MODEM", "Modem", "modem.png", "", sub { detect_devices::getModem() }, 0 ],
+     [ "BRIDGE", "Bridge(s)", "memory.png", "", sub { grep { $_->{media_type} =~ /BRIDGE/ } @devices }, 0 ],
+     [ "UNKNOWN", "Unknown/Others", "unknown.png", "", \&unknown, 0 ],
 
-     ["PRINTER", "Printer", "hw_printer.png", "$sbindir/printerdrake", sub { 
+     [ "PRINTER", "Printer", "hw_printer.png", "$sbindir/printerdrake", sub { 
          require printer::detect; printer::detect::detect() }, 0 ],
-     ["SCANNER", "Scanner", "scanner.png", "$sbindir/scannerdrake", sub { 
+     [ "SCANNER", "Scanner", "scanner.png", "$sbindir/scannerdrake", sub { 
          require scanner; scanner::detect() }, 0 ],
-     ["MOUSE", "Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { 
+     [ "MOUSE", "Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { 
          require mouse;
          require modules;
          modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf';
          &mouse::detect() }, 1 ],
-     ["JOYSTICK", "Joystick", "joystick.png", "", sub {}, 0 ],
+     [ "JOYSTICK", "Joystick", "joystick.png", "", sub {}, 0 ],
 
-     ["ATA_STORAGE", "(E)IDE/ATA controllers", "ide_hd.png", "", sub { grep { $_->{media_type} =~ /STORAGE_(IDE|OTHER)/ } @devices }, 0 ],
-     ["SCSI_CONTROLLER", "SCSI controllers", "scsi.png", "", sub { grep { $_->{media_type} =~ /STORAGE_SCSI/ } @devices }, 0 ],
-     ["USB_CONTROLLER", "USB controllers", "usb.png", "", sub { grep { $_->{media_type} =~ /SERIAL_USB/ } @devices }, 0 ],
-     ["SMB_CONTROLLER", "SMBus controllers", "usb.png", "", sub { grep { $_->{media_type} =~ /SERIAL_SMBUS/ } @devices }, 0 ],
+     [ "ATA_STORAGE", "(E)IDE/ATA controllers", "ide_hd.png", "", sub { grep { $_->{media_type} =~ /STORAGE_(IDE|OTHER)/ } @devices }, 0 ],
+     [ "SCSI_CONTROLLER", "SCSI controllers", "scsi.png", "", sub { grep { $_->{media_type} =~ /STORAGE_SCSI/ } @devices }, 0 ],
+     [ "USB_CONTROLLER", "USB controllers", "usb.png", "", sub { grep { $_->{media_type} =~ /SERIAL_USB/ } @devices }, 0 ],
+     [ "SMB_CONTROLLER", "SMBus controllers", "usb.png", "", sub { grep { $_->{media_type} =~ /SERIAL_SMBUS/ } @devices }, 0 ],
      );
 
 
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 8a20842dd..250ae75cc 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -51,7 +51,7 @@ my %alsa2oss =
      "snd-es1938"  => [ "esssolo1" ],
      "snd-es1968"  => [ "maestro" ], # isa
      "snd-es968"   => [ "unknown" ],
-     "snd-fm801"   => [ "unknown"],
+     "snd-fm801"   => [ "unknown" ],
      "snd-gusclassic" => [ "gus" ], # isa
      "snd-gusextreme" => [ "gus" ], # isa
      "snd-gusmax"  => [ "gus" ],    # isa
@@ -99,7 +99,7 @@ my %oss2alsa =
      "es1371"  => [ "snd-ens1371" ],
      "esssolo1" => [ "snd-es1938" ],
      "gus"     => ["snd-interwave", "snd-gusclassic", "snd-gusmax", "snd-gusextreme"],
-     "i810_audio" => [ "snd-intel8x0"],
+     "i810_audio" => [ "snd-intel8x0" ],
      "mad16"   => [ "snd-opti93x" ],
      "maestro" => [ "snd-es1968" ],
      "maestro3" => [ "snd-maestro3" ],
@@ -107,7 +107,7 @@ my %oss2alsa =
      "msnd_pinnacle" => [ "unknown" ],
      "msnd_pinnacle" =>  [ "unknown" ],
      "nm256_audio" => [ "snd-nm256" ],
-     "nvaudio" => [ "snd-intel8x0"],
+     "nvaudio" => [ "snd-intel8x0" ],
      "opl3"    => [ "snd-opl3sa2" ],
      "opl3sa"  => [ "snd-opl3sa2" ],
      "opl3sa2" => [ "snd-opl3sa2" ],
diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm
index 25bb5ac74..a0b503734 100644
--- a/perl-install/harddrake/ui.pm
+++ b/perl-install/harddrake/ui.pm
@@ -12,57 +12,57 @@ use interactive;
 my %fields = 
     (
      "alternative_drivers" => [ N("Alternative drivers"),
-                                N("the list of alternative drivers for this sound card")],
+                                N("the list of alternative drivers for this sound card") ],
      "bus" => 
      [ N("Bus"), 
-       N("this is the physical bus on which the device is plugged (eg: PCI, USB, ...)")],
+       N("this is the physical bus on which the device is plugged (eg: PCI, USB, ...)") ],
      "channel" => [N("Channel"), N("EIDE/SCSI channel")],
 	 "bogomips" => [N("Bogomips"), N("The GNU/Linux kernel needs to do run a calculation loop at boot time
 	 to initialize a timer counter.  Its result is stored as bogomips as a way to \"benchmark\" the cpu.")],
      "bus_id" => 
      [ N("Bus identification"), 
-       N("- PCI and USB devices: this list the vendor, device, subvendor and subdevice PCI/USB ids")],
+       N("- PCI and USB devices: this list the vendor, device, subvendor and subdevice PCI/USB ids") ],
      "bus_location" => 
      [ N("Location on the bus"), 
        N("- pci devices: this gives the PCI slot, device and function of this card
 - eide devices: the device is either a slave or a master device
-- scsi devices: the scsi bus and the scsi device ids")],
+- scsi devices: the scsi bus and the scsi device ids") ],
      "cache size" => [ N("Cache size"), N("Size of the (second level) cpu cache") ],
      "coma_bug" => [ N("Coma bug:"), N("Does this cpu has Cyrix 6x86 Coma bug ?") ],
-     "cpu family" => [ N("Cpuid family"), N("Family of the cpu (eg: 6 for i686 class)")],
-     "cpuid level" => [ N("Cpuid level"), N("Information level that one can obtain through the cpuid instruction")],
-     "cpu MHz" => [ N("Frequency (MHz)"), N("The cpu frequency in Mhz (Mega herz which in first approximation may be coarsely assimilated to number of instructions the cpu is able to execute per second)")],
-     "description" => [ N("Description"), N("This field describe the device")],
+     "cpu family" => [ N("Cpuid family"), N("Family of the cpu (eg: 6 for i686 class)") ],
+     "cpuid level" => [ N("Cpuid level"), N("Information level that one can obtain through the cpuid instruction") ],
+     "cpu MHz" => [ N("Frequency (MHz)"), N("The cpu frequency in Mhz (Mega herz which in first approximation may be coarsely assimilated to number of instructions the cpu is able to execute per second)") ],
+     "description" => [ N("Description"), N("This field describe the device") ],
      "device" => [ N("Old device file"),
-                   N("old static device name used in dev package")],
+                   N("old static device name used in dev package") ],
      "devfs_device" => [ N("New devfs device"),  
-                         N("new dinamic device name generated by incore kernel devfs")],
-     "driver" => [ N("Module"), N("the module of the GNU/Linux kernel that handle that device")],
-     "flags" => [ N("Flags"), N("CPU flags reported by the kernel")],
+                         N("new dinamic device name generated by incore kernel devfs") ],
+     "driver" => [ N("Module"), N("the module of the GNU/Linux kernel that handle that device") ],
+     "flags" => [ N("Flags"), N("CPU flags reported by the kernel") ],
      "fdiv_bug" => [ N("Fdiv bug"), 
                      N("Early Intel Pentium chips manufactured have a bug in their floating point processor which did not achieve the attended precision when performing a Floating point DIVision (FDIV)") ],
 
 
-     "fpu" => [ N("Is FPU present"), N("yes means the processor has an arithmetic coprocessor")],
-     "fpu_exception" => [ N("Does FPU have an irq vector"), N("yes means the arithmetic coprocessor has an exception vector attached")],
+     "fpu" => [ N("Is FPU present"), N("yes means the processor has an arithmetic coprocessor") ],
+     "fpu_exception" => [ N("Does FPU have an irq vector"), N("yes means the arithmetic coprocessor has an exception vector attached") ],
      "f00f_bug" => [N("F00f bug"), N("Early pentium were buggy and freezed when decoding the F00F bytecode")],
      "hlt_bug" => [ N("Halt bug"), 
                     N("Some of the early i486DX-100 chips cannot reliably return to operating mode after the \"halt\" instruction is used") ],
 
      "info" => [N("Floppy format"), N("Format of floppies the drive accept")],
      "level" => [N("Level"), N("Sub generation of the cpu")],
-     "media_type" => [ N("Media class"), N("class of hardware device")],
+     "media_type" => [ N("Media class"), N("class of hardware device") ],
      "Model" => [N("Model"), N("hard disk model")],
      "model" => [N("Model"), N("Generation of the cpu (eg: 8 for PentiumIII, ...)")],
      "model name" => [N("Model name"), N("Official vendor name of the cpu")],
-     "nbuttons" => [ N("Number of buttons"), "the number of buttons the mouse have"],
-     "name" => [ N("Name"), "the name of the cpu"],
+     "nbuttons" => [ N("Number of buttons"), "the number of buttons the mouse have" ],
+     "name" => [ N("Name"), "the name of the cpu" ],
      "port" => [N("Port"), N("network printer port")],
-     "processor" => [ N("Processor ID"), N("the number of the processor")],
+     "processor" => [ N("Processor ID"), N("the number of the processor") ],
      "stepping" => [ N("Model stepping"), N("Stepping of the cpu (sub model (generation) number)") ],
-     "type" => [ N("Type"), N("The type of bus on which the mouse is connected")],
-     "Vendor" => [ N("Vendor"), N("the vendor name of the device")],
-     "vendor_id" => [ N("Vendor"), N("the vendor name of the processor")]
+     "type" => [ N("Type"), N("The type of bus on which the mouse is connected") ],
+     "Vendor" => [ N("Vendor"), N("the vendor name of the device") ],
+     "vendor_id" => [ N("Vendor"), N("the vendor name of the processor") ]
      );
 
 
@@ -71,7 +71,7 @@ my ($in, %IDs, $pid, $w);
 my (%options, %check_boxes);
 my $conffile = "/etc/sysconfig/harddrake2/ui.conf";
 
-my ($modem_check_box, $printer_check_box,  $current_device);
+my ($modem_check_box, $printer_check_box, $current_device);
 
 my @menu_items = 
     (
@@ -95,7 +95,7 @@ my @menu_items =
              }
      },
      {   path => N("/_Help").N("/_Report Bug"),
-         callback => sub { unless (fork) { exec("drakbug --report harddrake2 &") } } },
+         callback => sub { unless (fork()) { exec("drakbug --report harddrake2 &") } } },
      {   path => N("/_Help").N("/_About..."), 
          callback => sub {
              $in->ask_warn(N("About Harddrake"), 
@@ -153,7 +153,7 @@ sub detect {
             $_->{device} = '/dev/'.$_->{device} if exists $_->{device};
             push @$devices_list, $_;
         }
-        push @class_tree, [ $devices_list, [ [$title], 5], $icon, [ 0, ($title =~ /Unknown/ ? 0 : 1) ], $title, $configurator ];
+        push @class_tree, [ $devices_list, [ [$title], 5 ], $icon, [ 0, ($title =~ /Unknown/ ? 0 : 1) ], $title, $configurator ];
     }
     @class_tree;
 }
@@ -257,7 +257,7 @@ sub new {
             my $custom_id = $_->{custom_id};
             delete $_->{custom_id};
             $custom_id .= ' ' while exists($tree->{data}{$custom_id});
-            my $hw_item = $tree->insert_node($hw_class_tree, undef, [$custom_id ], 5, (undef) x 4, 1, 0);
+            my $hw_item = $tree->insert_node($hw_class_tree, undef, [$custom_id], 5, (undef) x 4, 1, 0);
             $tree->{data}{$custom_id} = $_;
             $tree->{configurator}{$custom_id} = $configurator;
         }