epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Perl DBD modules: Add 'use strict', fix issues.

Browse Source
This commit is contained in:
Andrew Johnson
2018-08-04 23:17:26 -05:00
parent 588fa4f3b2
commit 897586cb06
10 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/database/src/tools/DBD/Breaktable.pm
+2 -1
View File
@@ -1,8 +1,9 @@
package DBD::Breaktable;
use DBD::Base;
@ISA = qw(DBD::Base);
our @ISA = qw(DBD::Base);
use Carp;
use strict;
sub init {
my ($this, $name) = @_;
modules/database/src/tools/DBD/Device.pm
+3 -1
View File
@@ -1,6 +1,8 @@
package DBD::Device;
use DBD::Base;
@ISA = qw(DBD::Base);
our @ISA = qw(DBD::Base);
use strict;
my %link_types = (
CONSTANT => qr/$RXnum/,
modules/database/src/tools/DBD/Driver.pm
+3 -1
View File
@@ -1,6 +1,8 @@
package DBD::Driver;
use DBD::Base;
@ISA = qw(DBD::Base);
our @ISA = qw(DBD::Base);
use strict;
sub init {
return shift->SUPER::init(shift, "driver support (drvet)");
modules/database/src/tools/DBD/Function.pm
+3 -1
View File
@@ -1,6 +1,8 @@
package DBD::Function;
use DBD::Base;
@ISA = qw(DBD::Base);
our @ISA = qw(DBD::Base);
use strict;
sub init {
return shift->SUPER::init(shift, "function");
modules/database/src/tools/DBD/Link.pm
+3 -1
View File
@@ -1,6 +1,8 @@
package DBD::Link;
use DBD::Base;
@ISA = qw(DBD::Base);
our @ISA = qw(DBD::Base);
use strict;
sub init {
my ($this, $name, $jlif) = @_;
modules/database/src/tools/DBD/Menu.pm
+4 -2
View File
@@ -1,6 +1,8 @@
package DBD::Menu;
use DBD::Base;
@ISA = qw(DBD::Base);
our @ISA = qw(DBD::Base);
use strict;
sub init {
my ($this, $name) = @_;
@@ -14,7 +16,7 @@ sub init {
sub add_choice {
my ($this, $name, $value) = @_;
$name = $this->identifier($name, "Choice name");
foreach $pair ($this->choices) {
foreach my $pair ($this->choices) {
dieContext("Duplicate menu choice name '$name'")
if ($pair->[0] eq $name);
dieContext("Duplicate menu choice string '$value'")
modules/database/src/tools/DBD/Recfield.pm
+24 -19
View File
@@ -1,6 +1,8 @@
package DBD::Recfield;
use DBD::Base;
@ISA = qw(DBD::Base);
our @ISA = qw(DBD::Base);
use strict;
# The hash value is a regexp that matches all legal values of this field
# NB: The regexps are not currently used, and are wrong for some types.
@@ -187,7 +189,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_STRING;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
my ($this, $value) = @_;
@@ -197,6 +199,7 @@ sub legal_value {
sub check_valid {
my ($this) = @_;
my $name = $this->name;
dieContext("Size missing for DBF_STRING field '$name'")
unless exists $this->attributes->{'size'};
$this->SUPER::check_valid;
@@ -218,7 +221,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_CHAR;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
my ($this, $value) = @_;
@@ -238,7 +241,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_UCHAR;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
my ($this, $value) = @_;
@@ -258,7 +261,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_SHORT;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
my ($this, $value) = @_;
@@ -278,7 +281,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_USHORT;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
my ($this, $value) = @_;
@@ -298,7 +301,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_LONG;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
my ($this, $value) = @_;
@@ -316,7 +319,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_ULONG;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
my ($this, $value) = @_;
@@ -335,7 +338,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_INT64;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
my ($this, $value) = @_;
@@ -353,7 +356,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_UINT64;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
my ($this, $value) = @_;
@@ -372,7 +375,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_FLOAT;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
my ($this, $value) = @_;
@@ -389,7 +392,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_DOUBLE;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
my ($this, $value) = @_;
@@ -406,7 +409,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_ENUM;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
return 1;
@@ -422,7 +425,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_MENU;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
# FIXME: If we know the menu name and the menu exists, check further
@@ -431,6 +434,7 @@ sub legal_value {
sub check_valid {
my ($this) = @_;
my $name = $this->name;
dieContext("Menu name missing for DBF_MENU field '$name'")
unless defined($this->attribute("menu"));
$this->SUPER::check_valid;
@@ -446,7 +450,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_DEVICE;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
return 1;
@@ -462,7 +466,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_INLINK;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
return 1;
@@ -478,7 +482,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_OUTLINK;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
return 1;
@@ -494,7 +498,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_FWDLINK;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
return 1;
@@ -510,7 +514,7 @@ sub toDeclaration {
package DBD::Recfield::DBF_NOACCESS;
use DBD::Base;
@ISA = qw(DBD::Recfield);
our @ISA = qw(DBD::Recfield);
sub legal_value {
my ($this, $value) = @_;
@@ -519,6 +523,7 @@ sub legal_value {
sub check_valid {
my ($this) = @_;
my $name = $this->name;
dieContext("Type information missing for DBF_NOACCESS field '$name'")
unless defined($this->attribute("extra"));
$this->SUPER::check_valid;
modules/database/src/tools/DBD/Recordtype.pm
+2 -1
View File
@@ -1,8 +1,9 @@
package DBD::Recordtype;
use DBD::Base;
@ISA = qw(DBD::Base);
our @ISA = qw(DBD::Base);
use Carp;
use strict;
sub init {
my ($this, $name) = @_;
modules/database/src/tools/DBD/Registrar.pm
+3 -1
View File
@@ -1,6 +1,8 @@
package DBD::Registrar;
use DBD::Base;
@ISA = qw(DBD::Base);
our @ISA = qw(DBD::Base);
use strict;
sub init {
return shift->SUPER::init(shift, "registrar function");
modules/database/src/tools/DBD/Variable.pm
+3 -1
View File
@@ -1,6 +1,8 @@
package DBD::Variable;
use DBD::Base;
@ISA = qw(DBD::Base);
our @ISA = qw(DBD::Base);
use strict;
my %valid_types = (
# C type name => corresponding iocshArg type identifier