From 897586cb06a05241d9017362add935ff8268205b Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Sat, 4 Aug 2018 23:17:26 -0500
Subject: [PATCH] Perl DBD modules: Add 'use strict', fix issues.

---
 modules/database/src/tools/DBD/Breaktable.pm |  3 +-
 modules/database/src/tools/DBD/Device.pm     |  4 +-
 modules/database/src/tools/DBD/Driver.pm     |  4 +-
 modules/database/src/tools/DBD/Function.pm   |  4 +-
 modules/database/src/tools/DBD/Link.pm       |  4 +-
 modules/database/src/tools/DBD/Menu.pm       |  6 ++-
 modules/database/src/tools/DBD/Recfield.pm   | 43 +++++++++++---------
 modules/database/src/tools/DBD/Recordtype.pm |  3 +-
 modules/database/src/tools/DBD/Registrar.pm  |  4 +-
 modules/database/src/tools/DBD/Variable.pm   |  4 +-
 10 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/modules/database/src/tools/DBD/Breaktable.pm b/modules/database/src/tools/DBD/Breaktable.pm
index c14ab8d65..6fb39e142 100644
--- a/modules/database/src/tools/DBD/Breaktable.pm
+++ b/modules/database/src/tools/DBD/Breaktable.pm
@@ -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) = @_;
diff --git a/modules/database/src/tools/DBD/Device.pm b/modules/database/src/tools/DBD/Device.pm
index 1e6d0684c..8e6bd23ad 100644
--- a/modules/database/src/tools/DBD/Device.pm
+++ b/modules/database/src/tools/DBD/Device.pm
@@ -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/,
diff --git a/modules/database/src/tools/DBD/Driver.pm b/modules/database/src/tools/DBD/Driver.pm
index ddbae8f38..f0a963cbc 100644
--- a/modules/database/src/tools/DBD/Driver.pm
+++ b/modules/database/src/tools/DBD/Driver.pm
@@ -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)");
diff --git a/modules/database/src/tools/DBD/Function.pm b/modules/database/src/tools/DBD/Function.pm
index 4a4a4cbfe..69150f40d 100644
--- a/modules/database/src/tools/DBD/Function.pm
+++ b/modules/database/src/tools/DBD/Function.pm
@@ -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");
diff --git a/modules/database/src/tools/DBD/Link.pm b/modules/database/src/tools/DBD/Link.pm
index 4a4568e82..17affb882 100644
--- a/modules/database/src/tools/DBD/Link.pm
+++ b/modules/database/src/tools/DBD/Link.pm
@@ -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) = @_;
diff --git a/modules/database/src/tools/DBD/Menu.pm b/modules/database/src/tools/DBD/Menu.pm
index 9f15578c3..943dcc398 100644
--- a/modules/database/src/tools/DBD/Menu.pm
+++ b/modules/database/src/tools/DBD/Menu.pm
@@ -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'")
diff --git a/modules/database/src/tools/DBD/Recfield.pm b/modules/database/src/tools/DBD/Recfield.pm
index 3e109d2d1..22c8d1da8 100644
--- a/modules/database/src/tools/DBD/Recfield.pm
+++ b/modules/database/src/tools/DBD/Recfield.pm
@@ -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;
diff --git a/modules/database/src/tools/DBD/Recordtype.pm b/modules/database/src/tools/DBD/Recordtype.pm
index 649c6a21b..2edbe463a 100644
--- a/modules/database/src/tools/DBD/Recordtype.pm
+++ b/modules/database/src/tools/DBD/Recordtype.pm
@@ -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) = @_;
diff --git a/modules/database/src/tools/DBD/Registrar.pm b/modules/database/src/tools/DBD/Registrar.pm
index 29d12cd11..b4d6cabe3 100644
--- a/modules/database/src/tools/DBD/Registrar.pm
+++ b/modules/database/src/tools/DBD/Registrar.pm
@@ -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");
diff --git a/modules/database/src/tools/DBD/Variable.pm b/modules/database/src/tools/DBD/Variable.pm
index cd1b0a334..ee606c6fc 100644
--- a/modules/database/src/tools/DBD/Variable.pm
+++ b/modules/database/src/tools/DBD/Variable.pm
@@ -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