* more work towards perlcritic compliance, fixed the low-hanging fruit

  for level 4

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1234 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 15 insertions, 1 deletions

diff --git a/lib/OpenSLX/Basics.pm b/lib/OpenSLX/Basics.pm
index b663a32c..6f61c7a7 100644
--- a/lib/OpenSLX/Basics.pm
+++ b/lib/OpenSLX/Basics.pm
@@ -141,6 +141,7 @@ sub vlog
 		$str .= "\n";
 	}
 	print $openslxLog $str;
+	return;
 }
 
 # ------------------------------------------------------------------------------
@@ -276,6 +277,7 @@ sub trInit
 			);
 		}
 	}
+	return;
 }
 
 # ------------------------------------------------------------------------------
@@ -321,6 +323,7 @@ sub callInSubprocess
 	if ($?) {
 		exit $?;
 	}
+	return;
 }
 
 # ------------------------------------------------------------------------------
@@ -347,6 +350,7 @@ sub addCleanupFunction
 	my $func = shift;
 
 	$cleanupFunctions{$name} = $func;
+	return;
 }
 
 # ------------------------------------------------------------------------------
@@ -355,6 +359,7 @@ sub removeCleanupFunction
 	my $name = shift;
 
 	delete $cleanupFunctions{$name};
+	return;
 }
 
 # ------------------------------------------------------------------------------
@@ -365,6 +370,7 @@ sub invokeCleanupFunctions
 		vlog(2, "invoking cleanup function '$name'...");
 		$cleanupFunctions{$name}->();
 	}
+	return;
 }
 
 # ------------------------------------------------------------------------------
@@ -381,7 +387,6 @@ sub slxsystem
 		if ($signalNo > 0 && $signalNo != 13) {
 			die _tr("child-process reveived signal '%s', parent stops!",
 				$signalNo);
-			exit;
 		}
 	}
 	return $res;
@@ -391,18 +396,21 @@ sub slxsystem
 sub cluck
 {
 	_doThrowOrWarn('cluck', @_);
+	return;
 }
 
 # ------------------------------------------------------------------------------
 sub carp
 {
 	_doThrowOrWarn('carp', @_);
+	return;
 }
 
 # ------------------------------------------------------------------------------
 sub warn
 {
 	_doThrowOrWarn('warn', @_);
+	return;
 }
 
 # ------------------------------------------------------------------------------
@@ -410,6 +418,7 @@ sub confess
 {
 	invokeCleanupFunctions();
 	_doThrowOrWarn('confess', @_);
+	return;
 }
 
 # ------------------------------------------------------------------------------
@@ -417,6 +426,7 @@ sub croak
 {
 	invokeCleanupFunctions();
 	_doThrowOrWarn('croak', @_);
+	return;
 }
 
 # ------------------------------------------------------------------------------
@@ -424,6 +434,7 @@ sub die
 {
 	invokeCleanupFunctions();
 	_doThrowOrWarn('die', @_);
+	return;
 }
 
 # ------------------------------------------------------------------------------
@@ -460,6 +471,7 @@ sub _doThrowOrWarn
 		my $func = $functionFor{$type};
 		$func->("$msg\n");
 	}
+	return;
 }
 
 # ------------------------------------------------------------------------------
diff --git a/lib/OpenSLX/Utils.pm b/lib/OpenSLX/Utils.pm
index 207edb98..22555df3 100644
--- a/lib/OpenSLX/Utils.pm
+++ b/lib/OpenSLX/Utils.pm
@@ -14,6 +14,8 @@
 package OpenSLX::Utils;
 
 use strict;
+use warnings;
+
 use vars qw(@ISA @EXPORT $VERSION);
 
 use Exporter;