[Gnash-commit] /srv/bzr/gnash/trunk r12322: Fix unused variable warning by using the variable.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 12322 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Wed 2010-07-21 09:21:11 +0200
message:
  Fix unused variable warning by using the variable.
modified:
  libcore/movie_root.cpp

=== modified file 'libcore/movie_root.cpp'
--- a/libcore/movie_root.cpp    2010-07-20 18:21:26 +0000
+++ b/libcore/movie_root.cpp    2010-07-21 07:06:04 +0000
@@ -1878,30 +1878,29 @@
 
     MovieClip *mc = getLevel(0);
     as_object *obj = getObject(mc);
-    string_table &st = getStringTable(*obj);
-    string_table::key key = st.find(name);
+
+    string_table& st = getStringTable(*obj);
+    const string_table::key key = st.find(name);
     // FIXME: there has got to be a better way of handling the variable
     // length arg list
     as_value val;
     switch (fnargs.size()) {
       case 0:
-          val = callMethod(obj, st.find(name));
+          val = callMethod(obj, key);
           break;
       case 1:
-          val = callMethod(obj, st.find(name), fnargs[0]);
+          val = callMethod(obj, key, fnargs[0]);
           break;
       case 2:
-          val = callMethod(obj, st.find(name), fnargs[0], fnargs[1]);
+          val = callMethod(obj, key, fnargs[0], fnargs[1]);
           break;
       case 3:
-          val = callMethod(obj, st.find(name), fnargs[0], fnargs[1],
-                           fnargs[2]);
+          val = callMethod(obj, key, fnargs[0], fnargs[1], fnargs[2]);
           break;
       default:
-          val = callMethod(obj, st.find(name));
+          val = callMethod(obj, key);
           break;
     }
-    
 
     std::string result;
     if (val.is_null()) {