Menu
▾
▴
scst-svn
|
From: <bva...@us...> - 2019-02-16 19:09:01
|
Revision: 7939
http://sourceforge.net/p/scst/svn/7939
Author: bvassche
Date: 2019-02-16 19:08:50 +0000 (Sat, 16 Feb 2019)
Log Message:
-----------
scstadmin: Avoid shadowing the errorString declaration, part 4
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-16 19:03:39 UTC (rev 7938)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-16 19:08:50 UTC (rev 7939)
@@ -2988,7 +2988,8 @@
# Todo - check return code
- my ($drivers, $errorString) = $SCST->drivers();
+ my $drivers;
+ ($drivers, $errorString) = $SCST->drivers();
foreach my $driver (@{$drivers}) {
my $targets;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2019-02-16 19:11:33
|
Revision: 7940
http://sourceforge.net/p/scst/svn/7940
Author: bvassche
Date: 2019-02-16 19:11:27 +0000 (Sat, 16 Feb 2019)
Log Message:
-----------
scstadmin: Rearrange addVirtualTarget()
This patch does not change any functionality.
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-16 19:08:50 UTC (rev 7939)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-16 19:11:27 UTC (rev 7940)
@@ -3011,10 +3011,11 @@
my $driver = shift;
my $target = shift;
my $attributes = shift;
+ my $errorString;
+ my $targets;
# Enable all hardware targets before creating virtual ones
- my ($targets, $errorString) = $SCST->targets($driver);
-
+ ($targets, $errorString) = $SCST->targets($driver);
foreach my $_target (@{$targets}) {
my $attributes;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2019-02-16 19:19:55
|
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.
|
|
From: <bva...@us...> - 2019-02-17 19:27:05
|
Revision: 7942
http://sourceforge.net/p/scst/svn/7942
Author: bvassche
Date: 2019-02-17 19:26:50 +0000 (Sun, 17 Feb 2019)
Log Message:
-----------
scstadmin: Fix an ALUA command line option error message
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-16 19:19:48 UTC (rev 7941)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-17 19:26:50 UTC (rev 7942)
@@ -707,7 +707,7 @@
if ((defined($addTargetGroupTarget) || defined($removeTargetGroupTarget)) &&
(($deviceGroup eq '') || ($targetGroup eq ''))) {
- print "Please specify -dev_group and -tgt_group with -add_tgrp_init/-rem_tgrp_init.\n";
+ print "Please specify -dev_group and -tgt_group with -add_tgrp_tgt/-rem_tgrp_tgt.\n";
exit 1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2019-02-17 19:33:50
|
Revision: 7944
http://sourceforge.net/p/scst/svn/7944
Author: bvassche
Date: 2019-02-17 19:33:44 +0000 (Sun, 17 Feb 2019)
Log Message:
-----------
scstadmin: Use defined() instead of !... eq '' to check whether arguments have been specified
This patch does not change any functionality.
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-17 19:29:46 UTC (rev 7943)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-17 19:33:44 UTC (rev 7944)
@@ -536,143 +536,143 @@
exit 1;
}
- if (defined($listTargetGroup) && ($deviceGroup eq '')) {
+ if (defined($listTargetGroup) && !defined($deviceGroup)) {
print "Please specify -dev_group with -list_tgrp.\n";
exit 1;
}
- if (defined($listTargetAttr) && ($driver eq '')) {
+ if (defined($listTargetAttr) && !defined($driver)) {
print "Please specify -driver with -list_tgt_attr.\n";
exit 1;
}
- if (defined($listGroupAttr) && (($driver eq '') || ($target eq ''))) {
+ if (defined($listGroupAttr) && (!defined($driver) || !defined($target))) {
print "Please specify -driver, -target and group with -list_grp_attr.\n";
exit 1;
}
- if (defined($listLunAttr) && (($driver eq '') || ($target eq ''))) {
+ if (defined($listLunAttr) && (!defined($driver) || !defined($target))) {
print "Please specify -driver and -target with -list_lun_attr.\n";
exit 1;
}
- if (defined($listInitiatorAttr) && (($driver eq '') || ($target eq '') || ($group eq ''))) {
+ if (defined($listInitiatorAttr) && (!defined($driver) || !defined($target) || !defined($group))) {
print "Please specify -driver, -target and -group with -list_init_attr.\n";
exit 1;
}
- if (defined($listTargetGroupAttr) && ($deviceGroup eq '')) {
+ if (defined($listTargetGroupAttr) && !defined($deviceGroup)) {
print "Please specify -dev_group with -list_tgrp_attr.\n";
exit 1;
}
- if (defined($listTargetGroupTargetAttr) && (($deviceGroup eq '') || ($targetGroup eq ''))) {
+ if (defined($listTargetGroupTargetAttr) && (!defined($deviceGroup) || !defined($targetGroup))) {
print "Please specify -dev_group and -tgt_group with -list_ttgt_attr.\n";
exit 1;
}
- if (defined($setScstAttr) && ($attributes eq '')) {
+ if (defined($setScstAttr) && !defined($attributes)) {
print "Please specify -attributes with -set_scst_attr.\n";
exit 1;
}
- if (defined($setHandlerAttr) && ($attributes eq '')) {
+ if (defined($setHandlerAttr) && !defined($attributes)) {
print "Please specify -attributes with -set_hnd_attr.\n";
exit 1;
}
- if (defined($setDeviceAttr) && ($attributes eq '')) {
+ if (defined($setDeviceAttr) && !defined($attributes)) {
print "Please specify -attributes with -set_dev_attr.\n";
exit 1;
}
- if (defined($setDeviceGroupAttr) && ($attributes eq '')) {
+ if (defined($setDeviceGroupAttr) && !defined($attributes)) {
print "Please specify -attributes with -set_dgrp_attr.\n";
exit 1;
}
- if (defined($setTargetGroupAttr) && (($deviceGroup eq '') || ($attributes eq ''))) {
+ if (defined($setTargetGroupAttr) && (!defined($deviceGroup) || !defined($attributes))) {
print "Please specify -dev_group and -attributes with -set_tgrp_attr.\n";
exit 1;
}
- if (defined($setTargetGroupTargetAttr) && (($deviceGroup eq '') || ($targetGroup eq '') || ($attributes eq ''))) {
+ if (defined($setTargetGroupTargetAttr) && (!defined($deviceGroup) || !defined($targetGroup) || !defined($attributes))) {
print "Please specify -dev_group -tgt_group and -attributes with -set_ttgt_attr.\n";
exit 1;
}
- if (defined($setDriverAttr) && ($attributes eq '')) {
+ if (defined($setDriverAttr) && !defined($attributes)) {
print "Please specify -attributes with -set_drv_attr.\n";
exit 1;
}
- if (defined($setTargetAttr) && (($driver eq '') || ($attributes eq ''))) {
+ if (defined($setTargetAttr) && (!defined($driver) || !defined($attributes))) {
print "Please specify -driver and -attributes with -set_tgt_attr.\n";
exit 1;
}
- if (defined($setGroupAttr) && (($driver eq '') || ($target eq '') || ($attributes eq ''))) {
+ if (defined($setGroupAttr) && (!defined($driver) || !defined($target) || !defined($attributes))) {
print "Please specify -driver -target and -attributes with -set_grp_attr.\n";
exit 1;
}
if (defined($setLunAttr) &&
- (($driver eq '') || ($target eq '') || ($attributes eq ''))) {
+ (!defined($driver) || !defined($target) || !defined($attributes))) {
print "Please specify -driver -target -group and -attributes with -set_lun_attr.\n";
exit 1;
}
if (defined($setInitiatorAttr) &&
- (($driver eq '') || ($target eq '') || ($group eq '') || ($attributes eq ''))) {
+ (!defined($driver) || !defined($target) || !defined($group) || !defined($attributes))) {
print "Please specify -driver -target -group and -attributes with -set_init_attr.\n";
exit 1;
}
- if (defined($addDriverAttr) && ($attributes eq '')) {
+ if (defined($addDriverAttr) && !defined($attributes)) {
print "Please specify -attributes with -add_drv_attr.\n";
exit 1;
}
if (defined($addTargetAttr) &&
- (($driver eq '') || ($attributes eq ''))) {
+ (!defined($driver) || !defined($attributes))) {
print "Please specify -driver and -attributes with -add_tgt_attr.\n";
exit 1;
}
- if (defined($remDriverAttr) && ($attributes eq '')) {
+ if (defined($remDriverAttr) && !defined($attributes)) {
print "Please specify -attributes with -rem_drv_attr.\n";
exit 1;
}
if (defined($remTargetAttr) &&
- (($driver eq '') || ($attributes eq ''))) {
+ (!defined($driver) || !defined($attributes))) {
print "Please specify -driver and -attributes with -rem_tgt_attr.\n";
exit 1;
}
- if ((defined($openDev) || defined($closeDev)) && ($handler eq '')) {
+ if ((defined($openDev) || defined($closeDev)) && !defined($handler)) {
print "Please specify -handler with -open_dev/-close_dev.\n";
exit 1;
}
- if (defined($addTarget) && ($driver eq '')) {
+ if (defined($addTarget) && !defined($driver)) {
print "Please specify -driver with -add_target.\n";
exit 1;
}
- if (defined($removeTarget) && ($driver eq '')) {
+ if (defined($removeTarget) && !defined($driver)) {
print "Please specify -driver with -rem_target.\n";
exit 1;
}
if ((defined($addGroup) || defined($removeGroup)) &&
- (($driver eq '') || ($target eq ''))) {
+ (!defined($driver) || !defined($target))) {
print "Please specify -driver and -target with -add_group/-rem_group.\n";
exit 1;
}
if ((defined($addInitiator) || defined($removeInitiator) || defined($clearInitiators)) &&
- (($target eq '') || ($driver eq '') || ($group eq ''))) {
+ (!defined($target) || !defined($driver) || !defined($group))) {
print "Please specify -driver -target and -group with ".
"-add_init/-rem_init/-clear_inits.\n";
exit 1;
@@ -679,34 +679,34 @@
}
if (defined($moveInitiator) &&
- (($driver eq '') || ($target eq '') || ($group eq '') || ($to eq ''))) {
+ (!defined($driver) || !defined($target) || !defined($group) || !defined($to))) {
print "Please specify -driver -target -group and -to with -move_init.\n";
exit 1;
}
if ((defined($addLun) || defined($replaceLun)) &&
- (($driver eq '') || ($target eq '') || ($device eq ''))) {
+ (!defined($driver) || !defined($target) || !defined($device))) {
print "Please specify -driver -target and -device with -add_lun/-replace_lun.\n";
exit 1;
}
- if ((defined($clearLuns) || defined($removeLun)) && (($driver eq '') || ($target eq ''))) {
+ if ((defined($clearLuns) || defined($removeLun)) && (!defined($driver) || !defined($target))) {
print "Please specify -driver and -target with -rem_lun/-clear_luns.\n";
exit 1;
}
- if ((defined($addDevGroupDevice) || defined($removeDevGroupDevice)) && ($deviceGroup eq '')) {
+ if ((defined($addDevGroupDevice) || defined($removeDevGroupDevice)) && !defined($deviceGroup)) {
print "Please specify -dev_group with -add_dgrp_dev/-rem_dgrp_dev.\n";
exit 1;
}
- if ((defined($addTargetGroup) || defined($removeTargetGroup)) && ($deviceGroup eq '')) {
+ if ((defined($addTargetGroup) || defined($removeTargetGroup)) && !defined($deviceGroup)) {
print "Please specify -dev_group with -add_tgrp/-rem_tgrp.\n";
exit 1;
}
if ((defined($addTargetGroupTarget) || defined($removeTargetGroupTarget)) &&
- (($deviceGroup eq '') || ($targetGroup eq ''))) {
+ (!defined($deviceGroup) || !defined($targetGroup))) {
print "Please specify -dev_group and -tgt_group with -add_tgrp_tgt/-rem_tgrp_tgt.\n";
exit 1;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2019-02-17 22:09:05
|
Revision: 7947
http://sourceforge.net/p/scst/svn/7947
Author: bvassche
Date: 2019-02-17 22:08:58 +0000 (Sun, 17 Feb 2019)
Log Message:
-----------
scstadmin: Restrict a source code line to 80 columns
This patch does not change any functionality.
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-17 22:07:35 UTC (rev 7946)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-17 22:08:58 UTC (rev 7947)
@@ -3671,8 +3671,8 @@
}
}
- printf("\t%-*s %-*s %-*s %-*s\n", $l_attr, 'Attribute', $l_value,
- 'Value', 9, 'Writable', 3, 'KEY');
+ printf("\t%-*s %-*s %-*s %-*s\n", $l_attr, 'Attribute',
+ $l_value, 'Value', 9, 'Writable', 3, 'KEY');
print "\t";
for (my $x = 0; $x < ($l_attr + $l_value + 27); $x++) {
print "-";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2019-02-18 00:41:54
|
Revision: 7952
http://sourceforge.net/p/scst/svn/7952
Author: bvassche
Date: 2019-02-18 00:41:48 +0000 (Mon, 18 Feb 2019)
Log Message:
-----------
scstadmin: Remove a superfluous declaration
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-18 00:40:23 UTC (rev 7951)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-18 00:41:48 UTC (rev 7952)
@@ -831,8 +831,6 @@
}
sub main {
- my $rc = 0;
-
STDOUT->autoflush(1);
# We need to run as root
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2019-02-18 00:46:35
|
Revision: 7953
http://sourceforge.net/p/scst/svn/7953
Author: bvassche
Date: 2019-02-18 00:46:27 +0000 (Mon, 18 Feb 2019)
Log Message:
-----------
scstadmin: Initialize container variables explicitly
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-18 00:41:48 UTC (rev 7952)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-18 00:46:27 UTC (rev 7953)
@@ -1593,8 +1593,8 @@
}
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 @@
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 @@
}
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
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 @@
$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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
}
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);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2019-02-18 01:30:21
|
Revision: 7955
http://sourceforge.net/p/scst/svn/7955
Author: bvassche
Date: 2019-02-18 01:30:13 +0000 (Mon, 18 Feb 2019)
Log Message:
-----------
scstadmin: Check $answer before using it
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-18 01:29:40 UTC (rev 7954)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-18 01:30:13 UTC (rev 7955)
@@ -5929,7 +5929,8 @@
"are you sure you wish to continue (y/[n]) ? ";
my $answer = <STDIN>;
- if (($answer =~ /^y$/i) || ($answer =~ /^yes$/i)) {
+ if (defined($answer) &&
+ (($answer =~ /^y$/i) || ($answer =~ /^yes$/i))) {
return FALSE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2019-02-18 01:38:23
|
Revision: 7956
http://sourceforge.net/p/scst/svn/7956
Author: bvassche
Date: 2019-02-18 01:38:14 +0000 (Mon, 18 Feb 2019)
Log Message:
-----------
scstadmin: Fix Perl warnings
Modify those constructs that trigger warnings with 'use warnings'. This
patch does not modify any functionality.
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-18 01:30:13 UTC (rev 7955)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-18 01:38:14 UTC (rev 7956)
@@ -1466,7 +1466,7 @@
sub escapeMeta {
my $value = shift;
- $value =~ s/([\\\#])/\\\1/g;
+ $value =~ s/([\\\#])/\\$1/g;
if ($value =~ / /) {
$value = "\"$value\"";
}
@@ -1548,10 +1548,11 @@
foreach my $handler (keys %{$CURRENT{'handler'}}) {
my $ha;
($ha, $errorString) = $SCST->handlerAttributes($handler);
- next if ($ha->{'mgmt'} !~ 'echo "add_device H:C:I:L"');
+ next if (defined($ha->{'mgmt'}) &&
+ $ha->{'mgmt'} !~ 'echo "add_device H:C:I:L"');
my @devs = @{$CURRENT{'handler'}->{$handler}};
for my $i (0 .. $#devs) {
- if ($dev eq @devs[$i]) {
+ if ($dev eq $devs[$i]) {
$pt = TRUE;
last;
}
@@ -3074,7 +3075,7 @@
my $handler = shift;
my %toprint;
- my $got_handler = ($handler ne '');
+ my $got_handler = defined($handler);
my ($handlers, $errorString) = $SCST->handlers();
my $l_device = 0;
@@ -3189,10 +3190,11 @@
sub listDeviceGroup {
my $group = shift;
+ my $errorString;
+ my $devices;
+ my $l_device = 0;
- my ($devices, $errorString) = $SCST->deviceGroupDevices($group);
-
- my $l_device = 0;
+ ($devices, $errorString) = $SCST->deviceGroupDevices($group);
foreach my $device (@{$devices}) {
$l_device = length($device) if ($l_device < length($device));
}
@@ -3210,9 +3212,10 @@
print "\t$device\n";
}
- my ($tgroups, $errorString) = $SCST->targetGroups($group);
+ my $tgroups;
+ my $l_tgroup = 0;
- my $l_tgroup = 0;
+ ($tgroups, $errorString) = $SCST->targetGroups($group);
foreach my $tgroup (@{$tgroups}) {
$l_tgroup = length($tgroup) if ($l_tgroup < length($tgroup));
}
@@ -3357,7 +3360,7 @@
return listGroups($driver, $target, undef) if (($target ne '') && ($driver ne ''));
- my $got_driver = ($driver ne '');
+ my $got_driver = defined($driver);
my ($drivers, $errorString) = $SCST->drivers();
@@ -3464,7 +3467,7 @@
my $errorString;
($luns, $errorString) = $SCST->luns($driver, $target, $group) if (!$luns);
- if (($initiators eq '') && ($group ne '')) {
+ if (($initiators eq '') && defined($group)) {
($initiators, $errorString) = $SCST->initiators($driver, $target, $group);
return TRUE if issueWarning($errorString);
}
@@ -5450,7 +5453,7 @@
}
}
- $line =~ s/\\(.)/\1/g;
+ $line =~ s/\\(.)/$1/g;
$buffer .= $line;
}
@@ -5489,8 +5492,11 @@
if ($char eq "\n") {
my %empty;
- parseLine($line, \%hash, \%empty);
- $line = undef;
+
+ if ($line) {
+ parseLine($line, \%hash, \%empty);
+ $line = undef;
+ }
} else {
$line .= $char;
}
@@ -5513,9 +5519,9 @@
push @elements, defined($1) ? $1:$3;
}
- my $attribute = @elements[0];
- my $value = @elements[1];
- my $value2 = @elements[2];
+ my $attribute = $elements[0];
+ my $value = $elements[1];
+ my $value2 = $elements[2];
if (defined($attribute) && defined($value) && defined($value2)) {
$$hash{$attribute}->{$value}->{$value2} = $child;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2019-02-18 01:45:52
|
Revision: 7958
http://sourceforge.net/p/scst/svn/7958
Author: bvassche
Date: 2019-02-18 01:45:42 +0000 (Mon, 18 Feb 2019)
Log Message:
-----------
scstadmin: Avoid triggering Perl warnings
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-18 01:40:37 UTC (rev 7957)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-18 01:45:42 UTC (rev 7958)
@@ -3467,7 +3467,7 @@
my $errorString;
($luns, $errorString) = $SCST->luns($driver, $target, $group) if (!$luns);
- if (($initiators eq '') && defined($group)) {
+ if (!defined($initiators) && defined($group)) {
($initiators, $errorString) = $SCST->initiators($driver, $target, $group);
return TRUE if issueWarning($errorString);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2019-02-18 01:51:45
|
Revision: 7960
http://sourceforge.net/p/scst/svn/7960
Author: bvassche
Date: 2019-02-18 01:51:36 +0000 (Mon, 18 Feb 2019)
Log Message:
-----------
scstadmin: Make $Version a local variable
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-18 01:49:44 UTC (rev 7959)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-02-18 01:51:36 UTC (rev 7960)
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-$Version = 'SCST Configurator v3.3.0-pre1';
+my $Version = 'SCST Configurator v3.3.0-pre1';
# Configures SCST
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2019-04-08 02:16:49
|
Revision: 8171
http://sourceforge.net/p/scst/svn/8171
Author: bvassche
Date: 2019-04-08 02:16:46 +0000 (Mon, 08 Apr 2019)
Log Message:
-----------
scstadmin: Avoid that Perl complains about undefined values for write-only attributes
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-04-07 18:19:12 UTC (rev 8170)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-04-08 02:16:46 UTC (rev 8171)
@@ -5881,7 +5881,11 @@
}
} else {
my $value = $$attributes{$attribute}->{'value'};
- $cache{$attribute}->{$value} = FALSE;
+ # Write-only attributes (e.g. abort_isp) do not have
+ # a value.
+ if (defined($value)) {
+ $cache{$attribute}->{$value} = FALSE;
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2019-12-04 05:00:25
|
Revision: 8680
http://sourceforge.net/p/scst/svn/8680
Author: bvassche
Date: 2019-12-04 05:00:24 +0000 (Wed, 04 Dec 2019)
Log Message:
-----------
scstadmin: Bump version number
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-12-04 04:55:30 UTC (rev 8679)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2019-12-04 05:00:24 UTC (rev 8680)
@@ -3,7 +3,7 @@
use strict;
use warnings;
-my $Version = 'SCST Configurator v3.3.0-pre1';
+my $Version = 'SCST Configurator v3.4.0';
# Configures SCST
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2020-05-13 17:24:37
|
Revision: 8905
http://sourceforge.net/p/scst/svn/8905
Author: bvassche
Date: 2020-05-13 17:24:35 +0000 (Wed, 13 May 2020)
Log Message:
-----------
scstadmin: Improve robustness
Instead of only interpreting the empty string as "no argument passed", also
consider 'undef' as "no argument passed".
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2020-05-13 17:23:14 UTC (rev 8904)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2020-05-13 17:24:35 UTC (rev 8905)
@@ -1497,7 +1497,7 @@
foreach my $key (keys %{$$attributes{$attribute}->{'keys'}}) {
my $value =
$$attributes{$attribute}->{'keys'}->{$key}->{'value'};
- push (@values, $value) if ($value ne '');
+ push (@values, $value) if ($value);
}
foreach my $value (sort @values) {
$result .= "$prefix$attribute " . escapeMeta($value) . "\n";
@@ -1532,7 +1532,7 @@
&& $attribute ne 'enabled'
&& $attribute ne 'hw_target') {
my $value = $$attributes{$attribute}->{'value'};
- if ($value ne '') {
+ if ($value) {
$result .= "$prefix$attribute " . escapeMeta($value) . "\n";
}
}
@@ -3140,7 +3140,7 @@
my $device = shift;
my $nonkey = shift;
- return listDevice($device, $nonkey) if ($device ne '');
+ return listDevice($device, $nonkey) if ($device);
return listHandler();
}
@@ -3164,7 +3164,7 @@
my $group = shift;
my $showall = shift;
- return listDeviceGroup($group) if ($group ne '');
+ return listDeviceGroup($group) if ($group);
my ($groups, $errorString) = $SCST->deviceGroups();
@@ -3244,7 +3244,7 @@
my $indent = shift;
return listDeviceGroups(undef, TRUE) if ($group eq '');
- return listTargetGroup($group, $tgroup) if ($tgroup ne '');
+ return listTargetGroup($group, $tgroup) if ($tgroup);
my ($tgroups, $errorString) = $SCST->targetGroups($group);
@@ -3304,7 +3304,7 @@
my $group = shift;
my $device = shift;
- return listDevice($device) if ($device ne '');
+ return listDevice($device) if ($device);
my ($devices, $errorString) = $SCST->deviceGroupDevices($group);
@@ -3332,7 +3332,7 @@
sub listDrivers {
my $driver = shift;
- return listTargets($driver, undef) if ($driver ne '');
+ return listTargets($driver, undef) if ($driver);
my ($drivers, $errorString) = $SCST->drivers();
@@ -3360,7 +3360,7 @@
my $target = shift;
my %toprint;
- return listGroups($driver, $target, undef) if (($target ne '') && ($driver ne ''));
+ return listGroups($driver, $target, undef) if ($target and $driver);
my $got_driver = defined($driver);
@@ -3539,7 +3539,7 @@
my $group = shift;
my $found = FALSE;
- if (($group ne '') && ($driver ne '') && ($target ne '')) {
+ if ($group and $driver and $target) {
return listGroup($driver, $target, $group);
}
@@ -3948,7 +3948,7 @@
return TRUE if issueWarning($errorString);
if (!scalar(keys %{$attributes})) {
- if ($group ne '') {
+ if ($group) {
print "No such driver/target/group/lun '$driver/$target/$group/$lun' found.\n";
} else {
print "No such driver/target/lun '$driver/$target/$lun' found.\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2020-05-14 20:45:28
|
Revision: 8915
http://sourceforge.net/p/scst/svn/8915
Author: bvassche
Date: 2020-05-14 20:45:26 +0000 (Thu, 14 May 2020)
Log Message:
-----------
scstadmin: Fix -resync_dev
Fix the following failure:
# scstadmin -resync_dev volume01
Collecting current configuration: done.
-> Making requested changes.
-> WARNING: Device 'volume01' lacks the settable attribute 'resync_size', ignoring.
-> Done.
All done.
This patch fixes a regression that was introduced by r8171 (commit
aedcfc5997f1 ("scstadmin: Avoid that Perl complains about undefined values
for write-only attributes") # v3.4.
Reported-by: Marc Smith <msm...@gm...>
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2020-05-14 16:40:05 UTC (rev 8914)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2020-05-14 20:45:26 UTC (rev 8915)
@@ -5883,9 +5883,8 @@
my $value = $$attributes{$attribute}->{'value'};
# Write-only attributes (e.g. abort_isp) do not have
# a value.
- if (defined($value)) {
- $cache{$attribute}->{$value} = FALSE;
- }
+ $value = "" if (!defined($value));
+ $cache{$attribute}->{$value} = FALSE;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bva...@us...> - 2021-06-18 04:45:40
|
Revision: 9440
http://sourceforge.net/p/scst/svn/9440
Author: bvassche
Date: 2021-06-18 04:45:40 +0000 (Fri, 18 Jun 2021)
Log Message:
-----------
scstadmin: Fix a bug in the code for forcibly applying a configuration
Pass the -force option from ... to removeGroup().
Signed-off-by: YuFan Chen <wiz...@gm...>
[ bvanassche: added commit message ]
Modified Paths:
--------------
trunk/scstadmin/scstadmin.sysfs/scstadmin
Modified: trunk/scstadmin/scstadmin.sysfs/scstadmin
===================================================================
--- trunk/scstadmin/scstadmin.sysfs/scstadmin 2021-05-31 03:01:15 UTC (rev 9439)
+++ trunk/scstadmin/scstadmin.sysfs/scstadmin 2021-06-18 04:45:40 UTC (rev 9440)
@@ -2445,7 +2445,8 @@
if (!defined($$config{'TARGET_DRIVER'}->{$driver}->{'TARGET'}->{$target}->{'GROUP'}->{$group})) {
if ($deletions) {
- removeGroup($driver, $target, $group);
+ removeGroup($driver, $target,
+ $group, TRUE);
$changes++;
} else {
print "\t-> Group '$group' is not in configuration. Use -force to remove.\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X