8 files changed, 36 insertions, 21 deletions

diff --git a/lib/Monitoring/Plugin.pm b/lib/Monitoring/Plugin.pm
index f9eb49e..a5b51b1 100644
--- a/lib/Monitoring/Plugin.pm
+++ b/lib/Monitoring/Plugin.pm
@@ -1,9 +1,9 @@
-
 package Monitoring::Plugin;
 
 use Monitoring::Plugin::Functions qw(:codes %ERRORS %STATUS_TEXT @STATUS_CODES);
 use Params::Validate qw(:all);
 
+use 5.006;
 use strict;
 use warnings;
 
@@ -703,7 +703,8 @@ Originally by Ton Voon, E<lt>ton.voon@altinity.comE<gt>.
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2006-2014 by Monitoring Plugin Team
+Copyright (C) 2014      by Monitoring Plugin Team
+Copyright (C) 2006-2014 by Nagios Plugin Development Team
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself, either Perl version 5.8.4 or, at your
diff --git a/lib/Monitoring/Plugin/Config.pm b/lib/Monitoring/Plugin/Config.pm
index 5e941d4..fe2b654 100644
--- a/lib/Monitoring/Plugin/Config.pm
+++ b/lib/Monitoring/Plugin/Config.pm
@@ -1,6 +1,9 @@
 package Monitoring::Plugin::Config;
 
+use 5.006;
 use strict;
+use warnings;
+
 use Carp;
 use File::Spec;
 use base qw(Config::Tiny);
@@ -93,10 +96,12 @@ sub read_string
 sub write { croak "Write access not permitted" }
 
 # Return last file used by read();
-sub np_getfile { return $CURRENT_FILE; }
+sub mp_getfile { return $CURRENT_FILE; }
 
 1;
 
+__END__
+
 =head1 NAME
 
 Monitoring::Plugin::Config - read nagios plugin .ini style config files
@@ -169,7 +174,8 @@ https://monitoring-plugins.org
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2006-2014 Monitoring Plugin Development Team
+Copyright (C) 2014      by Monitoring Plugin Team
+Copyright (C) 2006-2014 by Nagios Plugin Development Team
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.
diff --git a/lib/Monitoring/Plugin/ExitResult.pm b/lib/Monitoring/Plugin/ExitResult.pm
index aa9f5da..ab79a19 100644
--- a/lib/Monitoring/Plugin/ExitResult.pm
+++ b/lib/Monitoring/Plugin/ExitResult.pm
@@ -1,8 +1,10 @@
-# Tiny helper class to return both output and return_code when testing
-
 package Monitoring::Plugin::ExitResult;
 
+# Tiny helper class to return both output and return_code when testing
+
+use 5.006;
 use strict;
+use warnings;
 
 # Stringify to message
 use overload '""' => sub { shift->{message} };
@@ -63,7 +65,8 @@ Originally:
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2006-2014 Monitoring Plugin Development Team
+Copyright (C) 2014      by Monitoring Plugin Team
+Copyright (C) 2006-2014 by Nagios Plugin Development Team
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.
diff --git a/lib/Monitoring/Plugin/Functions.pm b/lib/Monitoring/Plugin/Functions.pm
index d2856e8..d362f9c 100644
--- a/lib/Monitoring/Plugin/Functions.pm
+++ b/lib/Monitoring/Plugin/Functions.pm
@@ -1,12 +1,12 @@
+package Monitoring::Plugin::Functions;
+
 # Functional interface to basic Monitoring::Plugin constants, exports,
 # and functions
 
-package Monitoring::Plugin::Functions;
-
 use 5.006;
-
 use strict;
 use warnings;
+
 use File::Basename;
 use Params::Validate qw(:types validate);
 use Math::Calc::Units;
@@ -437,7 +437,8 @@ https://monitoring-plugins.org
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2006-2014 Monitoring Plugin Development Team
+Copyright (C) 2014      by Monitoring Plugin Team
+Copyright (C) 2006-2014 by Nagios Plugin Development Team
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.
diff --git a/lib/Monitoring/Plugin/Getopt.pm b/lib/Monitoring/Plugin/Getopt.pm
index ce1c0f9..ebdd559 100644
--- a/lib/Monitoring/Plugin/Getopt.pm
+++ b/lib/Monitoring/Plugin/Getopt.pm
@@ -1,11 +1,14 @@
+package Monitoring::Plugin::Getopt;
+
 #
 # Monitoring::Plugin::Getopt - OO perl module providing standardised argument
 #   processing for nagios plugins
 #
 
-package Monitoring::Plugin::Getopt;
-
+use 5.006;
 use strict;
+use warnings;
+
 use File::Basename;
 use Getopt::Long qw(:config no_ignore_case bundling);
 use Carp;
@@ -249,7 +252,7 @@ sub _load_config_section
   # TODO: is this check sane? Does --extra-opts=foo require a [foo] section?
   ## Nevertheless, if we die as UNKNOWN here we should do the same on default
   ## file *added eval/_die above*.
-  $file ||= $Config->np_getfile();
+  $file ||= $Config->mp_getfile();
   $self->_die("Invalid section '$section' in config file '$file'")
     unless exists $Config->{$section};
 
@@ -861,7 +864,8 @@ Originally:
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2006-2014 Monitoring Plugin Development Team
+Copyright (C) 2014      by Monitoring Plugin Team
+Copyright (C) 2006-2014 by Nagios Plugin Development Team
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.
diff --git a/lib/Monitoring/Plugin/Performance.pm b/lib/Monitoring/Plugin/Performance.pm
index 90fc9f4..f1e7a16 100644
--- a/lib/Monitoring/Plugin/Performance.pm
+++ b/lib/Monitoring/Plugin/Performance.pm
@@ -1,7 +1,6 @@
 package Monitoring::Plugin::Performance;
 
 use 5.006;
-
 use strict;
 use warnings;
 
@@ -286,7 +285,8 @@ https://monitoring-plugins.org
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2006-2014 Monitoring Plugin Development Team
+Copyright (C) 2014      by Monitoring Plugin Team
+Copyright (C) 2006-2014 by Nagios Plugin Development Team
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.
diff --git a/lib/Monitoring/Plugin/Range.pm b/lib/Monitoring/Plugin/Range.pm
index af19577..4cacfd4 100644
--- a/lib/Monitoring/Plugin/Range.pm
+++ b/lib/Monitoring/Plugin/Range.pm
@@ -1,7 +1,6 @@
 package Monitoring::Plugin::Range;
 
 use 5.006;
-
 use strict;
 use warnings;
 
@@ -161,7 +160,8 @@ https://monitoring-plugins.org
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2006-2014 Monitoring Plugin Development Team
+Copyright (C) 2014      by Monitoring Plugin Team
+Copyright (C) 2006-2014 by Nagios Plugin Development Team
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.
diff --git a/lib/Monitoring/Plugin/Threshold.pm b/lib/Monitoring/Plugin/Threshold.pm
index e71e21b..06dbf0c 100644
--- a/lib/Monitoring/Plugin/Threshold.pm
+++ b/lib/Monitoring/Plugin/Threshold.pm
@@ -1,7 +1,6 @@
 package Monitoring::Plugin::Threshold;
 
 use 5.006;
-
 use strict;
 use warnings;
 
@@ -126,7 +125,8 @@ https://monitoring-plugins.org
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2006-2014 Monitoring Plugin Development Team
+Copyright (C) 2014      by Monitoring Plugin Team
+Copyright (C) 2006-2014 by Nagios Plugin Development Team
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself.