Changeset 55

Timestamp:

Jul 24, 2009, 1:35:52 AM (16 years ago)

Author:

g7moreau

Message:

• Suppress some perlcritic warning level 2
  • remove the last unless test
  • add /m to regex
  • suppress double-sigil dereference

File:

• trunk/klask (modified) (13 diffs)

trunk/klask

@@ -165 +165 @@
 
 #   my $cmdarping  = `arping -c 1 -w 1 -rR $param 2>/dev/null`;
-   if ( not $param_ip_or_host =~ m/^\d+ \. \d+ \. \d+ \. \d+$/x ) {
-      $param_ip_or_host =~ s/ \. .* //x;
+   if ( not $param_ip_or_host =~ m/^\d+ \. \d+ \. \d+ \. \d+$/xms ) {
+      $param_ip_or_host =~ s/ \. .* //xms;
       }
 
@@ -216 +216 @@
    #$ret{hostname_fq}  = $param_ip_or_host if not defined $1 and $ret{hostname_fq} eq 'unknow';
 
-   unless ($ret{mac_address} eq 'unknow') {
+   if ($ret{mac_address} ne 'unknow') {
       my @paquets = ();
-      foreach ( split m/ : /x, $ret{mac_address} ) {
+      foreach ( split m/ : /xms, $ret{mac_address} ) {
          my @chars = split m//xms, uc("00$_");
          push @paquets, "$chars[-2]$chars[-1]";
@@ -233 +233 @@
 
    for my $sw_kind (keys %SWITCH_KIND) {
-      next if not $sw_snmp_description =~ m/$SWITCH_KIND{$sw_kind}->{match}/x;
+      next if not $sw_snmp_description =~ m/$SWITCH_KIND{$sw_kind}->{match}/xms;
 
       return $SWITCH_KIND{$sw_kind}->{model};
@@ -445 +445 @@
       my @line  = @{$KLASK_CFG->{network}{$net}{'ip-subnet'}};
       for my $cmd (@line) {
-         for my $method (keys %$cmd){
+         for my $method (keys %{$cmd}){
             $cidrlist->add_any($cmd->{$method}) if $method eq 'add';
             }
@@ -455 +455 @@
    for my $cidr ($cidrlist->list()) {
       my $net = new NetAddr::IP $cidr;
-      for my $ip (@$net) {
-         $ip =~ s{ /32 }{}x;
+      for my $ip (@{$net}) {
+         $ip =~ s{ /32 }{}xms;
          push @res,  $ip;
          }
@@ -599 +599 @@
 
    my $number_of_computer = get_list_ip(@network); # + 1;
-   my $size_of_database   = keys %$computerdb;
+   my $size_of_database   = keys %{$computerdb};
       $size_of_database   = 1 if $size_of_database == 0;
    my $i = 0;
@@ -747 +747 @@
 
    my $dirdb = $KLASK_DB_FILE;
-      $dirdb =~ s{ / [^/]* $}{}x;
+      $dirdb =~ s{ / [^/]* $}{}xms;
    mkdir "$dirdb", 0755 unless -d "$dirdb";
    YAML::Syck::DumpFile("$KLASK_DB_FILE", $computerdb);
@@ -775 +775 @@
 
    my $dirdb = $KLASK_DB_FILE;
-      $dirdb =~ s{ / [^/]* $}{}x;
+      $dirdb =~ s{ / [^/]* $}{}xms;
    mkdir "$dirdb", 0755 unless -d "$dirdb";
    YAML::Syck::DumpFile("$KLASK_DB_FILE", $computerdb);
@@ -810 +810 @@
 
    LOOP_ON_IP_ADDRESS:
-   foreach my $ip (Net::Netmask::sort_by_ip_address(keys %$computerdb)) {
+   foreach my $ip (Net::Netmask::sort_by_ip_address(keys %{$computerdb})) {
 
 #      next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{hostname_fq} eq 'unknow';
@@ -874 +874 @@
    my %mac_count = ();
    LOOP_ON_IP_ADDRESS:
-   foreach my $ip (keys %$computerdb) {
+   foreach my $ip (keys %{$computerdb}) {
 
       # to be improve in the future
@@ -885 +885 @@
 
    LOOP_ON_IP_ADDRESS:
-   foreach my $ip (Net::Netmask::sort_by_ip_address(keys %$computerdb)) {
+   foreach my $ip (Net::Netmask::sort_by_ip_address(keys %{$computerdb})) {
 
       # to be improve in the future
@@ -907 +907 @@
       my $mac_sort = sprintf "%04i-%s", 9999 - $mac_count{$computerdb->{$ip}{mac_address}}, $computerdb->{$ip}{mac_address};
 
-      $computerdb->{$ip}{hostname_fq} = 'unknow' if $computerdb->{$ip}{hostname_fq} =~ m/^ \d+ \. \d+ \. \d+ \. \d+ $/x;
+      $computerdb->{$ip}{hostname_fq} = 'unknow' if $computerdb->{$ip}{hostname_fq} =~ m/^ \d+ \. \d+ \. \d+ \. \d+ $/xms;
       my ( $host_short ) = split m/ \. /xms, $computerdb->{$ip}{hostname_fq};
 
@@ -1044 +1044 @@
 
    LOOP_ON_IP_ADDRESS:
-   foreach my $ip (Net::Netmask::sort_by_ip_address(keys %$computerdb)) {
+   foreach my $ip (Net::Netmask::sort_by_ip_address(keys %{$computerdb})) {
 
       next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{hostname_fq} eq ($computerdb->{$ip}{switch_hostname} || $computerdb->{$ip}{switch_description}); # switch on himself !