[Gnash-commit] gnash ChangeLog libbase/log.cpp libbase/log.h s...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/21 20:22:59

Modified files:
        .              : ChangeLog 
        libbase        : log.cpp log.h 
        server/asobj   : Global.cpp 
        server/vm      : ASHandlers.cpp 

Log message:
                * libbase/log.{cpp,h}: add log_debug and used
                  for GNASH_REPORT_FUNCTION.
                * server/asobj/Global.cpp, server/vm/ASHandlers.cpp:
                  Changed trace() function to use log_trace.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2426&r2=1.2427
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.38&r2=1.39

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2426
retrieving revision 1.2427
diff -u -b -r1.2426 -r1.2427
--- ChangeLog   21 Feb 2007 19:18:45 -0000      1.2426
+++ ChangeLog   21 Feb 2007 20:22:58 -0000      1.2427
@@ -1,3 +1,10 @@
+2007-02-21 Sandro Santilli <address@hidden>
+
+       * libbase/log.{cpp,h}: add log_debug and used
+         for GNASH_REPORT_FUNCTION.
+       * server/asobj/Global.cpp, server/vm/ASHandlers.cpp:
+         Changed trace() function to use log_trace.
+
 2007-02-21 Tomas Groth Christensen <address@hidden>
 
        * backend/sound_handler_{gst,sdl}.cpp: Removed newline from warnings, 
and 

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- libbase/log.cpp     5 Feb 2007 00:06:51 -0000       1.43
+++ libbase/log.cpp     21 Feb 2007 20:22:58 -0000      1.44
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: log.cpp,v 1.43 2007/02/05 00:06:51 nihilus Exp $ */
+/* $Id: log.cpp,v 1.44 2007/02/21 20:22:58 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -188,6 +188,24 @@
 }
 
 void
+log_debug(const char* fmt, ...)
+{
+    LogFile& dbglogfile = LogFile::getDefaultInstance();
+
+    va_list ap;
+    char tmp[BUFFER_SIZE];
+    
+    va_start (ap, fmt);
+    //vsprintf (tmp, fmt, ap);
+    vsnprintf (tmp, BUFFER_SIZE, fmt, ap);
+    tmp[BUFFER_SIZE-1] = '\0';
+    
+    dbglogfile << "DEBUG: " << tmp << endl;
+    
+    va_end (ap);
+}
+
+void
 log_action(const char* fmt, ...)
 {
     LogFile& dbglogfile = LogFile::getDefaultInstance();
@@ -597,7 +615,7 @@
     _logentry += ": ";
 
     // See if we have the TRACE keyword
-    if (strstr(str, "TRACE:")) {
+    if (strstr(str, "DEBUG:")) {
        _trace = true;
     }    
 

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- libbase/log.h       30 Jan 2007 02:02:28 -0000      1.41
+++ libbase/log.h       21 Feb 2007 20:22:59 -0000      1.42
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: log.h,v 1.41 2007/01/30 02:02:28 rsavoye Exp $ */
+/* $Id: log.h,v 1.42 2007/02/21 20:22:59 strk Exp $ */
 
 #ifndef GNASH_LOG_H
 #define GNASH_LOG_H
@@ -175,6 +175,7 @@
 DSOEXPORT void log_error(const char* fmt, ...) __attribute__((format (printf, 
1, 2)));
 DSOEXPORT void log_warning(const char* fmt, ...) __attribute__((format 
(printf, 1, 2)));
 DSOEXPORT void log_trace(const char* fmt, ...) __attribute__((format (printf, 
1, 2)));
+DSOEXPORT void log_debug(const char* fmt, ...) __attribute__((format (printf, 
1, 2)));
 DSOEXPORT void log_action(const char* fmt, ...) __attribute__((format (printf, 
1, 2)));
 DSOEXPORT void log_parse(const char* fmt, ...) __attribute__((format (printf, 
1, 2)));
 DSOEXPORT void log_security(const char* fmt, ...) __attribute__((format 
(printf, 1, 2)));
@@ -186,6 +187,7 @@
 DSOEXPORT void log_error(const char* fmt, ...);
 DSOEXPORT void log_warning(const char* fmt, ...);
 DSOEXPORT void log_trace(const char* fmt, ...);
+DSOEXPORT void log_debug(const char* fmt, ...);
 DSOEXPORT void log_action(const char* fmt, ...);
 DSOEXPORT void log_parse(const char* fmt, ...);
 DSOEXPORT void log_security(const char* fmt, ...);
@@ -239,22 +241,22 @@
     // Only print function tracing messages when tmultiplewo -v
     // options have been supplied. 
     __Host_Function_Report__(void) {
-       log_trace("entering");
+       log_debug("entering");
     }
 
     __Host_Function_Report__(char *_func) {
        func = _func;
-       log_trace("%s enter", func);
+       log_debug("%s enter", func);
     }
 
     __Host_Function_Report__(const char *_func) {
        func = _func;
-       log_trace("%s enter", func);
+       log_debug("%s enter", func);
     }
 
     ~__Host_Function_Report__(void) {
        if (LogFile::getDefaultInstance().getVerbosity() >= TRACELEVEL+1) {
-           log_trace("returning");
+           log_debug("returning");
        }
     }
 };
@@ -265,10 +267,10 @@
 #define GNASH_REPORT_RETURN
 #else
 #define GNASH_REPORT_FUNCTION \
-    log_trace("entering")
+    log_debug("entering")
 
 #define GNASH_REPORT_RETURN \
-    log_trace("returning")
+    log_debug("returning")
 #endif
 
 }

Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/asobj/Global.cpp     14 Feb 2007 09:41:38 -0000      1.44
+++ server/asobj/Global.cpp     21 Feb 2007 20:22:59 -0000      1.45
@@ -18,7 +18,7 @@
 
 // Implementation of the Global ActionScript Object
 
-/* $Id: Global.cpp,v 1.44 2007/02/14 09:41:38 tgc Exp $ */
+/* $Id: Global.cpp,v 1.45 2007/02/21 20:22:59 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -100,7 +100,7 @@
     // @@ Nothing needs special treatment,
     //    as_value::to_string() will take care of everything
     const char* arg0 = fn.arg(0).to_string();
-    log_msg("%s\n", arg0);
+    log_trace("%s", arg0);
 }
 
 

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/vm/ASHandlers.cpp    21 Feb 2007 17:13:44 -0000      1.38
+++ server/vm/ASHandlers.cpp    21 Feb 2007 20:22:59 -0000      1.39
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.38 2007/02/21 17:13:44 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.39 2007/02/21 20:22:59 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1215,9 +1215,7 @@
 
     thread.ensureStack(1); 
 
-    // strk: why not using pop() ?
-    dbglogfile << env.top(0).to_string() << endl;
-    env.drop(1);
+    log_trace(env.pop().to_string());
 }
 
 void