[FFmpeg-cvslog] configure: Use a different variable name in push/popvar

Martin Storsjö git at videolan.org
Fri May 3 11:16:23 CEST 2013


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Apr  3 15:52:45 2013 +0300| [4d810ad2e943a59658ddf00a397121c2b62f7157] | committer: Martin Storsjö

configure: Use a different variable name in push/popvar

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 at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d810ad2e943a59658ddf00a397121c2b62f7157
---

 configure |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index e798cf6..f280928 100755
--- a/configure
+++ b/configure
@@ -424,21 +424,21 @@ get_safe(){
 }
 
 pushvar(){
-    for var in $*; do
-        eval level=\${${var}_level:=0}
-        eval ${var}_${level}="\$$var"
-        eval ${var}_level=$(($level+1))
+    for pvar in $*; do
+        eval level=\${${pvar}_level:=0}
+        eval ${pvar}_${level}="\$$pvar"
+        eval ${pvar}_level=$(($level+1))
     done
 }
 
 popvar(){
-    for var in $*; do
-        eval level=\${${var}_level:-0}
+    for pvar in $*; do
+        eval level=\${${pvar}_level:-0}
         test $level = 0 && continue
         eval level=$(($level-1))
-        eval $var="\${${var}_${level}}"
-        eval ${var}_level=$level
-        eval unset ${var}_${level}
+        eval $pvar="\${${pvar}_${level}}"
+        eval ${pvar}_level=$level
+        eval unset ${pvar}_${level}
     done
 }
 



More information about the ffmpeg-cvslog mailing list