From c940a9a2cb1d12a97e8fd2c14f386f71f10ac03d Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 18 Nov 2018 17:49:14 +0000 Subject: [PATCH] fhem.pl: patch perl 5.8 regexp warning (Forum #93397) git-svn-id: https://svn.fhem.de/fhem/trunk@17779 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_SVG.pm | 4 ++-- fhem/fhem.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm index 981454bfd..434e79613 100644 --- a/fhem/FHEM/98_SVG.pm +++ b/fhem/FHEM/98_SVG.pm @@ -1475,7 +1475,7 @@ SVG_render($$$$$$$$$$) $idx++; } #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} =~ /\[(.*):(.*)\]/) { $xmin = $1 if($1 ne ""); $xmax = $2 if($2 ne ""); @@ -1726,7 +1726,7 @@ SVG_render($$$$$$$$$$) #-- yrange is specified in plotfile if($conf{$yra}) { $conf{$yra} = AnalyzeCommand(undef, $1) - if($conf{$yra} =~ /^({.*})$/); + if($conf{$yra} =~ /^(\{.*\})$/); if($conf{$yra} =~ /\[(.*):(.*)\]/) { $hmin{$a} = $1 if($1 ne ""); $hmax{$a} = $2 if($2 ne ""); diff --git a/fhem/fhem.pl b/fhem/fhem.pl index e4d979277..f55b9aa5c 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -2802,7 +2802,7 @@ CommandAttr($$) my $arg= $attrVal; # 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 $rNo=0;