PBP always return via an explicit return

This commit is contained in:
Eric Miller
2008-07-09 01:37:19 +00:00
parent 84bc3f5269
commit a70a895a29
15 changed files with 22 additions and 19 deletions

View File

@@ -139,7 +139,7 @@ sub qb_fw_mac {
my($fdb_id, $mac) = _qb_fdbtable_index($idx); my($fdb_id, $mac) = _qb_fdbtable_index($idx);
$qb_fw_mac->{$idx} = $mac; $qb_fw_mac->{$idx} = $mac;
} }
$qb_fw_mac; return $qb_fw_mac;
} }
sub qb_i_vlan_t { sub qb_i_vlan_t {

View File

@@ -110,6 +110,8 @@ sub vendor {
return 'cisco' if ($descr =~ /(catalyst|cisco|ios)/i); return 'cisco' if ($descr =~ /(catalyst|cisco|ios)/i);
return 'allied' if ($descr =~ /allied/i); return 'allied' if ($descr =~ /allied/i);
return 'asante' if ($descr =~ /asante/i); return 'asante' if ($descr =~ /asante/i);
return 'unknown';
} }

View File

@@ -267,7 +267,8 @@ sub munge_cd11_txrate {
my $txrates = shift; my $txrates = shift;
my @rates = unpack("C*", $txrates); my @rates = unpack("C*", $txrates);
map {$_ *= 0.5} @rates; map {$_ *= 0.5} @rates;
\@rates;
return \@rates;
} }
# cd11 INDEX # cd11 INDEX

View File

@@ -88,8 +88,8 @@ $VERSION = '1.09';
%SNMP::Info::CDP::MUNGE, %SNMP::Info::CDP::MUNGE,
); );
sub bulkwalk_no { 1; } sub bulkwalk_no { return 1; }
sub cisco_comm_indexing { 1; } sub cisco_comm_indexing { return 1; }
sub vendor { sub vendor {
return 'cisco'; return 'cisco';

View File

@@ -93,7 +93,7 @@ sub vendor {
} }
sub cisco_comm_indexing { sub cisco_comm_indexing {
1; return 1;
} }
sub i_duplex { sub i_duplex {

View File

@@ -141,7 +141,7 @@ sub bp_index {
} }
sub cisco_comm_indexing { sub cisco_comm_indexing {
1; return 1;
} }
sub interfaces { sub interfaces {

View File

@@ -204,7 +204,7 @@ sub vendor {
# this hangs on a edgeiron24g # this hangs on a edgeiron24g
# TODO: check by devicetype and deferr to SUPER if not bad device # TODO: check by devicetype and deferr to SUPER if not bad device
sub stp_p_state { undef; } sub stp_p_state { return undef; }
1; 1;
__END__ __END__

View File

@@ -273,6 +273,8 @@ sub vendor {
return 'cisco' if ($descr =~ /(cisco|\bios\b)/i); return 'cisco' if ($descr =~ /(cisco|\bios\b)/i);
return 'foundry' if ($descr =~ /foundry/i); return 'foundry' if ($descr =~ /foundry/i);
return 'unknown';
} }

View File

@@ -211,12 +211,12 @@ sub set_i_duplex_admin {
return $c3550->set_p_duplex($duplexes{$duplex}, $iid); return $c3550->set_p_duplex($duplexes{$duplex}, $iid);
} }
else { else {
$c3550->SUPER::set_i_duplex_admin; return $c3550->SUPER::set_i_duplex_admin;
} }
} }
sub cisco_comm_indexing { sub cisco_comm_indexing {
1; return 1;
} }
1; 1;

View File

@@ -119,10 +119,10 @@ sub fan {
$s = ", "; $s = ", ";
} }
return if ($s eq ""); return if ($s eq "");
$ret; return $ret;
} }
sub cisco_comm_indexing { 1; } sub cisco_comm_indexing { return 1; }
1; 1;
__END__ __END__

View File

@@ -108,7 +108,7 @@ sub vendor {
return 'cisco'; return 'cisco';
} }
sub cisco_comm_indexing { 1; } sub cisco_comm_indexing { return 1; }
# Newer versions use the ETHERLIKE-MIB to report operational duplex. # Newer versions use the ETHERLIKE-MIB to report operational duplex.
@@ -188,7 +188,7 @@ sub set_i_duplex_admin {
return $c6500->set_p_duplex($duplexes{$duplex}, $iid); return $c6500->set_p_duplex($duplexes{$duplex}, $iid);
} }
else { else {
$c6500->SUPER::set_i_duplex_admin; return $c6500->SUPER::set_i_duplex_admin;
} }
} }

View File

@@ -122,7 +122,7 @@ sub i_vlan {
} }
} }
} }
\%i_vlan; return \%i_vlan;
} }
1; 1;

View File

@@ -223,7 +223,7 @@ sub fan {
$s = ", "; $s = ", ";
} }
return if ($s eq ""); return if ($s eq "");
$ret; return $ret;
} }
# Newer versions of the Extreme firmware have vendor-specific tables # Newer versions of the Extreme firmware have vendor-specific tables
@@ -291,7 +291,7 @@ sub _if2tag {
$if2tag{$if} = -$global_id->{$if} if ($if2tag{$if} == -1 && defined($global_id->{$if})); $if2tag{$if} = -$global_id->{$if} if ($if2tag{$if} == -1 && defined($global_id->{$if}));
} }
} }
\%if2tag; return \%if2tag;
} }
# No partial support in v_name or v_index, because the obivous partial # No partial support in v_name or v_index, because the obivous partial

View File

@@ -117,7 +117,7 @@ sub i_vlan {
} }
} }
} }
\%i_vlan; return \%i_vlan;
} }
1; 1;

View File

@@ -71,8 +71,6 @@ $VERSION = '1.09';
# Method OverRides # Method OverRides
sub bulkwalk_no { 1; }
sub model { sub model {
my $n1600 = shift; my $n1600 = shift;
my $id = $n1600->id(); my $id = $n1600->id();