[Gnash-commit] gnash ChangeLog server/action.cpp server/swf/AS...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/07 11:55:01

Modified files:
        .              : ChangeLog 
        server         : action.cpp 
        server/swf     : ASHandlers.cpp 

Log message:
        (Fwd port)
                * server/action.cpp, server/swf/ASHandlers.cpp: turn
                  more actionscript coding errors into warning and
                  wrap them in IF_VERBOSE_ASCODING_ERRORS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1543&r2=1.1544
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action.cpp?cvsroot=gnash&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.89&r2=1.90

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1543
retrieving revision 1.1544
diff -u -b -r1.1543 -r1.1544
--- ChangeLog   7 Nov 2006 10:12:49 -0000       1.1543
+++ ChangeLog   7 Nov 2006 11:55:01 -0000       1.1544
@@ -1,5 +1,11 @@
 2006-11-07 Sandro Santilli <address@hidden>
 
+       * server/action.cpp, server/swf/ASHandlers.cpp: turn
+         more actionscript coding errors into warning and
+         wrap them in IF_VERBOSE_ASCODING_ERRORS.
+
+2006-11-07 Sandro Santilli <address@hidden>
+
        * server/parser/movie_def_impl.cpp: fix support
          for completely disabling using a separate
          thread for loading (just undef the

Index: server/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- server/action.cpp   29 Oct 2006 18:34:11 -0000      1.106
+++ server/action.cpp   7 Nov 2006 11:55:01 -0000       1.107
@@ -244,10 +244,12 @@
        }
        else
        {
-               log_error(
+                       IF_VERBOSE_ASCODING_ERRORS(
+               log_warning(
                        "error in call_method(): "
                        "'%s' is neither a C nor an ActionScript function\n",
                        method.to_string());
+                       );
        }
 
        return val;

Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/swf/ASHandlers.cpp   5 Nov 2006 20:10:12 -0000       1.89
+++ server/swf/ASHandlers.cpp   7 Nov 2006 11:55:01 -0000       1.90
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: ASHandlers.cpp,v 1.89 2006/11/05 20:10:12 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.90 2006/11/07 11:55:01 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2008,8 +2008,10 @@
                if (function.get_type() != as_value::AS_FUNCTION &&
                    function.get_type() != as_value::C_FUNCTION)
                {
-                   log_error("error in call_function: '%s' is not a function",
-                             function_name.c_str());
+                       IF_VERBOSE_ASCODING_ERRORS(
+                   log_warning("error in call_function: '%s' is not a "
+                               "function", function_name.c_str());
+                       );
                }
        }
        else
@@ -2550,25 +2552,40 @@
 
     }
 
-    if (!obj) {
-        log_error("call_method invoked in something that "
+    if (!obj)
+    {
+        IF_VERBOSE_ASCODING_ERRORS(
+          log_warning("call_method invoked in something that "
                   "doesn't cast to an as_object: %s",
                   obj_value.to_string());
-    } else {
+        );
+    }
+    else
+    {
         as_value method;
-        if (obj->get_member(method_name, &method)) {
+        if (obj->get_member(method_name, &method))
+        {
             if (method.get_type() != as_value::AS_FUNCTION &&
-                method.get_type() != as_value::C_FUNCTION) {
-                log_error("call_method: '%s' is not a method",
+              method.get_type() != as_value::C_FUNCTION)
+          {
+              IF_VERBOSE_ASCODING_ERRORS(
+                log_warning("call_method: '%s' is not a method",
                           method_name.c_str());
-            } else {
+              );
+          }
+          else
+          {
                 result = call_method( method, &env, obj, nargs,
                                       env.get_top_index() - 3);
             }
-        } else {
-            log_error("call_method can't find method %s "
+        }
+        else
+        {
+            IF_VERBOSE_ASCODING_ERRORS(
+                log_warning("call_method can't find method %s "
                       "for object %s (%p)", method_name.c_str(), 
                       typeid(*obj).name(), (void*)obj);
+            );
         }
     }