From 6b566f8adf1d4b8ea1ba8109325300f3676d6c47 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sat, 16 Feb 2019 18:59:50 +0000
Subject: [PATCH] scstadmin: Avoid shadowing the errorString declaration, part
 2

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7937 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm b/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
index b9c394438..6ed59b059 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
@@ -1730,6 +1730,7 @@ sub addDeviceGroupDevice {
 	my $self = shift;
 	my $group = shift;
 	my $device = shift;
+	my $dgroups;
 	my $errorString;
 
 	return SCST_C_DGRP_ADD_DEV_FAIL if (!defined($group) || !defined($device));
@@ -1769,8 +1770,7 @@ sub addDeviceGroupDevice {
 	return $rc if ($rc > 1);
 
 	# Check all device groups for this device
-	my ($dgroups, $errorString) = $self->deviceGroups();
-
+	($dgroups, $errorString) = $self->deviceGroups();
 	foreach my $dgroup (@{$dgroups}) {
 		my $devs;
 
@@ -3900,8 +3900,9 @@ sub handlerAttributes {
 	my $handler = shift;
 	my %attributes;
 	my $errorString;
+	my $a;
 
-	my ($a, $errorString) = devices($self, $handler);
+	($a, $errorString) = devices($self, $handler);
 	$attributes{'devices'}->{'value'} = $a;
 
 	my $hHandle = new IO::Handle;
@@ -4048,9 +4049,9 @@ sub devicesByHandler {
 	my $self = shift;
 	my $handler = shift;
 	my $errorString;
+	my $attributes;
 
-	my ($attributes, $errorString) = $self->handlerAttributes($handler);
-
+	($attributes, $errorString) = $self->handlerAttributes($handler);
 	if (!defined($attributes)) {
 		if ($self->handlerExists($handler) != TRUE) {
 			$errorString = "devicesByHandler(): Handler '$handler' is not available";