generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Use a different variable name in push/popvar

Browse Source 
The variable name 'var' is commonly used to iterate through arguments
in other functions. When the pushvar function internally uses the
variable 'var', it makes pushing/popping the variable 'var' not
work as intended.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2013-04-03 15:52:45 +03:00
parent 13f57a4d88
commit 4d810ad2e9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -424,21 +424,21 @@ get_safe(){
} }
pushvar(){ pushvar(){
for var in $*; do for pvar in $*; do
eval level=\${${var}_level:=0} eval level=\${${pvar}_level:=0}
eval ${var}_${level}="\$$var" eval ${pvar}_${level}="\$$pvar"
eval ${var}_level=$(($level+1)) eval ${pvar}_level=$(($level+1))
done done
} }
popvar(){ popvar(){
for var in $*; do for pvar in $*; do
eval level=\${${var}_level:-0} eval level=\${${pvar}_level:-0}
test $level = 0 && continue test $level = 0 && continue
eval level=$(($level-1)) eval level=$(($level-1))
eval $var="\${${var}_${level}}" eval $pvar="\${${pvar}_${level}}"
eval ${var}_level=$level eval ${pvar}_level=$level
eval unset ${var}_${level} eval unset ${pvar}_${level}
done done
} }