mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 02:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

scstadmin: Initialize container variables explicitly

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7953 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-02-18 00:46:27 +00:00
parent a1b1a880af
commit b79fa94a27
1 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
scstadmin/scstadmin.sysfs/scstadmin
View File

@@ -1593,8 +1593,8 @@ sub writeConfiguration {
}
foreach my $handler (sort keys %{$CURRENT{'handler'}}) {
my $handler_buff;
my $handler_buff_nk;
my $handler_buff = "";
my $handler_buff_nk = "";
my $handler_attrs;
my $attributes;
@@ -1605,13 +1605,13 @@ sub writeConfiguration {
my $devices = $CURRENT{'handler'}->{$handler};
my $device_buff;
my $device_buff = "";
foreach my $device (sort @{$devices}) {
$device_buff .= "\tDEVICE $device";
my $attributes;
my $attribute_buff;
my $attribute_buff_nk;
my $attribute_buff = "";
my $attribute_buff_nk = "";
($attributes, $errorString) = $SCST->deviceAttributes($device);
$attribute_buff = serializeKeyAttr("\t\t", $attributes, $handler_attrs);
@@ -1652,11 +1652,11 @@ sub writeConfiguration {
}
foreach my $driver (sort keys %{$CURRENT{'assign'}}) {
my $driver_buff;
my $driver_buff = "";
my $drv_attrs;
my $drv_attr_buff;
my $drv_attr_buff_nk;
my $drv_attr_buff = "";
my $drv_attr_buff_nk = "";
($drv_attrs, $errorString) = $SCST->driverAttributes($driver);
$drv_attr_buff = serializeKeyAttr("\t", $drv_attrs);
@@ -1668,13 +1668,13 @@ sub writeConfiguration {
my $tgt_attrs;
($tgt_attrs, $errorString) = $SCST->targetCreateAttributes($driver);
my $target_buff;
my $target_buff = "";
foreach my $target (sort keys %{$targets}) {
$target_buff .= "\tTARGET $target";
my $attributes;
my $attribute_buff;
my $attribute_buff_nk;
my $attribute_buff = "";
my $attribute_buff_nk = "";
($attributes, $errorString) = $SCST->targetAttributes($driver, $target);
if (defined($$attributes{'hw_target'}) &&
@@ -1691,7 +1691,7 @@ sub writeConfiguration {
my $lun_attrs;
($lun_attrs, $errorString) = $SCST->lunCreateAttributes($driver, $target);
my $t_lun_buff;
my $t_lun_buff = "";
foreach my $lun (sort numerically keys %{$luns}) {
my $lun_dev = $$luns{$lun};
@@ -1733,7 +1733,7 @@ sub writeConfiguration {
my $groups = $CURRENT{'assign'}->{$driver}->{$target}->{'GROUP'};
my $group_buff;
my $group_buff = "";
foreach my $group (sort keys %{$groups}) {
my $lun_attrs;
my $ini_attrs;
@@ -1744,7 +1744,7 @@ sub writeConfiguration {
my $luns = $CURRENT{'assign'}->{$driver}->{$target}->{'GROUP'}->{$group}->{'LUN'};
my $lun_buff;
my $lun_buff = "";
foreach my $lun (sort numerically keys %{$luns}) {
my $lun_dev = $$luns{$lun};
@@ -1779,7 +1779,7 @@ sub writeConfiguration {
my $inits = $CURRENT{'assign'}->{$driver}->{$target}->{'GROUP'}->{$group}->{'INITIATORS'};
my $init_buff;
my $init_buff = "";
foreach my $init (sort @{$inits}) {
$init_buff .= "\n\t\t\tINITIATOR " . escapeMeta($init);
@@ -1897,10 +1897,10 @@ sub writeConfiguration {
}
foreach my $dgroup (sort keys %{$CURRENT{'dgroups'}}) {
my $dgroup_buff;
my $dgroup_buff = "";
my $dgroup_attrs;
my $dgrp_attr_buff;
my $dgrp_attr_buff_nk;
my $dgrp_attr_buff = "";
my $dgrp_attr_buff_nk = "";
($dgroup_attrs, $errorString) = $SCST->deviceGroupAttributes($dgroup);
$dgrp_attr_buff = serializeKeyAttr("\t", $dgroup_attrs);
@@ -1908,7 +1908,7 @@ sub writeConfiguration {
$dgrp_attr_buff .= "\n" if ($dgrp_attr_buff);
$dgrp_attr_buff_nk .= "\n" if ($dgrp_attr_buff_nk);
my $devices_buff;
my $devices_buff = "";
my $devices = $CURRENT{'dgroups'}->{$dgroup}->{'devices'};
@@ -1920,14 +1920,14 @@ sub writeConfiguration {
my $tgroups = $CURRENT{'dgroups'}->{$dgroup}->{'tgroups'};
my $tgroup_buff;
my $tgroup_buff = "";
foreach my $tgroup (sort keys %{$tgroups}) {
$tgroup_buff .= "\tTARGET_GROUP $tgroup";
my $attributes;
my $attribute_buff;
my $attribute_buff_nk;
my $attribute_buff = "";
my $attribute_buff_nk = "";
($attributes, $errorString) = $SCST->targetGroupAttributes($dgroup, $tgroup);
$attribute_buff .= serializeKeyAttr("\t\t", $attributes);
@@ -1937,7 +1937,7 @@ sub writeConfiguration {
my $tgts = $CURRENT{'dgroups'}->{$dgroup}->{'tgroups'}->{$tgroup}->{'targets'};
my $tgt_buff;
my $tgt_buff = "";
foreach my $tgt (@{$tgts}) {
$tgt_buff .= "\t\tTARGET $tgt";
@@ -3051,7 +3051,7 @@ sub listHandlers {
my ($handlers, $errorString) = $SCST->handlers();
my $l_handler;
my $l_handler = 0;
foreach my $handler (@{$handlers}) {
$l_handler = length($handler) if ($l_handler < length($handler));
}
@@ -3077,9 +3077,8 @@ sub listHandler {
my $got_handler = ($handler ne '');
my ($handlers, $errorString) = $SCST->handlers();
my $l_device;
my $l_handler;
my $l_device = 0;
my $l_handler = 0;
foreach my $_handler (@{$handlers}) {
$handler = $_handler if (!$got_handler);
@@ -3166,7 +3165,7 @@ sub listDeviceGroups {
my ($groups, $errorString) = $SCST->deviceGroups();
my $l_group;
my $l_group = 0;
foreach my $group (@{$groups}) {
$l_group = length($group) if ($l_group < length($group));
}
@@ -3193,7 +3192,7 @@ sub listDeviceGroup {
my ($devices, $errorString) = $SCST->deviceGroupDevices($group);
my $l_device;
my $l_device = 0;
foreach my $device (@{$devices}) {
$l_device = length($device) if ($l_device < length($device));
}
@@ -3213,7 +3212,7 @@ sub listDeviceGroup {
my ($tgroups, $errorString) = $SCST->targetGroups($group);
my $l_tgroup;
my $l_tgroup = 0;
foreach my $tgroup (@{$tgroups}) {
$l_tgroup = length($tgroup) if ($l_tgroup < length($tgroup));
}
@@ -3244,7 +3243,7 @@ sub listTargetGroups {
my ($tgroups, $errorString) = $SCST->targetGroups($group);
my $l_tgroup;
my $l_tgroup = 0;
foreach my $tgroup (@{$tgroups}) {
$l_tgroup = length($tgroup) if ($l_tgroup < length($tgroup));
}
@@ -3275,7 +3274,7 @@ sub listTargetGroup {
my ($targets, $errorString) = $SCST->targetGroupTargets($group, $tgroup);
my $l_tgt;
my $l_tgt = 0;
foreach my $tgt (@{$targets}) {
$l_tgt = length($tgt) if ($l_tgt < length($tgt));
}
@@ -3304,7 +3303,7 @@ sub listDeviceGroupDevices {
my ($devices, $errorString) = $SCST->deviceGroupDevices($group);
my $l_device;
my $l_device = 0;
foreach my $device (@{$devices}) {
$l_device = length($device) if ($l_device < length($device));
}
@@ -3332,7 +3331,7 @@ sub listDrivers {
my ($drivers, $errorString) = $SCST->drivers();
my $l_driver;
my $l_driver = 0;
foreach my $driver (@{$drivers}) {
$l_driver = length($driver) if ($l_driver < length($driver));
}
@@ -3362,9 +3361,8 @@ sub listTargets {
my ($drivers, $errorString) = $SCST->drivers();
my $l_driver;
my $l_target;
my $l_driver = 0;
my $l_target = 0;
foreach my $_driver (@{$drivers}) {
$driver = $_driver if (!$got_driver);
@@ -3472,13 +3470,12 @@ sub listGroup {
}
if ((keys %{$luns}) || ($#{$initiators} > -1)) {
my $l_device;
my $l_initiator;
my $l_device = 0;
foreach my $lun (keys %{$luns}) {
$l_device = length($$luns{$lun}) if (length($$luns{$lun}) > $l_device);
}
my $l_initiator = 0;
foreach my $initiator (@{$initiators}) {
$l_initiator = length($initiator) if (length($initiator) > $l_initiator);
}