From 3c471139bf64673134a0b7536a3a04f514e6408a Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Fri, 12 Feb 2021 20:31:37 +0000 Subject: [PATCH] 00_CUL.pm: some cosmetic fixes (Forum #117934) git-svn-id: https://svn.fhem.de/fhem/trunk@23727 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_CUL.pm | 3 ++- fhem/FHEM/00_ZWDongle.pm | 3 ++- fhem/FHEM/01_FHEMWEB.pm | 9 ++++++--- fhem/FHEM/10_ZWave.pm | 16 ++++++++++------ fhem/FHEM/12_HMS.pm | 3 ++- fhem/FHEM/92_FileLog.pm | 3 ++- fhem/FHEM/96_allowed.pm | 6 ++++-- fhem/FHEM/98_JsonList2.pm | 3 ++- fhem/FHEM/98_autocreate.pm | 2 +- fhem/FHEM/98_telnet.pm | 4 ++-- fhem/FHEM/FritzBoxUtils.pm | 10 ++++++---- 11 files changed, 39 insertions(+), 23 deletions(-) diff --git a/fhem/FHEM/00_CUL.pm b/fhem/FHEM/00_CUL.pm index c48ea7a0b..64f8ebb28 100755 --- a/fhem/FHEM/00_CUL.pm +++ b/fhem/FHEM/00_CUL.pm @@ -634,7 +634,8 @@ CUL_XmitDlyHM($$$) { my ($hash,$fn,$now) = @_; - my (undef,$mTy,undef,$id) = unpack 'A8A2A6A6',$fn if(length($fn)>19); + my ($mTy,$id); + (undef,$mTy,undef,$id) = unpack 'A8A2A6A6',$fn if(length($fn)>19); if($id && $modules{CUL_HM}{defptr}{$id} && diff --git a/fhem/FHEM/00_ZWDongle.pm b/fhem/FHEM/00_ZWDongle.pm index 8a36a6ce2..501f604df 100644 --- a/fhem/FHEM/00_ZWDongle.pm +++ b/fhem/FHEM/00_ZWDongle.pm @@ -484,7 +484,8 @@ ZWDongle_Get($@) my $msg=""; $a[0] = $a0 if(defined($a0)); $msg = $ret if($ret); - my @r = map { ord($_) } split("", pack('H*', $ret)) if(defined($ret)); + my @r; + @r = map { ord($_) } split("", pack('H*', $ret)) if(defined($ret)); if($cmd eq "nodeList") { ############################ $msg =~ s/^.{10}(.{58}).*/$1/; diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm index 0c90a88d9..cb56f98ce 100644 --- a/fhem/FHEM/01_FHEMWEB.pm +++ b/fhem/FHEM/01_FHEMWEB.pm @@ -2212,7 +2212,8 @@ FW_returnFileAsStream($$$$$) "Transfer-Encoding: chunked\r\n" . "Content-Type: $type; charset=$FW_encoding\r\n\r\n"); - my $d = Compress::Zlib::deflateInit(-WindowBits=>31) if($compr); + my $d; + $d = Compress::Zlib::deflateInit(-WindowBits=>31) if($compr); FW_outputChunk($FW_chash, $FW_RET, $d); FW_outputChunk($FW_chash, "". "jump to the end

", $d) @@ -2505,7 +2506,8 @@ FW_style($$) FW_addContent(">$filePath: $!{NAME}; my $iodev = $hash->{IODev}; - my $homeReading = ReadingsVal($iodev->{NAME}, "homeId", "") if($iodev); - my $CTRLID=hex($1) if($homeReading && $homeReading =~ m/CtrlNodeIdHex:(..)/); + my ($homeReading, $CTRLID); + $homeReading = ReadingsVal($iodev->{NAME}, "homeId", "") if($iodev); + $CTRLID = hex($1) if($homeReading && $homeReading =~ m/CtrlNodeIdHex:(..)/); # ZWavePlus devices with MCA need mcaAdd instead of associationAdd my $cls = AttrVal($NAME, "classes", ""); @@ -980,7 +981,8 @@ ZWave_neighborList($) no strict "refs"; my $iohash = $hash->{IODev}; my $fn = $modules{$iohash->{TYPE}}{ReadAnswerFn}; - my ($err, $data) = &{$fn}($iohash, "neighborList", "^0180") if($fn); + my ($err, $data); + ($err, $data) = &{$fn}($iohash, "neighborList", "^0180") if($fn); use strict "refs"; return $err if($err); @@ -1131,7 +1133,8 @@ ZWave_Cmd($$@) $cmdFmt = sprintf($cmdFmt, @a); } $@ = undef; - my ($err, $ncmd) = eval($cmdFmt) if($cmdFmt !~ m/^\d/); + my ($err, $ncmd); + ($err, $ncmd) = eval($cmdFmt) if($cmdFmt !~ m/^\d/); return $err if($err); return $@ if($@); $cmdFmt = $ncmd if(defined($ncmd)); @@ -2908,8 +2911,9 @@ ZWave_configParseModel($;$) } if($line =~ m/^\s*{NAME}; my $pwok = ($secret && $secret eq $basicAuth) ? 1 : 2; # Base64 - my ($user, $password) = split(":", decode_base64($secret)) if($secret); + my ($user, $password); + ($user, $password) = split(":", decode_base64($secret)) if($secret); ($user,$password) = ("","") if(!defined($user) || !defined($password)); if($secret && $basicAuth =~ m/^{.*}$/) { diff --git a/fhem/FHEM/98_JsonList2.pm b/fhem/FHEM/98_JsonList2.pm index 54de485ea..28e5b54e3 100644 --- a/fhem/FHEM/98_JsonList2.pm +++ b/fhem/FHEM/98_JsonList2.pm @@ -37,7 +37,8 @@ JsonList2_dumpHash($$$$$$) { my ($arrp, $name, $h, $isReading, $showInternal, $attr) = @_; my $ret = ""; - my %filter = map { $_=>1 } @$attr if(@$attr); + my %filter; + %filter = map { $_=>1 } @$attr if(@$attr); my @arr = grep { ($showInternal || $_ !~ m/^\./) && ($isReading || $_ eq "IODev" || !ref($h->{$_}) ) && diff --git a/fhem/FHEM/98_autocreate.pm b/fhem/FHEM/98_autocreate.pm index f2fe38cd5..69d7889e8 100644 --- a/fhem/FHEM/98_autocreate.pm +++ b/fhem/FHEM/98_autocreate.pm @@ -570,7 +570,7 @@ CommandUsb($$) my ($cl, $n) = @_; return "Usage: usb [scan|create]" if("$n" !~ m/^(scan|create)$/); - my $scan = 1 if($n eq "scan"); + my $scan = ($n eq "scan"); my $ret = ""; my $msg; my $dir = "/dev"; diff --git a/fhem/FHEM/98_telnet.pm b/fhem/FHEM/98_telnet.pm index a7e2adf02..084bf4fda 100644 --- a/fhem/FHEM/98_telnet.pm +++ b/fhem/FHEM/98_telnet.pm @@ -139,8 +139,8 @@ telnet_Define($$$) my $port = $pport; $port =~ s/^IPV6://; - my $isServer = 1 if(defined($port) && $port =~ m/^\d+$/); - my $isClient = 1 if($port && $port =~ m/^(.+):\d+$/); + my $isServer = (defined($port) && $port =~ m/^\d+$/); + my $isClient = ($port && $port =~ m/^(.+):\d+$/); return "Usage: define telnet { [IPV6:] [global] | ". " [IPV6:]serverName:port }" diff --git a/fhem/FHEM/FritzBoxUtils.pm b/fhem/FHEM/FritzBoxUtils.pm index 079b012a7..6155ebcfb 100644 --- a/fhem/FHEM/FritzBoxUtils.pm +++ b/fhem/FHEM/FritzBoxUtils.pm @@ -37,8 +37,9 @@ FB_doCheckPW($$$) "getpage=../html/login_sid.xml" ); $data = join("&", map {join("=", map {urlEncode($_)} split("=",$_,2))} @d); $data = GetFileFromURL(FB_host2URL($host)."cgi-bin/webcm", undef, $data, 1); - my $sid = $1 if($data =~ /(\w+)<\/SID>/i); - $sid = undef if($sid =~ m/^0*$/); + my $sid; + $sid = $1 if($data =~ /(\w+)<\/SID>/i); + $sid = undef if(defined($sid) && $sid =~ m/^0*$/); return $sid; } else { # FritzOS >= 5.50 @@ -49,8 +50,9 @@ FB_doCheckPW($$$) $data = GetFileFromURL($url, undef, $data, 1); return if(!$data); - my $sid = $1 if($data =~ /(\w+)<\/SID>/i); - return if($sid =~ m/^0*$/); + my $sid; + $sid = $1 if($data =~ /(\w+)<\/SID>/i); + return if(defined($sid) && $sid =~ m/^0*$/); return $sid; } }