[Scst-svn] SF.net SVN: scst:[7941] trunk/scstadmin/scstadmin.sysfs/scstadmin

[<bva...@us...>]

Revision: 7941
          http://sourceforge.net/p/scst/svn/7941
Author:   bvassche
Date:     2019-02-16 19:19:48 +0000 (Sat, 16 Feb 2019)
Log Message:
-----------
scstadmin: Avoid shadowing the errorString declaration, part 5

Modified Paths:
--------------
    trunk/scstadmin/scstadmin.sysfs/scstadmin

Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin	2019-02-16 19:11:27 UTC (rev 7940)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin	2019-02-16 19:19:48 UTC (rev 7941)
@@ -5242,14 +5242,17 @@
 
 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 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'})) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.