From cf6ab5c1f95df456dfbbe824439d7a88d3b7b29a Mon Sep 17 00:00:00 2001
From: Tomas Plesnik <plesnik@ics.muni.cz>
Date: Tue, 14 Oct 2014 14:12:41 +0200
Subject: [PATCH] lepsi prehlednost kodu (nahrazeni negovanych ifu za unless);
uprava chybovych hlasek
---
src/warden-server/bin/registerSender.pl | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/warden-server/bin/registerSender.pl b/src/warden-server/bin/registerSender.pl
index 595831d..083333a 100755
--- a/src/warden-server/bin/registerSender.pl
+++ b/src/warden-server/bin/registerSender.pl
@@ -110,21 +110,21 @@ if ($script_version) {
# check parameters definition
switch () {
- case {!defined $hostname} {WardenCommon::errMsg("Parameter '-n <hostname>' is not defined!")}
- case {!defined $requestor} {WardenCommon::errMsg("Parameter '-r <requestor>' is not defined!")}
- case {!defined $service} {WardenCommon::errMsg("Parameter '-s <service>' is not defined!")}
- case {!defined $description_tags} {WardenCommon::errMsg("Parameter '-d <description_tags>' is not defined!")}
- case {!defined $ip_net_client} {WardenCommon::errMsg("Parameter '-c <cidr>' is not defined!")}
+ case {!defined $hostname} {WardenCommon::errMsg("Parameter '-n <hostname>' is not defined")}
+ case {!defined $requestor} {WardenCommon::errMsg("Parameter '-r <requestor>' is not defined")}
+ case {!defined $service} {WardenCommon::errMsg("Parameter '-s <service>' is not defined")}
+ case {!defined $description_tags} {WardenCommon::errMsg("Parameter '-d <description_tags>' is not defined")}
+ case {!defined $ip_net_client} {WardenCommon::errMsg("Parameter '-c <cidr>' is not defined")}
}
# check validity of IP address (CIDR format)
if ($ip_net_client !~ /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/(\d|[1-2]\d|3[0-2]))$/) {
- WardenCommon::errMsg("Incorrect CIDR format of IP address: '$ip_net_client'!");
+ WardenCommon::errMsg("Incorrect CIDR format of IP address: '$ip_net_client'");
}
# check client ID
if (defined $client_id && $client_id !~ /^\d+\z/) {
- WardenCommon::errMsg("Parameter '-i <client_id>' is not a integer!");
+ WardenCommon::errMsg("Parameter '-i <client_id>' is not a integer");
}
# defined variables by method
@@ -150,11 +150,11 @@ if (defined $client_id) {
}
($client_id_db, $hostname_db, $registered_db, $requestor_db, $service_db, $client_type_db, $description_tags_db, $ip_net_client_db, $valid_db) = $sth->fetchrow();
# register sender without user specified client_id
-if (!defined $client_id_db) {
+unless (defined $client_id_db) {
$sth = $dbh->prepare("INSERT INTO clients VALUES (?,?,?,?,?,?,?,?,?,?,?);") or die "Cannot prepare statement: " . $dbh->errstr;
my $ret_val = $sth->execute($client_id, $hostname, $registered, $requestor, $service, $client_type, $type, $receive_own_events, $description_tags, $ip_net_client, $valid) or die "Cannot execute statement: " . $sth->errstr;
if ($ret_val == 1) {
- if (!defined $client_id) {
+ unless (defined $client_id) {
$client_id = $dbh->last_insert_id(undef, undef, "clients", undef);
}
sendMsg("info", "New sender [ID: '$client_id', Hostname: '$hostname', Requestor: '$requestor', Service: '$service', Description_tags: '$description_tags', CIDR: '$ip_net_client'] was registered");
--
GitLab