2009-05-26 Pavel Roskin <proski@gnu.org>

* genmk.rb: Avoid shadowing variable `s', rename the outer `s'
	to `str'.
This commit is contained in:
proski 2009-05-26 23:19:42 +00:00
parent cd0d5e3040
commit f0f8bbe243
2 changed files with 8 additions and 5 deletions

View file

@ -1,5 +1,8 @@
2009-05-26 Pavel Roskin <proski@gnu.org> 2009-05-26 Pavel Roskin <proski@gnu.org>
* genmk.rb: Avoid shadowing variable `s', rename the outer `s'
to `str'.
* util/getroot.c (grub_util_get_dev_abstraction): Mark os_dev as * util/getroot.c (grub_util_get_dev_abstraction): Mark os_dev as
possibly unused. possibly unused.

View file

@ -304,20 +304,20 @@ print l
print "# Generated by genmk.rb, please don't edit!\n" print "# Generated by genmk.rb, please don't edit!\n"
cont = false cont = false
s = nil str = nil
while l = gets while l = gets
if cont if cont
s += l str += l
else else
s = l str = l
end end
print l print l
cont = (/\\$/ =~ l) cont = (/\\$/ =~ l)
unless cont unless cont
s.gsub!(/\\\n/, ' ') str.gsub!(/\\\n/, ' ')
if /^([a-zA-Z0-9_]+)\s*\+?=\s*(.*?)\s*$/ =~ s if /^([a-zA-Z0-9_]+)\s*\+?=\s*(.*?)\s*$/ =~ str
var, args = $1, $2 var, args = $1, $2
if var =~ /^([a-zA-Z0-9_]+)_([A-Z]+)$/ if var =~ /^([a-zA-Z0-9_]+)_([A-Z]+)$/