mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

: minor code cleanup

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21563 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen
2020-03-31 18:59:22 +00:00
parent 050f06bd47
commit a8776d2d56
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/configDB.pm
View File

@@ -241,6 +241,7 @@ my @configs = split(/;;/,$configs);
my $count = @configs; my $count = @configs;
my $fhemhost = hostname; my $fhemhost = hostname;
## no critic
if ($count > 1) { if ($count > 1) {
foreach my $c (@configs) { foreach my $c (@configs) {
next unless $c =~ m/^%dbconfig.*/; next unless $c =~ m/^%dbconfig.*/;
@@ -252,6 +253,7 @@ if ($count > 1) {
} else { } else {
eval $configs[0]; eval $configs[0];
} }
## use critic
my $cfgDB_dbconn = $dbconfig{connection}; my $cfgDB_dbconn = $dbconfig{connection};
my $cfgDB_dbuser = $dbconfig{user}; my $cfgDB_dbuser = $dbconfig{user};
@@ -438,7 +440,7 @@ sub cfgDB_ReadAll($) {
# AnalyzeCommandChain for all entries # AnalyzeCommandChain for all entries
$ret = _cfgDB_Execute($cl, @dbconfig); $ret = _cfgDB_Execute($cl, @dbconfig);
return $ret if($ret); return $ret if($ret);
return undef; return;
} }
# save running configuration to version 0 # save running configuration to version 0
@@ -736,7 +738,7 @@ sub _cfgDB_Execute($@) {
push @ret, $tret if(defined($tret)); push @ret, $tret if(defined($tret));
} }
return join("\n", @ret) if(@ret); return join("\n", @ret) if(@ret);
return undef; return;
} }
# read all entries from fhemconfig # read all entries from fhemconfig
@@ -995,7 +997,7 @@ sub _cfgDB_Reorg(;$$) {
_cfgDB_InsertLine($fhem_dbh,$uuid,"attr configdb lastReorg $ts",-1); _cfgDB_InsertLine($fhem_dbh,$uuid,"attr configdb lastReorg $ts",-1);
$fhem_dbh->commit(); $fhem_dbh->commit();
$fhem_dbh->disconnect(); $fhem_dbh->disconnect();
eval qx(sqlite3 $cfgDB_filename vacuum) if($cfgDB_dbtype eq "SQLITE"); eval { qx(sqlite3 $cfgDB_filename vacuum) } if($cfgDB_dbtype eq "SQLITE");
return if(defined($quiet)); return if(defined($quiet));
return " Result after database reorg:\n"._cfgDB_Info(undef); return " Result after database reorg:\n"._cfgDB_Info(undef);
} }