summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2012-06-21 18:00:53 -0700
committerStephen Hemminger <shemminger@vyatta.com>2012-06-21 18:00:53 -0700
commit79c2254d4daa9cf0831478dc0a8e3ba5c7400c15 (patch)
tree496877fc0a052658a41fd8605e49bcc6fade69c3
parent8c690feda90f5bd20934a48bd346e6d8e54100b4 (diff)
downloadvyatta-cfg-79c2254d4daa9cf0831478dc0a8e3ba5c7400c15.tar.gz
vyatta-cfg-79c2254d4daa9cf0831478dc0a8e3ba5c7400c15.zip
Remove trailing whitespace
Extra whitespace causes git to complain when integrating patches.
-rwxr-xr-xlib/Vyatta/Interface.pm18
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/Vyatta/Interface.pm b/lib/Vyatta/Interface.pm
index 8449ccb..f504148 100755
--- a/lib/Vyatta/Interface.pm
+++ b/lib/Vyatta/Interface.pm
@@ -101,22 +101,22 @@ sub is_uniq_address {
my $ip = pop(@_);
my @cfgifs = get_all_cfg_interfaces();
my $config = new Vyatta::Config;
- my %addr_hash = ();
- foreach my $intf ( @cfgifs ) {
+ my %addr_hash = ();
+ foreach my $intf ( @cfgifs ) {
my $addrs = [ ];
my $path = "$intf->{'path'}";
if ($path =~ /openvpn/) {
- $addrs = [$config->listNodes("$path local-address")];
+ $addrs = [$config->listNodes("$path local-address")];
} else {
$addrs = [$config->returnValues("$path address")];
}
foreach my $addr ( @{$addrs} ){
if (not exists $addr_hash{$addr}){
$addr_hash{$addr} = { _intf => [ $intf->{name} ] };
- } else {
- $addr_hash{$addr}->{_intf} =
+ } else {
+ $addr_hash{$addr}->{_intf} =
[ @{$addr_hash{$addr}->{_intf}}, $intf->{name} ];
- }
+ }
}
}
return ((scalar @{$addr_hash{$ip}->{_intf}}) <= 1);
@@ -170,7 +170,7 @@ sub get_all_cfg_interfaces {
}
}
}
-
+
# now special cases for pppo*/adsl
for my $eth ($cfg->$vfunc('interfaces ethernet')) {
for my $ep ($cfg->$vfunc("interfaces ethernet $eth pppoe")) {
@@ -273,7 +273,7 @@ sub new {
if ( $name =~ m/(\w+)\.(\d+)v(\d+)/ ){
$dev = $1;
- $vif = $2;
+ $vif = $2;
$vrid = $3;
} elsif ( $name =~ m/(\w+)v(\d+)/ ) {
$dev = $1;
@@ -301,7 +301,7 @@ sub new {
$path .= " $vifpath $vif" if $vif;
# add the vif 1 to multilink paths since they don't have vif interfaces
# denoted by <if>.<vif> and only allow 1 vif to be set
- $path .= " vif 1" if ($dev =~ m/^ml[\d]+$/);
+ $path .= " vif 1" if ($dev =~ m/^ml[\d]+$/);
$path .= " vrrp vrrp-group $vrid interface" if $vrid;
$type = 'vrrp' if $vrid;