From 0c676b034dd818360845eb718d8d36ff22cf5af7 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sat, 16 Feb 2019 19:19:48 +0000 Subject: [PATCH] scstadmin: Avoid shadowing the errorString declaration, part 5 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7941 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scstadmin/scstadmin.sysfs/scstadmin | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin index 9f209097c..8de5a1814 100755 --- a/scstadmin/scstadmin.sysfs/scstadmin +++ b/scstadmin/scstadmin.sysfs/scstadmin @@ -5242,14 +5242,17 @@ sub clearLuns { sub clearDriverDynamicAttributes { my $driver = shift; + my $errorString; return TRUE if (!$SCST->driverIsVirtualCapable($driver)); print "\t-> Removing all dynamic attributes from driver '$driver': "; - my ($attributes, $errorString) = $SCST->driverAttributes($driver); - my ($dynamic, $errorString) = $SCST->driverDynamicAttributes($driver); + my $attributes; + my $dynamic; + ($attributes, $errorString) = $SCST->driverAttributes($driver); + ($dynamic, $errorString) = $SCST->driverDynamicAttributes($driver); foreach my $attribute (keys %{$attributes}) { if (defined($$dynamic{$attribute})) { if (defined($$attributes{$attribute}->{'keys'})) { @@ -5271,14 +5274,17 @@ sub clearDriverDynamicAttributes { sub clearTargetDynamicAttributes { my $driver = shift; my $target = shift; + my $errorString; return TRUE if (!$SCST->driverIsVirtualCapable($driver)); print "\t-> Removing all dynamic attributes from driver/target '$driver/$target': "; - my ($attributes, $errorString) = $SCST->targetAttributes($driver, $target); - my ($dynamic, $errorString) = $SCST->targetDynamicAttributes($driver); + my $attributes; + my $dynamic; + ($attributes, $errorString) = $SCST->targetAttributes($driver, $target); + ($dynamic, $errorString) = $SCST->targetDynamicAttributes($driver); foreach my $attribute (keys %{$attributes}) { if (defined($$dynamic{$attribute})) { if (defined($$attributes{$attribute}->{'keys'})) {