Changeset 3883

Timestamp:

09/02/10 20:12:53 (1 year ago)

Author:

bldewolf

Message:

Clean up Perl warnings due to use of undefined variables in two functions in LimitsOld?.pm in 1.4-stable as well.

Files:

• branches/1.4-stable/master/lib/Munin/Master/LimitsOld.pm (modified) (2 diffs)

branches/1.4-stable/master/lib/Munin/Master/LimitsOld.pm

@@ -481 +481 @@
-        $critical[0] = $1 if length $1;
-        $critical[1] = $2 if length $2;
-        DEBUG "[DEBUG] processing critical: $name -> $critical[0] : $critical[1]";
-    }
-    elsif (defined $crit and $crit =~ /^\s*([-+\d.]+)\s*$/) {
-
-
+
-    }
-    elsif (defined $crit) {
-        @critical = (0, 0);
-
-
+
+
+
+
+
+
+
-
-    if (defined $warn and $warn =~ /^\s*([-+\d.]*):([-+\d.]*)\s*$/) {
-        $warning[0] = $1 if length $1;
-        $warning[1] = $2 if length $2;
-        DEBUG "[DEBUG] processing warning: $name -> $warning[0] : $warning[1]";
-    }
-    elsif (defined $warn and $warn =~ /^\s*([-+\d.]+)\s*$/) {
-
-
+
-    }
-    elsif (defined $warn) {
-        @warning = (0, 0);
-
+
+
+
+
+
+
-    }
-
@@ -713 +719 @@
-
-
-
+defined($text) && 
-        if ($text =~ /^([^\$]+|)(?:\$(\{.*)|)$/) {
-            push @res, $1;
-            $text = $2;
-        }
+
-        my @a = extract_bracketed($text, '{}');
+        if(!defined $a[0]) {
+            $text = $a[1];
+            next;
+        }
+
-        if ($a[0] =~ /^\{var:(\S+)\}$/) {
-            $a[0] = munin_get($hash, $1, "");