[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libamf/amf.h libbase/curl_adapt...
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] gnash ChangeLog libamf/amf.h libbase/curl_adapt... |
|
Date: |
Mon, 02 Oct 2006 16:28:12 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 06/10/02 16:28:12
Modified files:
. : ChangeLog
libamf : amf.h
libbase : curl_adapter.cpp log.h noseek_fd_adapter.cpp
triangulate_impl.h
server : ActionExec.cpp fontlib.cpp impl.cpp shm.cpp
xmlnode.cpp
server/parser : action_buffer.cpp button_character_def.cpp
movie_def_impl.cpp sprite_definition.cpp
sprite_definition.h
server/swf : ASHandlers.cpp tag_loaders.cpp
utilities : processor.cpp
Log message:
* libamf/amf.h: Prevent character type overflow warnings by
using int
type.
* libbase/log.h: Implement macro SIZET_FMT, to be used in
printf-like
functions in which a size_t modifier is desired. This prevents
compiler warnings.
* all over the place: Utilise SIZET_FMT to clear up compiler
warnings.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.990&r2=1.991
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/noseek_fd_adapter.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate_impl.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ActionExec.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fontlib.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/xmlnode.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.23&r2=1.24
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.990
retrieving revision 1.991
diff -u -b -r1.990 -r1.991
--- ChangeLog 2 Oct 2006 15:39:49 -0000 1.990
+++ ChangeLog 2 Oct 2006 16:28:11 -0000 1.991
@@ -1,3 +1,12 @@
+2006-10-02 Bastiaan Jacques <address@hidden>
+
+ * libamf/amf.h: Prevent character type overflow warnings by using int
+ type.
+ * libbase/log.h: Implement macro SIZET_FMT, to be used in printf-like
+ functions in which a size_t modifier is desired. This prevents
+ compiler warnings.
+ * all over the place: Utilise SIZET_FMT to clear up compiler warnings.
+
2006-10-02 Sandro Santilli <address@hidden>
* server/fontlib.cpp: minor cleanups.
Index: libamf/amf.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libamf/amf.h 29 Sep 2006 01:20:13 -0000 1.9
+++ libamf/amf.h 2 Oct 2006 16:28:11 -0000 1.10
@@ -76,7 +76,7 @@
} amfsource_e;
const char AMF_VERSION = 0;
-const char AMF_HEADSIZE_MASK = 0xc0;
+const int AMF_HEADSIZE_MASK = 0xc0;
const char AMF_INDEX_MASK = 0x03;
const int AMF_VIDEO_PACKET_SIZE = 128;
const int AMF_AUDIO_PACKET_SIZE = 64;
Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libbase/curl_adapter.cpp 29 Sep 2006 16:59:47 -0000 1.15
+++ libbase/curl_adapter.cpp 2 Oct 2006 16:28:11 -0000 1.16
@@ -34,7 +34,7 @@
// forward this exception.
//
-/* $Id: curl_adapter.cpp,v 1.15 2006/09/29 16:59:47 nihilus Exp $ */
+/* $Id: curl_adapter.cpp,v 1.16 2006/10/02 16:28:11 bjacques Exp $ */
#if defined(_WIN32) || defined(WIN32)
#define snprintf _snprintf
@@ -52,6 +52,7 @@
#include "tu_file.h"
#include "utility.h"
#include "GnashException.h"
+#include "log.h"
//#define GNASH_CURL_VERBOSE 1
@@ -207,8 +208,8 @@
char errmsg[256];
snprintf(errmsg, 255,
- "writing to cache file: requested %lu, wrote %lu (%s)",
- static_cast<unsigned long>(sz), static_cast<unsigned
long>(wrote), strerror(errno));
+ "writing to cache file: requested " SIZET_FMT ", wrote
" SIZET_FMT " (%s)",
+ sz, wrote, strerror(errno));
fprintf(stderr, "%s\n", errmsg);
throw gnash::GnashException(errmsg);
}
@@ -264,7 +265,7 @@
void
CurlStreamFile::printInfo()
{
- fprintf(stderr, "_cache.tell = %u\n", tell());
+ fprintf(stderr, "_cache.tell = " SIZET_FMT "\n", tell());
}
/*public*/
Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- libbase/log.h 23 Sep 2006 18:49:55 -0000 1.22
+++ libbase/log.h 2 Oct 2006 16:28:11 -0000 1.23
@@ -35,7 +35,7 @@
//
//
-/* $Id: log.h,v 1.22 2006/09/23 18:49:55 bjacques Exp $ */
+/* $Id: log.h,v 1.23 2006/10/02 16:28:11 bjacques Exp $ */
#ifndef GNASH_LOG_H
#define GNASH_LOG_H
@@ -58,6 +58,14 @@
#define TIMESTAMP_LENGTH 24 // timestamp length
#define TIMESTAMP_FORMAT "%Y-%m-%d %H:%M:%S " // timestamp format
+#if SIZEOF_SIZE_T == 8
+ #define SIZET_FMT "%lu"
+#elif SIZEOF_SIZE_T == 4
+ #define SIZET_FMT "%u"
+#else
+ #define SIZET_FMT "%z"
+#endif
+
namespace gnash {
extern std::ostream& stampon(std::ostream& x);
Index: libbase/noseek_fd_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/noseek_fd_adapter.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/noseek_fd_adapter.cpp 30 Sep 2006 00:10:36 -0000 1.3
+++ libbase/noseek_fd_adapter.cpp 2 Oct 2006 16:28:11 -0000 1.4
@@ -34,7 +34,7 @@
// forward this exception.
//
-/* $Id: noseek_fd_adapter.cpp,v 1.3 2006/09/30 00:10:36 nihilus Exp $ */
+/* $Id: noseek_fd_adapter.cpp,v 1.4 2006/10/02 16:28:11 bjacques Exp $ */
#if defined(_WIN32) || defined(WIN32)
#define snprintf _snprintf
@@ -52,6 +52,7 @@
#include "tu_file.h"
#include "utility.h"
#include "GnashException.h"
+#include "log.h"
#include <unistd.h>
//#define GNASH_NOSEEK_FD_VERBOSE 1
@@ -171,8 +172,8 @@
char errmsg[256];
snprintf(errmsg, 255,
- "writing to cache file: requested %lu, wrote %lu (%s)",
- static_cast<unsigned long>(sz), static_cast<unsigned
long>(wrote), strerror(errno));
+ "writing to cache file: requested " SIZET_FMT ", wrote
" SIZET_FMT " (%s)",
+ sz, wrote, strerror(errno));
fprintf(stderr, "%s\n", errmsg);
throw gnash::GnashException(errmsg);
}
@@ -214,8 +215,8 @@
ssize_t bytes_read = read(_fd, (void*)buf, bytes_needed);
if ( bytes_read == -1 )
{
- fprintf(stderr, "Error reading %lu bytes from input stream",
- static_cast<unsigned long>(bytes_needed));
+ fprintf(stderr, "Error reading " SIZET_FMT " bytes from input
stream",
+ bytes_needed);
}
if ( (size_t)bytes_read < bytes_needed )
@@ -241,7 +242,7 @@
void
NoSeekFile::printInfo()
{
- fprintf(stderr, "_cache.tell = %u\n", tell());
+ fprintf(stderr, "_cache.tell = " SIZET_FMT "\n", tell());
}
/*private*/
Index: libbase/triangulate_impl.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/triangulate_impl.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libbase/triangulate_impl.h 29 Sep 2006 10:00:01 -0000 1.18
+++ libbase/triangulate_impl.h 2 Oct 2006 16:28:11 -0000 1.19
@@ -24,12 +24,13 @@
// code, see the FIST web page at:
// http://www.cosy.sbg.ac.at/~held/projects/triang/triang.html
-/* $Id: triangulate_impl.h,v 1.18 2006/09/29 10:00:01 nihilus Exp $ */
+/* $Id: triangulate_impl.h,v 1.19 2006/10/02 16:28:11 bjacques Exp $ */
#include "utility.h"
#include "triangulate.h"
#include "tu_random.h"
#include "grid_index.h"
+#include "log.h"
#define PROFILE_TRIANGULATE
#ifdef PROFILE_TRIANGULATE
@@ -1873,7 +1874,8 @@
{
// 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 ("
SIZET_FMT \
+ "), dropping last value\n", i,
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.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/ActionExec.cpp 29 Sep 2006 10:00:01 -0000 1.30
+++ server/ActionExec.cpp 2 Oct 2006 16:28:11 -0000 1.31
@@ -34,7 +34,7 @@
// forward this exception.
//
-/* $Id: ActionExec.cpp,v 1.30 2006/09/29 10:00:01 nihilus Exp $ */
+/* $Id: ActionExec.cpp,v 1.31 2006/10/02 16:28:11 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -132,7 +132,9 @@
#if DEBUG_STACK
IF_VERBOSE_ACTION (
- 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()));
+ log_action("at ActionExec operator() start, pc=" SIZET_FMT
+ ", stop_pc=" SIZET_FMT ", code.size=%lu.", pc,
+ stop_pc, code.size());
stringstream ss;
env.dump_stack(ss);
env.dump_global_registers(ss);
@@ -182,7 +184,7 @@
#if DEBUG_STACK
IF_VERBOSE_ACTION (
- log_action( " PC is now %lu.", static_cast<unsigned long>(pc));
+ log_action( " PC is now " SIZET_FMT ".", pc);
stringstream ss;
env.dump_stack(ss);
env.dump_global_registers(ss);
@@ -212,9 +214,10 @@
if ( next_pc >= stop_pc )
{
log_error("End of DoAction block hit while skipping "
- " %u action tags (pc:%u, stop_pc:%u) - "
- "Malformed SWF ? (WaitForFrame, probably)",
- offset, next_pc, stop_pc);
+ SIZET_FMT " action tags (pc:" SIZET_FMT
+ ", stop_pc:" SIZET_FMT ") - Mallformed SWF ?"
+ "(WaitForFrame, probably)", offset, next_pc,
+ stop_pc);
next_pc = stop_pc;
return;
}
Index: server/fontlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fontlib.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/fontlib.cpp 2 Oct 2006 15:39:49 -0000 1.21
+++ server/fontlib.cpp 2 Oct 2006 16:28:11 -0000 1.22
@@ -5,7 +5,7 @@
// A module to take care of all of gnash's loaded fonts.
-/* $Id: fontlib.cpp,v 1.21 2006/10/02 15:39:49 strk Exp $ */
+/* $Id: fontlib.cpp,v 1.22 2006/10/02 16:28:11 bjacques Exp $ */
#include "container.h"
#include "tu_file.h"
@@ -1137,7 +1137,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, static_cast<unsigned long>(fonts.size()));
+ log_error("mismatched font count (read %d, expected "
SIZET_FMT ") in cached font data\n", nf, fonts.size());
in->go_to_end();
goto error_exit;
}
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/impl.cpp 2 Oct 2006 09:28:51 -0000 1.60
+++ server/impl.cpp 2 Oct 2006 16:28:11 -0000 1.61
@@ -129,7 +129,7 @@
#endif
static bool
-s_use_cache_files = true;
+s_use_cache_files = false;
// Enable/disable attempts to read cache files when loading
// movies.
@@ -859,7 +859,7 @@
else if (m->get_current_frame() < last_frame)
{
// Hm, apparently we looped back. Skip ahead...
- log_error("loop back; jumping to frame %u\n", last_frame);
+ log_error("loop back; jumping to frame " SIZET_FMT "\n",
last_frame);
m->goto_frame(last_frame + 1);
}
else
Index: server/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shm.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/shm.cpp 29 Sep 2006 10:00:01 -0000 1.20
+++ server/shm.cpp 2 Oct 2006 16:28:11 -0000 1.21
@@ -275,8 +275,8 @@
#endif // end of HAVE_SHM_OPEN
#endif // end of FLAT_ADDR_SPACE
- log_msg("Opened Shared Memory segment \"%s\": %lu bytes at %p.\n",
- filespec, static_cast<unsigned long>(_size), _addr);
+ log_msg("Opened Shared Memory segment \"%s\": " SIZET_FMT " bytes at
%p.\n",
+ filespec, _size, _addr);
}
if (nuke) {
Index: server/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/xmlnode.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/xmlnode.cpp 2 Oct 2006 13:16:21 -0000 1.19
+++ server/xmlnode.cpp 2 Oct 2006 16:28:11 -0000 1.20
@@ -36,7 +36,7 @@
//
//
-/* $Id: xmlnode.cpp,v 1.19 2006/10/02 13:16:21 nihilus Exp $ */
+/* $Id: xmlnode.cpp,v 1.20 2006/10/02 16:28:11 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -279,8 +279,8 @@
as_object *
XMLNode::previousSibling(int x)
{
- log_msg("%s: partially implemented. %lu objects\n",
- __PRETTY_FUNCTION__, static_cast<unsigned long>(_objects.size()));
+ log_msg("%s: partially implemented. " SIZET_FMT " objects\n",
+ __PRETTY_FUNCTION__, _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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/parser/action_buffer.cpp 29 Sep 2006 10:00:01 -0000 1.6
+++ server/parser/action_buffer.cpp 2 Oct 2006 16:28:11 -0000 1.7
@@ -34,7 +34,7 @@
// forward this exception.
//
-/* $Id: action_buffer.cpp,v 1.6 2006/09/29 10:00:01 nihilus Exp $ */
+/* $Id: action_buffer.cpp,v 1.7 2006/10/02 16:28:11 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -125,10 +125,8 @@
}
if (m_decl_dict_processed_at != -1) {
- log_error("process_decl_dict(%lu, %lu): decl_dict was already processed
at %d\n",
- static_cast<unsigned long>(start_pc),
- static_cast<unsigned long>(stop_pc),
- m_decl_dict_processed_at);
+ log_error("process_decl_dict(" SIZET_FMT ", " SIZET_FMT "): decl_dict
was already processed at %d\n",
+ start_pc, stop_pc, m_decl_dict_processed_at);
return;
}
Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/parser/button_character_def.cpp 20 Sep 2006 12:55:58 -0000
1.2
+++ server/parser/button_character_def.cpp 2 Oct 2006 16:28:11 -0000
1.3
@@ -142,7 +142,7 @@
log_parse(" in_point = %d", m_in_point);
log_parse(" out_point = %d", m_out_point);
log_parse(" loop_count = %d", m_loop_count);
- log_parse(" envelope size = %u", m_envelopes.size());
+ log_parse(" envelope size = " SIZET_FMT , m_envelopes.size());
);
}
Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/parser/movie_def_impl.cpp 2 Oct 2006 14:04:03 -0000 1.23
+++ server/parser/movie_def_impl.cpp 2 Oct 2006 16:28:11 -0000 1.24
@@ -641,7 +641,7 @@
IF_VERBOSE_PARSE(
m_frame_size.print();
- log_parse("frame rate = %f, frames = %d",
+ log_parse("frame rate = %f, frames = " SIZET_FMT,
m_frame_rate, m_frame_count);
);
@@ -926,7 +926,7 @@
#endif
if ( ! ensure_frame_loaded(nextframe) )
{
- log_error("Could not advance to frame %d!",
+ log_error("Could not advance to frame " SIZET_FMT "!",
nextframe);
// these kind of errors should be handled by callers
assert(0);
Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/parser/sprite_definition.cpp 23 Sep 2006 16:22:43 -0000 1.2
+++ server/parser/sprite_definition.cpp 2 Oct 2006 16:28:11 -0000 1.3
@@ -99,7 +99,7 @@
m_playlist.resize(m_frame_count);
IF_VERBOSE_PARSE (
- log_parse(" frames = %u", m_frame_count);
+ log_parse(" frames = " SIZET_FMT, m_frame_count);
);
m_loading_frame = 0;
@@ -155,8 +155,8 @@
size_t currently_assigned = 0;
if (m_named_frames.get(n, ¤tly_assigned) == true)
{
- log_error("add_frame_name(%d, '%s') -- frame name "
- "already assigned to frame %u; overriding\n",
+ log_error("add_frame_name(" SIZET_FMT ", '%s') -- frame name "
+ "already assigned to frame " SIZET_FMT "; overriding\n",
m_loading_frame,
name, currently_assigned);
}
Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/parser/sprite_definition.h 25 Sep 2006 15:17:42 -0000 1.2
+++ server/parser/sprite_definition.h 2 Oct 2006 16:28:11 -0000 1.3
@@ -339,8 +339,8 @@
while ( m_loading_frame < framenum )
{
log_msg("sprite_definition: "
- "loading of frame %u requested "
- "(we are at %u/%u)",
+ "loading of frame " SIZET_FMT " requested "
+ "(we are at " SIZET_FMT "/" SIZET_FMT ")",
framenum, m_loading_frame, m_frame_count);
// Could this ever happen ?
assert(0);
Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- server/swf/ASHandlers.cpp 29 Sep 2006 10:00:02 -0000 1.70
+++ server/swf/ASHandlers.cpp 2 Oct 2006 16:28:11 -0000 1.71
@@ -34,7 +34,7 @@
// forward this exception.
//
-/* $Id: ASHandlers.cpp,v 1.70 2006/09/29 10:00:02 nihilus Exp $ */
+/* $Id: ASHandlers.cpp,v 1.71 2006/10/02 16:28:11 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -690,7 +690,8 @@
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, static_cast<unsigned
long>(tag_len));
+ log_warning("Malformed SWF: ActionWaitForFrame (0x%X) tag
length == " SIZET_FMT
+ " (expected 3)", SWF::ACTION_WAITFORFRAME, tag_len);
}
// If we haven't loaded a specified frame yet, then
@@ -1766,11 +1767,9 @@
if (next_pc > stop_pc)
{
- log_error("branch to offset %lu -- "
- " this section only runs to %lu. "
- " Malformed SWF !.",
- static_cast<unsigned long>(next_pc),
- static_cast<unsigned long>(stop_pc));
+ log_error("branch to offset " SIZET_FMT " -- "
+ " this section only runs to " SIZET_FMT ". "
+ " Malformed SWF !.", next_pc, stop_pc);
}
}
}
@@ -2888,8 +2887,8 @@
size_t next_pc = thread.next_pc;
IF_VERBOSE_ACTION (
- log_action("-------------- with block start: stack size is %lu",
- static_cast<unsigned long>(with_stack.size()));
+ log_action("-------------- with block start: stack size is " SIZET_FMT,
+ with_stack.size());
);
if (with_stack.size() < 8)
@@ -3028,7 +3027,8 @@
{
if ( static_cast<size_t>(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()));
+ log_error("at SWFHandlers::action_name(%d) call time, _handlers
size is "
+ SIZET_FMT, x, get_handlers().size());
return NULL;
}
else
@@ -3045,9 +3045,9 @@
size_t missing = required-env.stack_size();
- log_error("Stack underrun: %lu elements required, %lu available. "
- "Fixing by pushing %lu undefined values on the missing slots.",
- static_cast<unsigned long>(required), static_cast<unsigned
long>(env.stack_size()), static_cast<unsigned long>(missing));
+ log_error("Stack underrun: " SIZET_FMT " elements required, " SIZET_FMT
+ " available. Fixing by pushing " SIZET_FMT " undefined values on the"
+ " missing slots.", required, env.stack_size(), missing);
for (size_t i=0; i<missing; ++i)
{
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/swf/tag_loaders.cpp 26 Sep 2006 08:40:23 -0000 1.50
+++ server/swf/tag_loaders.cpp 2 Oct 2006 16:28:12 -0000 1.51
@@ -36,7 +36,7 @@
//
//
-/* $Id: tag_loaders.cpp,v 1.50 2006/09/26 08:40:23 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.51 2006/10/02 16:28:12 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -165,8 +165,8 @@
}
else
{
- log_warning("frame_label_loader end position %d, "
- "read up to %d (Malformed SWF?)",
+ log_warning("frame_label_loader end position " SIZET_FMT ", "
+ "read up to " SIZET_FMT " (Malformed SWF?)",
end_tag, curr_pos);
}
}
@@ -1507,7 +1507,7 @@
IF_VERBOSE_PARSE
(
log_parse("tag %d: do_action_loader", tag);
- log_parse("-- actions in frame %d",
+ log_parse("-- actions in frame " SIZET_FMT,
m->get_loading_frame());
);
Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- utilities/processor.cpp 29 Sep 2006 10:00:02 -0000 1.23
+++ utilities/processor.cpp 2 Oct 2006 16:28:12 -0000 1.24
@@ -37,7 +37,7 @@
//
//
-/* $Id: processor.cpp,v 1.23 2006/09/29 10:00:02 nihilus Exp $ */
+/* $Id: processor.cpp,v 1.24 2006/10/02 16:28:12 bjacques Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -301,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", static_cast<unsigned
long>(last_frame));
+ printf("loop back; jumping to frame " SIZET_FMT "\n", last_frame);
m->goto_frame(last_frame + 1);
} else {
kick_count = 0;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libamf/amf.h libbase/curl_adapt...,
Bastiaan Jacques <=