[Gnash-commit] /srv/bzr/gnash/trunk r9503: Logging changes.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9503
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Sat 2008-07-19 10:18:03 +0200
message:
  Logging changes.
modified:
  server/as_environment.cpp
  server/sprite_instance.cpp
  server/vm/ASHandlers.cpp
    ------------------------------------------------------------
    revno: 9502.1.1
    committer: Benjamin Wolsey <address@hidden>
    branch nick: workingcopy
    timestamp: Sat 2008-07-19 10:16:30 +0200
    message:
      Correct logging message. Include <cstring> for std::strpbrk.
    modified:
      server/as_environment.cpp
    ------------------------------------------------------------
    revno: 9502.1.2
    committer: Benjamin Wolsey <address@hidden>
    branch nick: workingcopy
    timestamp: Sat 2008-07-19 10:17:17 +0200
    message:
      Log as error when an illegal depth is passed to attachMovie or
      duplicateMovieClip.
    modified:
      server/sprite_instance.cpp
      server/vm/ASHandlers.cpp

=== modified file 'server/as_environment.cpp'
--- a/server/as_environment.cpp 2008-07-05 00:03:30 +0000
+++ b/server/as_environment.cpp 2008-07-19 08:16:30 +0000
@@ -30,6 +30,7 @@
 #include "namedStrings.h"
 #include "as_function.h" // for 
as_environment::CallFrame::markReachableResources
 
+#include <cstring> // std::strpbrk
 #include <string>
 #include <utility> // for std::pair
 #include <boost/algorithm/string/case_conv.hpp>
@@ -223,7 +224,7 @@
     // Fallback.
     // FIXME, should this be log_error?  or log_swferror?
     IF_VERBOSE_ASCODING_ERRORS (
-    log_aserror(_("reference to unexisting variable '%s'"),
+    log_aserror(_("reference to non-existent variable '%s'"),
            varname);
     );
 
@@ -236,7 +237,7 @@
     const ScopeStack& scopeStack) 
     // varname must be a plain variable name; no path parsing.
 {
-       assert( ! strpbrk(varname.c_str(), ":/.") );
+       assert( ! std::strpbrk(varname.c_str(), ":/.") );
 
        string_table::key varkey = VM::get().getStringTable().find(varname);
        as_value        val;

=== modified file 'server/sprite_instance.cpp'
--- a/server/sprite_instance.cpp        2008-07-18 13:18:25 +0000
+++ b/server/sprite_instance.cpp        2008-07-19 08:17:17 +0000
@@ -248,6 +248,9 @@
   if (depth < character::lowerAccessibleBound ||
       depth > character::upperAccessibleBound)
   {
+    IF_VERBOSE_ASCODING_ERRORS(
+        log_aserror(_("MovieClip.attachMovie: invalid depth %d passed; not 
attaching"), depth);
+    );
     return as_value();
   }
   
@@ -541,6 +544,9 @@
   if (depth < character::lowerAccessibleBound ||
       depth > character::upperAccessibleBound)
   {
+    IF_VERBOSE_ASCODING_ERRORS(
+        log_aserror(_("MovieClip.duplicateMovieClip: invalid depth %d passed; 
not duplicating"), depth);
+    );  
     return as_value();
   }
   

=== modified file 'server/vm/ASHandlers.cpp'
--- a/server/vm/ASHandlers.cpp  2008-07-18 13:39:18 +0000
+++ b/server/vm/ASHandlers.cpp  2008-07-19 08:17:17 +0000
@@ -1163,6 +1163,9 @@
     if (depth < character::lowerAccessibleBound ||
       depth > character::upperAccessibleBound)
     {
+        IF_VERBOSE_ASCODING_ERRORS(
+            log_aserror(_("duplicateMovieClip: invalid depth %d passed; not 
duplicating"), depth);
+        );  
         env.drop(3);
         return;
     }