X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fto_bytes.rb;fp=3rdparty%2Fmodules%2Fstdlib%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fto_bytes.rb;h=bff24b070baa3b530cd956ebc4a774b8d69f9c7c;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=bf72503f25446277648319b6334a03e49027501d;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb
index bf72503f2..bff24b070 100644
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/to_bytes.rb
@@ -1,11 +1,14 @@
+#
+# to_bytes.rb
+#
 module Puppet::Parser::Functions
-  newfunction(:to_bytes, :type => :rvalue, :doc => <<-EOS
+  newfunction(:to_bytes, :type => :rvalue, :doc => <<-DOC
     Converts the argument into bytes, for example 4 kB becomes 4096.
     Takes a single string value as an argument.
     These conversions reflect a layperson's understanding of
     1 MB = 1024 KB, when in fact 1 MB = 1000 KB, and 1 MiB = 1024 KiB.
-    EOS
-  ) do |arguments|
+    DOC
+             ) do |arguments|
 
     raise(Puppet::ParseError, "to_bytes(): Wrong number of arguments given (#{arguments.size} for 1)") if arguments.size != 1
 
@@ -13,17 +16,17 @@ module Puppet::Parser::Functions
 
     return arg if arg.is_a? Numeric
 
-    value,prefix = */([0-9.e+-]*)\s*([^bB]?)/.match(arg)[1,2]
+    value, prefix = *%r{([0-9.e+-]*)\s*([^bB]?)}.match(arg)[1, 2]
 
     value = value.to_f
     case prefix
     when '' then return value.to_i
-    when 'k' then return (value*(1<<10)).to_i
-    when 'M' then return (value*(1<<20)).to_i
-    when 'G' then return (value*(1<<30)).to_i
-    when 'T' then return (value*(1<<40)).to_i
-    when 'P' then return (value*(1<<50)).to_i
-    when 'E' then return (value*(1<<60)).to_i
+    when 'k' then return (value * (1 << 10)).to_i
+    when 'M' then return (value * (1 << 20)).to_i
+    when 'G' then return (value * (1 << 30)).to_i
+    when 'T' then return (value * (1 << 40)).to_i
+    when 'P' then return (value * (1 << 50)).to_i
+    when 'E' then return (value * (1 << 60)).to_i
     else raise Puppet::ParseError, "to_bytes(): Unknown prefix #{prefix}"
     end
   end