Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fhem.pl: patch perl 5.8 regexp warning (Forum #93397)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17779 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-11-18 17:49:14 +00:00
parent e0e2a7d242
commit c940a9a2cb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/98_SVG.pm
View File

@ -1475,7 +1475,7 @@ SVG_render($$$$$$$$$$)
$idx++; $idx++;
} }
#main::Debug "xmin= $xmin xmax=$xmax"; #main::Debug "xmin= $xmin xmax=$xmax";
$conf{xrange} = AnalyzeCommand(undef, $1) if($conf{xrange} =~ /^({.*})$/); $conf{xrange} = AnalyzeCommand(undef, $1) if($conf{xrange} =~ /^(\{.*\})$/);
if($conf{xrange} =~ /\[(.*):(.*)\]/) { if($conf{xrange} =~ /\[(.*):(.*)\]/) {
$xmin = $1 if($1 ne ""); $xmin = $1 if($1 ne "");
$xmax = $2 if($2 ne ""); $xmax = $2 if($2 ne "");
@ -1726,7 +1726,7 @@ SVG_render($$$$$$$$$$)
#-- yrange is specified in plotfile #-- yrange is specified in plotfile
if($conf{$yra}) { if($conf{$yra}) {
$conf{$yra} = AnalyzeCommand(undef, $1) $conf{$yra} = AnalyzeCommand(undef, $1)
if($conf{$yra} =~ /^({.*})$/); if($conf{$yra} =~ /^(\{.*\})$/);
if($conf{$yra} =~ /\[(.*):(.*)\]/) { if($conf{$yra} =~ /\[(.*):(.*)\]/) {
$hmin{$a} = $1 if($1 ne ""); $hmin{$a} = $1 if($1 ne "");
$hmax{$a} = $2 if($2 ne ""); $hmax{$a} = $2 if($2 ne "");

2
fhem/fhem.pl
View File

@ -2802,7 +2802,7 @@ CommandAttr($$)
my $arg= $attrVal; my $arg= $attrVal;
# matches myReading1[:trigger2] { codecode1 } # matches myReading1[:trigger2] { codecode1 }
my $regexi= '\s*([\w.-]+)(:\S*)?\s+((\w+)\s+)?({.*?})\s*'; my $regexi= '\s*([\w.-]+)(:\S*)?\s+((\w+)\s+)?(\{.*?\})\s*';
my $regexo= '^(' . $regexi . ')(,\s*(.*))*$'; my $regexo= '^(' . $regexi . ')(,\s*(.*))*$';
my $rNo=0; my $rNo=0;