[Gnash-commit] gnash ChangeLog libbase/triangulate_impl.h serv...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/09/29 09:40:46

Modified files:
        .              : ChangeLog 
        libbase        : triangulate_impl.h 
        server         : ActionExec.cpp fontlib.cpp shm.cpp xmlnode.cpp 
        server/parser  : action_buffer.cpp 
        server/swf     : ASHandlers.cpp 
        utilities      : processor.cpp 

Log message:
        Added static_cast<unsigned long> for %lu.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.961&r2=1.962
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate_impl.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ActionExec.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fontlib.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/xmlnode.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.21&r2=1.22

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.961
retrieving revision 1.962
diff -u -b -r1.961 -r1.962
--- ChangeLog   29 Sep 2006 09:37:30 -0000      1.961
+++ ChangeLog   29 Sep 2006 09:40:45 -0000      1.962
@@ -1,10 +1,9 @@
-2006-09-29 Sandro Santilli  <address@hidden>
-
-       * libbase/triangulate_impl.h: static_cast size_t types to
-         unsigned long when using printf family of functions.
-
 2006-09-29 Markus Gothe <address@hidden>
 
+       * libbase/triangulate_impl.h, server/ActionExec.cpp, server/fontlib.cpp
+         server/shm.cpp, server/xmlnode.cpp, server/parser/action_buffer.cpp,
+         server/swf/ASHandlers.cpp, utilities/processor.cpp: Added
+         static_cast<unsigned long> for %lu.
        * gui/Player.h, server/action.h, server/as_value.h, server/asobj/Key.h,
          server/movie_root.h, server/gnash.h, libbase/curl_adapter.h: 
          Added DSOEXPORT.

Index: libbase/triangulate_impl.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/triangulate_impl.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libbase/triangulate_impl.h  29 Sep 2006 09:37:30 -0000      1.16
+++ libbase/triangulate_impl.h  29 Sep 2006 09:40:45 -0000      1.17
@@ -24,6 +24,7 @@
 // code, see the FIST web page at:
 // http://www.cosy.sbg.ac.at/~held/projects/triang/triang.html
 
+/* $Id: triangulate_impl.h,v 1.17 2006/09/29 09:40:45 nihilus Exp $ */
 
 #include "utility.h"
 #include "triangulate.h"
@@ -1872,7 +1873,7 @@
                {
                        // Bad input, odd number of coords.
                        assert(0);
-                       fprintf(stderr, "path[%d] has odd number of coords 
(%lu), dropping last value\n", i, static_cast<unsigned 
long>(path.size()));//xxxx
+                       fprintf(stderr, "path[%d] has odd number of coords 
(%lu), dropping last value\n", i, static_cast<unsigned long>path.size());//xxxx
                        path_size--;
                }
                for (int j = 0; j < path_size; j += 2)  // vertex coords come 
in pairs.

Index: server/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/ActionExec.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/ActionExec.cpp       29 Sep 2006 01:33:21 -0000      1.28
+++ server/ActionExec.cpp       29 Sep 2006 09:40:45 -0000      1.29
@@ -34,6 +34,8 @@
 // forward this exception.
 //
 
+/* $Id: ActionExec.cpp,v 1.29 2006/09/29 09:40:45 nihilus Exp $ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -130,7 +132,7 @@
 
 #if DEBUG_STACK
        IF_VERBOSE_ACTION (
-               log_action("at ActionExec operator() start, pc=%lu, 
stop_pc=%lu, code.size=%lu.", pc, stop_pc, code.size());
+               log_action("at ActionExec operator() start, pc=%lu, 
stop_pc=%lu, code.size=%lu.", static_cast<unsigned long>pc, 
static_cast<unsigned long>stop_pc, static_cast<unsigned long>code.size());
                stringstream ss;
                env.dump_stack(ss);
                env.dump_global_registers(ss);
@@ -180,7 +182,7 @@
 
 #if DEBUG_STACK
        IF_VERBOSE_ACTION (
-               log_action( " PC is now %lu.", pc);
+               log_action( " PC is now %lu.", static_cast<unsigned long>pc);
                stringstream ss;
                env.dump_stack(ss);
                env.dump_global_registers(ss);

Index: server/fontlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fontlib.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/fontlib.cpp  29 Sep 2006 01:33:21 -0000      1.17
+++ server/fontlib.cpp  29 Sep 2006 09:40:45 -0000      1.18
@@ -5,6 +5,7 @@
 
 // A module to take care of all of gnash's loaded fonts.
 
+/* $Id: fontlib.cpp,v 1.18 2006/09/29 09:40:45 nihilus Exp $ */
 
 #include "container.h"
 #include "tu_file.h"
@@ -1143,7 +1144,7 @@
                if (nf != (int) fonts.size())
                {
                        // Font counts must match!
-                       log_error("mismatched font count (read %d, expected 
%lu) in cached font data\n", nf, fonts.size());
+                       log_error("mismatched font count (read %d, expected 
%lu) in cached font data\n", nf, static_cast<unsigned long>fonts.size());
                        in->go_to_end();
                        goto error_exit;
                }

Index: server/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shm.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/shm.cpp      29 Sep 2006 02:39:46 -0000      1.18
+++ server/shm.cpp      29 Sep 2006 09:40:45 -0000      1.19
@@ -276,7 +276,7 @@
 #endif // end of FLAT_ADDR_SPACE
     
        log_msg("Opened Shared Memory segment \"%s\": %lu bytes at %p.\n",
-               filespec, _size, _addr);
+               filespec, static_cast<unsigned long>_size, _addr);
        }
     
        if (nuke) {

Index: server/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/xmlnode.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/xmlnode.cpp  29 Sep 2006 02:36:13 -0000      1.16
+++ server/xmlnode.cpp  29 Sep 2006 09:40:45 -0000      1.17
@@ -36,6 +36,8 @@
 //
 //
 
+/* $Id: xmlnode.cpp,v 1.17 2006/09/29 09:40:45 nihilus Exp $ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -279,7 +281,7 @@
 XMLNode::previousSibling(int x)
 {
     log_msg("%s: partially implemented. %lu objects\n",
-           __PRETTY_FUNCTION__,  _objects.size());
+           __PRETTY_FUNCTION__,  static_cast<unsigned long>_objects.size());
     if (_objects.size() > 0) {
        return _objects[x-1];
     }

Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/parser/action_buffer.cpp     29 Sep 2006 01:33:21 -0000      1.4
+++ server/parser/action_buffer.cpp     29 Sep 2006 09:40:45 -0000      1.5
@@ -34,6 +34,8 @@
 // forward this exception.
 //
 
+/* $Id: action_buffer.cpp,v 1.5 2006/09/29 09:40:45 nihilus Exp $ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -124,8 +126,8 @@
     
     if (m_decl_dict_processed_at != -1)        {
        log_error("process_decl_dict(%lu, %lu): decl_dict was already processed 
at %d\n",
-                 start_pc,
-                 stop_pc,
+                 static_cast<unsigned long>start_pc,
+                 static_cast<unsigned long>stop_pc,
                  m_decl_dict_processed_at);
        return;
     }

Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/swf/ASHandlers.cpp   29 Sep 2006 01:33:21 -0000      1.68
+++ server/swf/ASHandlers.cpp   29 Sep 2006 09:40:46 -0000      1.69
@@ -34,6 +34,8 @@
 // forward this exception.
 //
 
+/* $Id: ASHandlers.cpp,v 1.69 2006/09/29 09:40:46 nihilus Exp $ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -688,7 +690,7 @@
        size_t tag_len = code.read_int16(thread.pc+1);
        if ( tag_len != 3 )
        {
-               log_warning("Malformed SWF: ActionWaitForFrame (0x%X) tag 
length == %lu (expected 3)", SWF::ACTION_WAITFORFRAME, tag_len);
+               log_warning("Malformed SWF: ActionWaitForFrame (0x%X) tag 
length == %lu (expected 3)", SWF::ACTION_WAITFORFRAME, static_cast<unsigned 
long>tag_len);
        }
 
        // If we haven't loaded a specified frame yet, then 
@@ -1767,8 +1769,8 @@
                        log_error("branch to offset %lu -- "
                                " this section only runs to %lu. "
                                " Malformed SWF !.",
-                               next_pc,
-                               stop_pc);
+                               static_cast<unsigned long>next_pc,
+                               static_cast<unsigned long>stop_pc);
                }
        }
 }
@@ -2887,7 +2889,7 @@
 
        IF_VERBOSE_ACTION (
        log_action("-------------- with block start: stack size is %lu",
-               with_stack.size());
+               static_cast<unsigned long>with_stack.size());
        );
 
        if (with_stack.size() < 8)
@@ -3026,7 +3028,7 @@
 {
        if ( static_cast<size_t>(x) > get_handlers().size() )
        {
-               log_error("at SWFHandlers::action_name(%d) call time, _handlers 
size is %lu", x, get_handlers().size());
+               log_error("at SWFHandlers::action_name(%d) call time, _handlers 
size is %lu", x, static_cast<unsigned long>get_handlers().size());
                return NULL;
        }
        else
@@ -3045,7 +3047,7 @@
 
     log_error("Stack underrun: %lu elements required, %lu available. "
         "Fixing by pushing %lu undefined values on the missing slots.",
-        required, env.stack_size(), missing);
+        static_cast<unsigned long>required, static_cast<unsigned 
long>env.stack_size(), static_cast<unsigned long>missing);
 
     for (size_t i=0; i<missing; ++i)
     {

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- utilities/processor.cpp     29 Sep 2006 01:39:51 -0000      1.21
+++ utilities/processor.cpp     29 Sep 2006 09:40:46 -0000      1.22
@@ -37,6 +37,8 @@
 //
 //
 
+/* $Id: processor.cpp,v 1.22 2006/09/29 09:40:46 nihilus Exp $ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -299,7 +301,7 @@
            }
        } else if (m->get_current_frame() < last_frame) {
            // Hm, apparently we looped back.  Skip ahead...
-           printf("loop back; jumping to frame %lu\n", last_frame);
+           printf("loop back; jumping to frame %lu\n", static_cast<unsigned 
long>last_frame);
            m->goto_frame(last_frame + 1);
        } else {
            kick_count = 0;