gnash-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp serv...


From: Sandro Santilli
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp serv...
Date: Wed, 13 Dec 2006 10:13:16 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/13 10:13:15

Modified files:
        .              : ChangeLog 
        server/swf     : tag_loaders.cpp 
        server/vm      : ASHandlers.cpp 

Log message:
                * server/swf/tag_loaders.cpp: removed additional newlines in log
                  messages.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1926&r2=1.1927
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1926
retrieving revision 1.1927
diff -u -b -r1.1926 -r1.1927
--- ChangeLog   13 Dec 2006 09:38:16 -0000      1.1926
+++ ChangeLog   13 Dec 2006 10:13:15 -0000      1.1927
@@ -1,5 +1,10 @@
 2006-12-13 Sandro Santilli <address@hidden>
 
+       * server/swf/tag_loaders.cpp: removed additional newlines in log
+         messages.
+
+2006-12-13 Sandro Santilli <address@hidden>
+
        * server/sprite_instance.cpp (set_member): don't attempt to set the
          value of a character in the DisplayList, see VarAndCharClashTest.swf
          testcase; (get_member): give object members precedence over

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- server/swf/tag_loaders.cpp  10 Dec 2006 23:46:38 -0000      1.64
+++ server/swf/tag_loaders.cpp  13 Dec 2006 10:13:15 -0000      1.65
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: tag_loaders.cpp,v 1.64 2006/12/10 23:46:38 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.65 2006/12/13 10:13:15 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -246,7 +246,7 @@
            //bi = render::create_bitmap_info_rgb(im);
            //delete im;
 #else
-           log_error("gnash is not linked to jpeglib -- can't load jpeg image 
data!\n");
+           log_error("gnash is not linked to jpeglib -- can't load jpeg image 
data!");
            return;
 #endif
 
@@ -286,7 +286,7 @@
            //bi = render::create_bitmap_info_rgb(im);
            //delete im;
 #else
-           log_error("gnash is not linked to jpeglib -- can't load jpeg image 
data!\n");
+           log_error("gnash is not linked to jpeglib -- can't load jpeg image 
data!");
            return;
 #endif
 
@@ -324,7 +324,7 @@
 
     int err = inflateInit(&d_stream);
     if (err != Z_OK) {
-       log_error("inflate_wrapper() inflateInit() returned %d\n", err);
+       log_error("inflate_wrapper() inflateInit() returned %d", err);
        return;
     }
 
@@ -340,14 +340,14 @@
        if (err == Z_STREAM_END) break;
        if (err != Z_OK)
            {
-               log_error("inflate_wrapper() inflate() returned %d\n", err);
+               log_error("inflate_wrapper() inflate() returned %d", err);
            }
     }
 
     err = inflateEnd(&d_stream);
     if (err != Z_OK)
        {
-           log_error("inflate_wrapper() inflateEnd() return %d\n", err);
+           log_error("inflate_wrapper() inflateEnd() return %d", err);
        }
 }
 #endif // TU_CONFIG_LINK_TO_ZLIB
@@ -375,7 +375,7 @@
        {
 
 #if TU_CONFIG_LINK_TO_JPEGLIB == 0 || TU_CONFIG_LINK_TO_ZLIB == 0
-           log_error("gnash is not linked to jpeglib/zlib -- can't load 
jpeg/zipped image data!\n");
+           log_error("gnash is not linked to jpeglib/zlib -- can't load 
jpeg/zipped image data!");
            return;
 #else
            //
@@ -436,7 +436,7 @@
     if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
        {
 #if TU_CONFIG_LINK_TO_ZLIB == 0
-           log_error("gnash is not linked to zlib -- can't load zipped image 
data!\n");
+           log_error("gnash is not linked to zlib -- can't load zipped image 
data!");
            return;
 #else
            if (tag == SWF::DEFINELOSSLESS) // 20
@@ -665,7 +665,7 @@
 void
 fixme_loader(stream* /*in*/, tag_type tag, movie_definition* /*m*/)
 {
-    log_error("  FIXME: tagtype = %d\n", tag);
+    log_error("  FIXME: tagtype = %d", tag);
 }
 
 void define_shape_loader(stream* in, tag_type tag, movie_definition* m)
@@ -870,7 +870,7 @@
                        {
                                log_error("swf_event::read(), "
                                        "event_length = %d, "
-                                       "but read %lu\n",
+                                       "but read %lu",
                                        event_length,
                                        static_cast<unsigned 
long>(action.get_length()));
                                break;
@@ -905,7 +905,7 @@
                        // Let's see if the event flag we received is for an 
event that we know of
                        if ((pow(2.0, int( sizeof(s_code_bits) / 
sizeof(s_code_bits[0]) )) - 1) < flags)
                        {
-                               log_error("swf_event::read() -- unknown / 
unhandled event type received, flags = 0x%x\n", flags);
+                               log_error("swf_event::read() -- unknown / 
unhandled event type received, flags = 0x%x", flags);
                        }
 
                        for (int i = 0, mask = 1; i < 
int(sizeof(s_code_bits)/sizeof(s_code_bits[0])); i++, mask <<= 1)
@@ -915,7 +915,7 @@
                                        swf_event*      ev = new swf_event;
                                        ev->m_event = s_code_bits[i];
                                        ev->m_action_buffer = action;
-//                                     log_action("---- actions for event 
%s\n", ev->m_event.get_function_name().c_str());
+//                                     log_action("---- actions for event %s", 
ev->m_event.get_function_name().c_str());
 
                                        // hack
                                        if (i == 17)    // has keypress event ?
@@ -1032,7 +1032,7 @@
                        m_place_type = PLACE;
                }
                                 
-               //log_msg("place object at depth %i\n", m_depth);
+               //log_msg("place object at depth %i", m_depth);
        }
 
        // read SWF::PLACEOBJECT or SWF::PLACEOBJECT2
@@ -1128,7 +1128,7 @@
                  if (last_add) {
                      last_add->execute_state(m);
                  } else {
-                     log_error("reverse REPLACE can't find previous replace or 
add tag(%d, %d)\n",
+                     log_error("reverse REPLACE can't find previous replace or 
add tag(%d, %d)",
                                frame, m_depth);
                      
                  }
@@ -1259,7 +1259,7 @@
                }
            else
                {
-                   log_error("reverse REMOVE can't find previous replace or 
add tag(%d, %d)\n",
+                   log_error("reverse REMOVE can't find previous replace or 
add tag(%d, %d)",
                              frame, m_depth);
                                        
                }
@@ -1361,8 +1361,9 @@
                }
            else
                {
-                   log_error("export error: don't know how to export resource 
'%s'\n",
-                             symbol_name);
+                   log_error("export error: don't know how to export resource 
'%s' "
+                              "with id %d (can't find that id)",
+                             symbol_name, id);
                }
 
            delete [] symbol_name;
@@ -1398,13 +1399,13 @@
                try {
                        source_movie = create_library_movie(abs_url);
                } catch (gnash::GnashException& e) {
-                       log_error("%s\n", e.what());
+                       log_error("%s", e.what());
                        source_movie = NULL;
                }
                if (source_movie == NULL)
                {
                    // Give up on imports.
-                   log_error("can't import movie from url %s\n", 
abs_url.str().c_str());
+                   log_error("can't import movie from url %s", 
abs_url.str().c_str());
                    return;
                }
 
@@ -1412,7 +1413,7 @@
                // something smarter, if we agree on semantic
                if (source_movie == m)
                {
-                   log_warning("Won't let movie import it's own exported 
symbols... \n");
+                   log_warning("Won't let movie import it's own exported 
symbols... ");
                    return;
                }
        }
@@ -1440,7 +1441,7 @@
                    boost::intrusive_ptr<resource> res = 
source_movie->get_exported_resource(symbol_name);
                    if (res == NULL)
                        {
-                           log_warning("import error: could not find resource 
'%s' in movie '%s'\n",
+                           log_warning("import error: could not find resource 
'%s' in movie '%s'",
                                      symbol_name, source_url);
                        }
                    else if (font* f = res->cast_to_font())
@@ -1455,7 +1456,7 @@
                        }
                    else
                        {
-                           log_error("import error: resource '%s' from movie 
'%s' has unknown type\n",
+                           log_error("import error: resource '%s' from movie 
'%s' has unknown type",
                                      symbol_name, source_url);
                        }
                }
@@ -1591,7 +1592,7 @@
 
                if (! (sample_rate >= 0 && sample_rate <= 3))
                {
-                       gnash::log_error("Bad sample rate read from SWF 
header.\n");
+                       log_error("Bad sample rate read from SWF header.");
                        return;
                }
 
@@ -1676,7 +1677,7 @@
        {
                if (s_sound_handler)
                {
-                       log_error("start_sound_loader: sound_id %d is not 
defined\n", sound_id);
+                       log_error("start_sound_loader: sound_id %d is not 
defined", sound_id);
                }
        }
        
@@ -1727,7 +1728,7 @@
 
        if (! (sample_rate >= 0 && sample_rate <= 3))
        {
-               gnash::log_error("Bad sample rate read from SWF header.\n");
+               log_error("Bad sample rate read from SWF header.");
                return;
        }
 

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/vm/ASHandlers.cpp    10 Dec 2006 18:39:22 -0000      1.16
+++ server/vm/ASHandlers.cpp    13 Dec 2006 10:13:15 -0000      1.17
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: ASHandlers.cpp,v 1.16 2006/12/10 18:39:22 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.17 2006/12/13 10:13:15 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -750,7 +750,7 @@
        if (new_target == NULL)
        {
                IF_VERBOSE_ACTION (
-               log_action("ERROR: Couldn't find movie \"%s\" "
+               log_action("Couldn't find movie \"%s\" "
                        "to set target to! Not setting target at all...",
                        target_name.c_str());
                );




reply via email to

[Prev in Thread] Current Thread [Next in Thread]