mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-08-18 13:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

scstadmin: Avoid shadowing the errorString declaration, part 2

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7937 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-02-16 18:59:50 +00:00
parent 2a84df8445
commit 6b566f8adf
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
+6 -5
View File
@@ -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";