135/snmp-info
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

P::C - don't declare variable in conditional statement

Browse Source
This commit is contained in:
Eric Miller
2008-07-09 02:46:37 +00:00
parent a153913d29
commit f436c9f69c
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Info/Layer3/AlteonAD.pm
View File

@@ -183,7 +183,8 @@ sub i_duplex {
$duplex = 'half' if $duplex =~ /half/i; $duplex = 'half' if $duplex =~ /half/i;
$duplex = 'full' if $duplex =~ /full/i; $duplex = 'full' if $duplex =~ /full/i;
my $idx = $if + $ip_max if (defined $ip_max); my $idx;
$idx = $if + $ip_max if (defined $ip_max);
$i_duplex{$idx}=$duplex; $i_duplex{$idx}=$duplex;
} }
@@ -217,7 +218,9 @@ sub i_duplex_admin {
$string = 'full' if ($fe_mode =~ /full/i and $fe_auto =~ /off/i); $string = 'full' if ($fe_mode =~ /full/i and $fe_auto =~ /off/i);
$string = 'auto' if $fe_auto =~ /on/i; $string = 'auto' if $fe_auto =~ /on/i;
} }
my $idx = $if + $ip_max if (defined $ip_max);
my $idx;
$idx = $if + $ip_max if (defined $ip_max);
$i_duplex_admin{$idx}=$string; $i_duplex_admin{$idx}=$string;
} }
@@ -234,7 +237,8 @@ sub i_name {
foreach my $iid (keys %$p_name){ foreach my $iid (keys %$p_name){
my $name = $p_name->{$iid}; my $name = $p_name->{$iid};
next unless defined $name; next unless defined $name;
my $idx = $iid + $ip_max if (defined $ip_max); my $idx;
$idx = $iid + $ip_max if (defined $ip_max);
$i_name{$idx} = $name; $i_name{$idx} = $name;
} }
return \%i_name; return \%i_name;
@@ -272,7 +276,8 @@ sub i_vlan {
my $ag_vlanid = $ag_vlans->{$if}; my $ag_vlanid = $ag_vlans->{$if};
next unless defined $ag_vlanid; next unless defined $ag_vlanid;
my $idx = $if + $ip_max if (defined $ip_max); my $idx;
$idx = $if + $ip_max if (defined $ip_max);
$i_vlan{$idx}=$ag_vlanid; $i_vlan{$idx}=$ag_vlanid;
} }
return \%i_vlan; return \%i_vlan;
@@ -291,7 +296,8 @@ sub i_vlan_membership {
# Convert portlist bit array to ifIndex array # Convert portlist bit array to ifIndex array
for (my $i = 0; $i <= scalar(@$portlist); $i++) { for (my $i = 0; $i <= scalar(@$portlist); $i++) {
my $idx = $i + $ip_max if (defined $ip_max); my $idx;
$idx = $i + $ip_max if (defined $ip_max);
push(@{$ret}, $idx) if (@$portlist[$i]); push(@{$ret}, $idx) if (@$portlist[$i]);
} }

12
Info/Layer3/BayRS.pm
View File

@@ -952,9 +952,11 @@ sub e_descr {
unless ($bp_id =~ /an|arn|asn/) { unless ($bp_id =~ /an|arn|asn/) {
$wf_e_descr{"$idx"."0000"} = 'Slot '.$idx; $wf_e_descr{"$idx"."0000"} = 'Slot '.$idx;
} }
my $mb_id = &SNMP::mapEnum('wfHwMotherBdIdOpt',$wf_mb->{$idx}) if $wf_mb->{$idx}; my $mb_id;
$mb_id = &SNMP::mapEnum('wfHwMotherBdIdOpt',$wf_mb->{$idx}) if $wf_mb->{$idx};
my $mb_mem = $wf_mb_mem->{$idx}; my $mb_mem = $wf_mb_mem->{$idx};
my $mod_id = &SNMP::mapEnum('wfHwModIdOpt',$wf_mod->{$idx})if $wf_mod->{$idx}; my $mod_id;
$mod_id = &SNMP::mapEnum('wfHwModIdOpt',$wf_mod->{$idx})if $wf_mod->{$idx};
# Processor # Processor
if ($mb_id) { if ($mb_id) {
if (ref($PROCID_MAP{$mb_id}) =~ /HASH/) { if (ref($PROCID_MAP{$mb_id}) =~ /HASH/) {
@@ -1102,13 +1104,15 @@ sub e_hwver {
foreach my $slot (@slots) { foreach my $slot (@slots) {
$index ++; $index ++;
next unless ($slot->{$idx}); next unless ($slot->{$idx});
my $mod = hex(join('','0x',map{sprintf "%02X", $_}unpack("C*",$slot->{$idx}))) if $slot->{$idx}; my $mod;
$mod = hex(join('','0x',map{sprintf "%02X", $_}unpack("C*",$slot->{$idx}))) if $slot->{$idx};
$wf_e_hwver{$index} = $mod if $mod; $wf_e_hwver{$index} = $mod if $mod;
} }
} }
foreach my $iid (keys %$wf_mm){ foreach my $iid (keys %$wf_mm){
my $index = join('',map { sprintf "%02d",$_ } split /\./, $iid); my $index = join('',map { sprintf "%02d",$_ } split /\./, $iid);
my $mod = hex(join('','0x',map{sprintf "%02X", $_}unpack("C*",$wf_mm->{$iid}))) if $wf_mm->{$iid}; my $mod;
$mod = hex(join('','0x',map{sprintf "%02X", $_}unpack("C*",$wf_mm->{$iid}))) if $wf_mm->{$iid};
$index = "$index"."00"; $index = "$index"."00";
$index ++; $index ++;
next unless ($wf_mm->{$iid}); next unless ($wf_mm->{$iid});