[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash configure.ac ChangeLog plugin/klash/Makef...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash configure.ac ChangeLog plugin/klash/Makef... |
|
Date: |
Sun, 06 Aug 2006 02:00:55 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 06/08/06 02:00:54
Modified files:
. : configure.ac ChangeLog
plugin/klash : Makefile.am
macros : kde.m4
libbase : Thread.cpp container.cpp container.h
curl_adapter.cpp jpeg.cpp log.cpp log.h
membuf.cpp network.cpp rc.cpp
triangulate_impl.h tu_file.cpp utility.cpp
zlib_adapter.cpp
libgeometry : axial_box.h collision.cpp kd_tree_dynamic.cpp
kd_tree_packed.cpp
server : ActionExec.cpp MovieClip.cpp action_buffer.cpp
as_environment.h button.cpp dlist.cpp font.cpp
fontlib.cpp movie.h movie_root.cpp
shape_character_def.cpp shm.cpp sound.cpp
sprite_definition.cpp sprite_instance.cpp
sprite_instance.h xml.cpp xmlnode.cpp
xmlsocket.cpp
server/asobj : NetConnection.cpp NetConnection.h
server/swf : ASHandlers.cpp
utilities : parser.cpp
Log message:
* configure.ac: Rewrite strcasecmp to use AC_TRY_COMPILE instead
of AC_CHECK_HEADER which keeps failing on FC5-x86.
* libbase/container.cpp, container.h, jpeg.cpp, membuf.cpp,
network.cpp, rc.cpp, triangulate_impl.h, tu_file.cpp,
utility.cpp,
zlib_adapter.cpp, axial_box.h, collision.cpp: Minor tweaks to
remove compiler warnings with the latest GCC on FC5. Printing
size_t should use %zd, and many unused parameters are commented
out to reduce warnings.
* libgeometry/kd_tree_dynamic.cpp, kd_tree_packed.cpp: Minor
tweaks to remove compiler warnings with the latest GCC on
FC5. Printing size_t should use %zd, and many unused parameters
are commented out to reduce warnings.
* macros/kde.m4: Use dnl to comment out serial, it's a reserved
word now.
* server/ActionExec.cpp, MovieClip.cpp, action_buffer.cpp,
as_environment.h, button.cpp, dlist.cpp, font.cpp, fontlib.cpp,
movie.h, movie_root.cpp, shape_character_def.cpp, /shm.cpp,
sound.cpp, sprite_definition.cpp, sprite_instance.cpp,
sprite_instance.h, xml.cpp, xmlnode.cpp, xmlsocket.cpp: Minor
tweaks to remove compiler warnings with the latest GCC on
FC5. Printing size_t should use %zd, and many unused parameters
are commented out to reduce warnings.
* server/asobj/NetConnection.cpp, NetConnection.h: Minor tweaks
to
remove compiler warnings with the latest GCC on FC5. Printing
size_t should use %zd, and many unused parameters are commented
out to reduce warnings.
* server/swf/ASHandlers.cpp: Minor tweaks to remove compiler
warnings with the latest GCC on FC5. Printing size_t should use
%zd, and many unused parameters are commented out to reduce
warnings.
* utilities/parser.cpp: Minor tweaks to remove compiler
warnings
with the latest GCC on FC5. Printing size_t should use %zd, and
many unused parameters are commented out to reduce warnings.
* plugin/klash/Makefile.am: Add libamf.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.591&r2=1.592
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Thread.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/membuf.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate_impl.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/utility.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/zlib_adapter.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/axial_box.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/collision.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/kd_tree_dynamic.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/kd_tree_packed.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ActionExec.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/MovieClip.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action_buffer.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fontlib.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape_character_def.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sound.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_definition.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/xml.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/xmlnode.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/xmlsocket.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.8&r2=1.9
Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- configure.ac 1 Aug 2006 16:57:35 -0000 1.99
+++ configure.ac 6 Aug 2006 02:00:54 -0000 1.100
@@ -303,13 +303,21 @@
GNASH_PATH_FIREFOX
AC_PATH_XTRA
AC_CHECK_HEADERS(dejagnu.h)
+
dnl seems unused
dnl AC_CHECK_LIB(Xmu, XmuCvtStringToOrientation)
AC_CHECK_LIB(Xi, XInput_find_display)
AC_CHECK_LIB(X11, XDisableAccessControl)
AC_CHECK_LIB(rt, shm_unlink)
AC_CHECK_FUNCS(shm_open)
-AC_CHECK_FUNCS(strcasecmp stricmp)
+AC_TRY_COMPILE([#include <strings.h>], [
+ char *p1 = (char *)"Hello";
+ char *p2 = (char *)"World";
+ strcasecmp(p1, p2); ],
+ AC_DEFINE(HAVE_STRCASECMP, [], [Has strcasecmp]),
+ )
+
+dnl AC_CHECK_FUNCS(strcasecmp stricmp)
AC_CHECK_FUNCS(vsnprintf)
dnl AC_CHECK_FUNCS(finite isfinite)
@@ -471,6 +479,7 @@
server/asobj/Makefile
libamf/Makefile
backend/Makefile
+cygnal/Makefile
utilities/Makefile
doc/Makefile
doc/C/Makefile
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.591
retrieving revision 1.592
diff -u -b -r1.591 -r1.592
--- ChangeLog 5 Aug 2006 18:10:26 -0000 1.591
+++ ChangeLog 6 Aug 2006 02:00:54 -0000 1.592
@@ -1,3 +1,40 @@
+2006-08-05 Rob Savoye <address@hidden>
+
+ * configure.ac: Rewrite strcasecmp to use AC_TRY_COMPILE instead
+ of AC_CHECK_HEADER which keeps failing on FC5-x86.
+ * libbase/container.cpp, container.h, jpeg.cpp, membuf.cpp,
+ network.cpp, rc.cpp, triangulate_impl.h, tu_file.cpp, utility.cpp,
+ zlib_adapter.cpp, axial_box.h, collision.cpp: Minor tweaks to
+ remove compiler warnings with the latest GCC on FC5. Printing
+ size_t should use %zd, and many unused parameters are commented
+ out to reduce warnings.
+ * libgeometry/kd_tree_dynamic.cpp, kd_tree_packed.cpp: Minor
+ tweaks to remove compiler warnings with the latest GCC on
+ FC5. Printing size_t should use %zd, and many unused parameters
+ are commented out to reduce warnings.
+ * macros/kde.m4: Use dnl to comment out serial, it's a reserved
+ word now.
+ * server/ActionExec.cpp, MovieClip.cpp, action_buffer.cpp,
+ as_environment.h, button.cpp, dlist.cpp, font.cpp, fontlib.cpp,
+ movie.h, movie_root.cpp, shape_character_def.cpp, /shm.cpp,
+ sound.cpp, sprite_definition.cpp, sprite_instance.cpp,
+ sprite_instance.h, xml.cpp, xmlnode.cpp, xmlsocket.cpp: Minor
+ tweaks to remove compiler warnings with the latest GCC on
+ FC5. Printing size_t should use %zd, and many unused parameters
+ are commented out to reduce warnings.
+ * server/asobj/NetConnection.cpp, NetConnection.h: Minor tweaks to
+ remove compiler warnings with the latest GCC on FC5. Printing
+ size_t should use %zd, and many unused parameters are commented
+ out to reduce warnings.
+ * server/swf/ASHandlers.cpp: Minor tweaks to remove compiler
+ warnings with the latest GCC on FC5. Printing size_t should use
+ %zd, and many unused parameters are commented out to reduce
+ warnings.
+ * utilities/parser.cpp: Minor tweaks to remove compiler warnings
+ with the latest GCC on FC5. Printing size_t should use %zd, and
+ many unused parameters are commented out to reduce warnings.
+ * plugin/klash/Makefile.am: Add libamf.
+
2006-08-05 Sandro Santilli <address@hidden>
* server/ActionExec.cpp: handled case where pc gets far after stop_pc
@@ -98,6 +135,9 @@
2006-08-01 Rob Savoye <address@hidden>
+ * libamf/Makefile.am: Don't bother to build amftest, now that I
+ can debug with live data.
+
* libamf/amf.cpp, amf.h: Changes for cleaner 64 bit support.
* libamf/rtmp.cpp, rtmp.h: Read multiple packets till the entire
body is read in.
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- plugin/klash/Makefile.am 25 Jul 2006 13:16:46 -0000 1.11
+++ plugin/klash/Makefile.am 6 Aug 2006 02:00:54 -0000 1.12
@@ -95,6 +95,7 @@
-I$(top_srcdir)/server \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/backend \
+ -I$(top_srcdir)/libamf \
-I$(top_srcdir)/libgeometry \
$(PTHREAD_CFLAGS) \
$(SDL_CFLAGS) \
@@ -117,6 +118,7 @@
../../server/asobj/libgnashasobjs.la \
../../libgeometry/libgnashgeo.la \
../../libbase/libgnashbase.la \
+ ../../libamf/libgnashamf.la \
$(LIB_QT)
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- macros/kde.m4 2 Aug 2006 01:22:59 -0000 1.11
+++ macros/kde.m4 6 Aug 2006 02:00:54 -0000 1.12
@@ -3520,7 +3520,7 @@
# Search path for a program which passes the given test.
# Ulrich Drepper <address@hidden>, 1996.
-# serial 1
+dnl serial 1
# Stephan Kulow: I appended a _KDE against name conflicts
dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR,
@@ -3565,7 +3565,7 @@
# Check whether LC_MESSAGES is available in <locale.h>.
# Ulrich Drepper <address@hidden>, 1995.
-# serial 1
+dnl serial 1
AC_DEFUN([AM_LC_MESSAGES],
[if test $ac_cv_header_locale_h = yes; then
@@ -3610,7 +3610,7 @@
# Macro to add for using GNU gettext.
# Ulrich Drepper <address@hidden>, 1995.
-# serial 1
+dnl serial 1
# Stephan Kulow: I put a KDE in it to avoid name conflicts
AC_DEFUN([AM_KDE_GNU_GETTEXT],
@@ -5766,7 +5766,7 @@
## configuration script generated by Autoconf, you may include it under
## the same distribution terms that you use for the rest of that program.
-# serial 47 AC_PROG_LIBTOOL
+dnl serial 47 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
Index: libbase/Thread.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/Thread.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libbase/Thread.cpp 1 Aug 2006 16:57:35 -0000 1.2
+++ libbase/Thread.cpp 6 Aug 2006 02:00:54 -0000 1.3
@@ -60,7 +60,7 @@
{
printf("%s: Entered\n", __PRETTY_FUNCTION__);
_debug = false;
- destroyThread((void *)this);
+// destroyThread((void *)this);
}
/// \brief Create a POSIX thread
Index: libbase/container.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/container.cpp 8 Jun 2006 04:16:19 -0000 1.7
+++ libbase/container.cpp 6 Aug 2006 02:00:54 -0000 1.8
@@ -10,12 +10,19 @@
#endif
#include <cmath>
+#include <cstdio>
#include <cstdarg>
#include "container.h"
#include "utf8.h"
#include "tu_random.h"
+#ifdef HAVE_STRCASECMP
+# define STRCASECMP strcasecmp
+#else
+# define STRCASECMP stricmp
+#endif
+
void tu_string::append_wide_char(uint16 c)
{
char buf[8];
@@ -157,8 +164,7 @@
assert(offset == bytes_needed);
assert((*result)[offset - 1] == 0);
assert(result->length() == (int) strlen(result->c_str()));
-}
-
+};
void tu_string::encode_utf8_from_wchar(tu_string* result, const uint32* wstr)
{
@@ -174,11 +180,7 @@
/*static*/ int tu_string::stricmp(const char* a, const char* b)
{
-#ifdef HAVE_STRCASECMP
return strcasecmp(a, b);
-#else
- return ::stricmp(a, b);
-#endif
}
@@ -315,9 +317,9 @@
}
-#ifndef HAVE_VSNPRINTF
-#define vsnprintf _vsnprintf
-#endif
+// #ifndef HAVE_VSNPRINTF
+// #define vsnprintf _vsnprintf
+// #endif
tu_string string_printf(const char* fmt, ...)
// Handy sprintf wrapper.
Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libbase/container.h 27 Jul 2006 01:47:10 -0000 1.16
+++ libbase/container.h 6 Aug 2006 02:00:54 -0000 1.17
@@ -620,12 +620,13 @@
#else
+#include <ext/hash_map>
template<class T, class U, class hash_functor = fixed_size_hash<T> >
-class hash : public HASH_MAP_NS::hash_map<T, U, hash_functor >
+class hash : public __gnu_cxx::hash_map<T, U, hash_functor >
{
public:
- typedef typename HASH_MAP_NS::hash_map<T, U,
hash_functor>::const_iterator const_iterator;
- typedef typename HASH_MAP_NS::hash_map<T, U, hash_functor>::iterator
iterator;
+ typedef typename __gnu_cxx::hash_map<T, U,
hash_functor>::const_iterator const_iterator;
+ typedef typename __gnu_cxx::hash_map<T, U, hash_functor>::iterator
iterator;
// extra convenience interfaces
void add(const T& key, const U& value)
Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libbase/curl_adapter.cpp 27 Jul 2006 01:47:11 -0000 1.9
+++ libbase/curl_adapter.cpp 6 Aug 2006 02:00:54 -0000 1.10
@@ -61,7 +61,7 @@
// Stubs, in case client doesn't want to link to zlib.
namespace curl_adapter
{
- tu_file* make_stream(const char *url)
+tu_file* make_stream(const char * /*url */)
{
fprintf(stderr, "libcurl is not available, but curl_adapter has
been attempted to use\n");
return NULL; // should assert(0) instead ?
Index: libbase/jpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/jpeg.cpp 27 Jul 2006 14:54:43 -0000 1.7
+++ libbase/jpeg.cpp 6 Aug 2006 02:00:54 -0000 1.8
@@ -129,7 +129,7 @@
}
}
- static void term_source(j_decompress_ptr cinfo)
+ static void term_source(j_decompress_ptr /* cinfo */)
// Terminate the source. Make sure we get deleted.
{
/*rw_source* src = (rw_source*) cinfo->src;
@@ -309,7 +309,7 @@
}
- input_impl(SWF_DEFINE_BITS_JPEG2_HEADER_ONLY e, tu_file* in)
+ input_impl(SWF_DEFINE_BITS_JPEG2_HEADER_ONLY /* e */, tu_file*
in)
:
m_compressor_opened(false)
// The SWF file format stores JPEG images with the
Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libbase/log.cpp 25 Jul 2006 19:54:40 -0000 1.15
+++ libbase/log.cpp 6 Aug 2006 02:00:54 -0000 1.16
@@ -573,7 +573,38 @@
return *this;
}
-#ifdef HAVE_LIBXML
+LogFile&
+LogFile::operator << (unsigned char const *c)
+{
+ _logentry = timestamp();
+ _logentry += ": ";
+
+ if (c == -0) {
+ return *this;
+ }
+
+ if (_stamp == true && (_state == IDLE || _state == OPEN)) {
+ _state = INPROGRESS;
+ if (_verbose) {
+ cout << _logentry << c;
+ }
+ if (_write) {
+ _outstream << _logentry << c;
+ }
+ } else {
+ if (_verbose) {
+ cout << c;
+ }
+ if (_write) {
+ _outstream << c;
+ }
+ }
+ _logentry += (const char*)c;
+
+ return *this;
+}
+
+#ifdef HAVE_LIBXML_XX
/// \brief print an XML char *
LogFile&
LogFile::operator << (const xmlChar *c)
Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libbase/log.h 7 Jun 2006 04:28:46 -0000 1.9
+++ libbase/log.h 6 Aug 2006 02:00:54 -0000 1.10
@@ -102,10 +102,11 @@
LogFile& operator << (bool x);
LogFile& operator << (void *);
LogFile& operator << (const char *);
+ LogFile& operator << (unsigned char const *);
LogFile& operator << (std::string &s);
-#ifdef HAVE_LIBXML
- LogFile& operator << (const xmlChar *c);
-#endif
+// #ifdef HAVE_LIBXML
+// LogFile& operator << (const xmlChar *c);
+// #endif
std::ostream& operator << (std::ostream & (&)(std::ostream &));
const char *getEntry(void);
Index: libbase/membuf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/membuf.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/membuf.cpp 26 Feb 2006 15:49:30 -0000 1.3
+++ libbase/membuf.cpp 6 Aug 2006 02:00:54 -0000 1.4
@@ -77,7 +77,7 @@
// Special read-only constructor.
-membuf::membuf(read_only_enum e, const void* data, int size)
+membuf::membuf(read_only_enum /* e */, const void* data, int size)
:
m_size(size),
m_capacity(0),
Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libbase/network.cpp 1 Aug 2006 16:57:35 -0000 1.2
+++ libbase/network.cpp 6 Aug 2006 02:00:54 -0000 1.3
@@ -122,6 +122,7 @@
_host = net.getHost();
_connected = net.connected();
_timeout = net.getTimeout();
+ return *this;
}
// Description: Create a tcp/ip network server. This creates a server
@@ -331,7 +332,7 @@
return createClient("localhost", RTMP);
}
bool
-Network::createClient(short port)
+Network::createClient(short /* port */)
{
return false;
}
Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/rc.cpp 3 Aug 2006 18:58:53 -0000 1.7
+++ libbase/rc.cpp 6 Aug 2006 02:00:54 -0000 1.8
@@ -234,7 +234,7 @@
// Write the changed settings to the config file
bool
-RcInitFile::updateFile(string filespec)
+RcInitFile::updateFile(string /* filespec */)
{
cerr << __PRETTY_FUNCTION__ << "ERROR: unimplemented!" << endl;
return false;
Index: libbase/triangulate_impl.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/triangulate_impl.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libbase/triangulate_impl.h 27 Jul 2006 01:47:11 -0000 1.10
+++ libbase/triangulate_impl.h 6 Aug 2006 02:00:54 -0000 1.11
@@ -841,7 +841,7 @@
template<class coord_t>
-bool poly<coord_t>::build_ear_list(std::vector<vert_t>* sorted_verts,
tu_random::generator* rg)
+bool poly<coord_t>::build_ear_list(std::vector<vert_t>* sorted_verts,
tu_random::generator* /* rg */)
// Initialize our ear loop with all the ears that can be clipped.
//
// Returns true if we clipped any degenerates while looking for ears.
@@ -930,7 +930,7 @@
template<class coord_t>
-int poly<coord_t>::get_next_ear(const std::vector<vert_t>& sorted_verts,
tu_random::generator* rg)
+int poly<coord_t>::get_next_ear(const std::vector<vert_t>& sorted_verts,
tu_random::generator* /* rg */)
// Return the next ear to be clipped.
{
assert(m_ear_count > 0);
@@ -1870,7 +1870,7 @@
{
// Bad input, odd number of coords.
assert(0);
- fprintf(stderr, "path[%d] has odd number of coords
(%ld), dropping last value\n", i, path.size());//xxxx
+ fprintf(stderr, "path[%d] has odd number of coords
(%zd), dropping last value\n", i, path.size());//xxxx
path_size--;
}
for (int j = 0; j < path_size; j += 2) // vertex coords come
in pairs.
@@ -2389,7 +2389,7 @@
template<class coord_t>
void recovery_process(
- std::vector<poly<coord_t>*>* polys,
+ std::vector<poly<coord_t>*>* /* polys */,
poly<coord_t>* P,
std::vector<poly_vert<coord_t> >* sorted_verts,
tu_random::generator* rg)
Index: libbase/tu_file.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/tu_file.cpp 8 May 2006 21:12:24 -0000 1.6
+++ libbase/tu_file.cpp 6 Aug 2006 02:00:54 -0000 1.7
@@ -345,7 +345,7 @@
}
}
-tu_file::tu_file(memory_buffer_enum m)
+tu_file::tu_file(memory_buffer_enum /* m */)
// Create a read/write memory buffer.
{
m_data = new membuf;
@@ -361,7 +361,7 @@
}
-tu_file::tu_file(memory_buffer_enum m, int size, void* data)
+tu_file::tu_file(memory_buffer_enum /* m */, int size, void* data)
// Create a read-only memory buffer, using the given data.
{
m_data = new membuf(data, size);
Index: libbase/utility.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/utility.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/utility.cpp 24 Apr 2006 23:05:55 -0000 1.6
+++ libbase/utility.cpp 6 Aug 2006 02:00:54 -0000 1.7
@@ -68,7 +68,7 @@
#endif
-void dump_memory_stats(const char *from, int line, const char *label)
+void dump_memory_stats(const char */* from */ , int /* line */, const char */*
label */)
// Dump the internal statistics from malloc() so we can track memory leaks
{
Index: libbase/zlib_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/zlib_adapter.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/zlib_adapter.cpp 30 Mar 2006 19:12:53 -0000 1.3
+++ libbase/zlib_adapter.cpp 6 Aug 2006 02:00:54 -0000 1.4
@@ -188,7 +188,7 @@
}
- int inflate_write(const void* src, int bytes, void* appdata)
+ int inflate_write(const void* /* src */, int /* bytes */, void* /*
appdata */)
// Return number of bytes actually written.
{
// *In*flaters can't write!!!
Index: libgeometry/axial_box.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/axial_box.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libgeometry/axial_box.h 26 Feb 2006 15:49:30 -0000 1.3
+++ libgeometry/axial_box.h 6 Aug 2006 02:00:54 -0000 1.4
@@ -103,7 +103,7 @@
}
-inline axial_box::axial_box(invalid_ctor e, const vec3& min, const vec3& max)
+inline axial_box::axial_box(invalid_ctor /* e */, const vec3& min, const vec3&
max)
// Init from extremes, don't check validity.
{
set_min_max_invalid(min, max);
Index: libgeometry/collision.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/collision.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libgeometry/collision.cpp 26 Feb 2006 15:49:30 -0000 1.3
+++ libgeometry/collision.cpp 6 Aug 2006 02:00:54 -0000 1.4
@@ -24,7 +24,7 @@
}
-ray_query::ray_query(start_end_enum e, const vec3& start_pos, const vec3&
end_pos)
+ray_query::ray_query(start_end_enum /* e */, const vec3& start_pos, const
vec3& end_pos)
:
m_start(start_pos),
m_end(end_pos)
Index: libgeometry/kd_tree_dynamic.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/kd_tree_dynamic.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libgeometry/kd_tree_dynamic.cpp 9 Mar 2006 19:29:06 -0000 1.6
+++ libgeometry/kd_tree_dynamic.cpp 6 Aug 2006 02:00:54 -0000 1.7
@@ -56,7 +56,7 @@
std::vector<int>* tris0,
std::vector<vec3>* verts1,
std::vector<int>* tris1,
- int vert_count,
+ int /* vert_count */,
const vec3 verts[],
int triangle_count,
const int indices[],
@@ -612,7 +612,7 @@
float kd_tree_dynamic::evaluate_split(
- int depth,
+ int /* depth */,
int face_count,
face faces[],
const axial_box& bounds,
Index: libgeometry/kd_tree_packed.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/kd_tree_packed.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libgeometry/kd_tree_packed.cpp 30 Mar 2006 19:12:53 -0000 1.4
+++ libgeometry/kd_tree_packed.cpp 6 Aug 2006 02:00:54 -0000 1.5
@@ -396,7 +396,7 @@
// Haines-Moller with cbloom tweaks
static bool intersect_triangle(
const vec3& orig, const vec3& dir,
- const vec3& vert0, const vec3& vert1, const vec3& vert2,
+ const vec3& vert0, const vec3& /* vert1 */, const vec3& /* vert2 */,
const vec3& edge1, const vec3& edge2)
{
/* begin calculating determinant - also used to calculate U parameter */
Index: server/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/ActionExec.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/ActionExec.cpp 5 Aug 2006 18:10:26 -0000 1.20
+++ server/ActionExec.cpp 6 Aug 2006 02:00:54 -0000 1.21
@@ -131,7 +131,7 @@
#if DEBUG_STACK
if (dbglogfile.getActionDump()) {
- log_action("at ActionExec operator() start, pc=%ld,
stop_pc=%ld, code.size=%ld.", pc, stop_pc, code.size());
+ log_action("at ActionExec operator() start, pc=%zd,
stop_pc=%zd, code.size=%zd.", pc, stop_pc, code.size());
stringstream ss;
env.dump_stack(ss);
env.dump_global_registers(ss);
@@ -181,7 +181,7 @@
#if DEBUG_STACK
if (dbglogfile.getActionDump()) {
- log_action( " PC is now %ld.", pc);
+ log_action( " PC is now %zd.", pc);
stringstream ss;
env.dump_stack(ss);
env.dump_global_registers(ss);
Index: server/MovieClip.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/MovieClip.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/MovieClip.cpp 5 Jul 2006 17:10:39 -0000 1.2
+++ server/MovieClip.cpp 6 Aug 2006 02:00:54 -0000 1.3
@@ -64,7 +64,7 @@
//movie_interface* create_instance();
void
-movieclip_init(as_object* global)
+movieclip_init(as_object* /* global */)
{
#if 0
// This is going to be the global MovieClip "class"/"function"
Index: server/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action_buffer.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/action_buffer.cpp 27 Jul 2006 01:47:11 -0000 1.11
+++ server/action_buffer.cpp 6 Aug 2006 02:00:54 -0000 1.12
@@ -139,7 +139,7 @@
}
if (m_decl_dict_processed_at != -1) {
- log_error("process_decl_dict(%ld, %ld): decl_dict was already processed
at %d\n",
+ log_error("process_decl_dict(%zd, %zd): decl_dict was already processed
at %d\n",
start_pc,
stop_pc,
m_decl_dict_processed_at);
Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/as_environment.h 7 Jul 2006 12:36:10 -0000 1.14
+++ server/as_environment.h 6 Aug 2006 02:00:54 -0000 1.15
@@ -49,6 +49,7 @@
//#include "types.h"
//#include <wchar.h>
+#include <iostream>
#include "container.h" // for composition (stringi_hash, tu_string)
#include "as_value.h" // for composition (vector + frame_slot)
#include "log.h" // for inlines (dump_*)
Index: server/button.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/button.cpp 27 Jul 2006 01:47:11 -0000 1.22
+++ server/button.cpp 6 Aug 2006 02:00:54 -0000 1.23
@@ -988,7 +988,7 @@
log_parse(" out_point = %d\n", m_out_point);
log_parse(" loop_count = %d\n", m_loop_count);
- log_parse(" envelope size = %ld\n", m_envelopes.size());
+ log_parse(" envelope size = %zd\n", m_envelopes.size());
}
Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/dlist.cpp 4 Aug 2006 21:19:08 -0000 1.15
+++ server/dlist.cpp 6 Aug 2006 02:00:54 -0000 1.16
@@ -198,7 +198,10 @@
}
ch->on_event(event_id::CONSTRUCT);
- ch->execute_frame_tags(0); // create dlist only
+ ch->execute_frame_tags(0, true); // create dlist
+ // only. FIXME: this
+ // doesn't appear to
+ // actually do anything.
//log_msg("After adding, list is:");
//dump(std::cout);
@@ -243,7 +246,10 @@
_characters.insert(it, di);
ch->on_event(event_id::CONSTRUCT);
- ch->execute_frame_tags(0); // create dlist only
+ ch->execute_frame_tags(0, true); // create dlist
+ // only. FIXME: this
+ // doesn't appear to
+ // actually do anything.
}
else
{
@@ -276,7 +282,7 @@
bool use_matrix,
const matrix& mat,
float ratio,
- uint16_t clip_depth)
+ uint16_t /* clip_depth */)
{
//GNASH_REPORT_FUNCTION;
//IF_VERBOSE_DEBUG(log_msg("dl::move(%d)\n", depth));//xxxxx
@@ -539,7 +545,5 @@
// Local Variables:
// mode: C++
-// c-basic-offset: 8
-// tab-width: 8
// indent-tabs-mode: t
// End:
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/font.cpp 2 Aug 2006 01:40:33 -0000 1.17
+++ server/font.cpp 6 Aug 2006 02:00:54 -0000 1.18
@@ -194,7 +194,7 @@
for (unsigned int i = 0; i < glyph_count; i++)
{
uint32_t off = in->read_u32();
- log_parse("Glyph %d at offset %lu", i, off);
+ log_parse("Glyph %d at offset %u", i, off);
offsets.push_back(off);
}
font_code_offset = in->read_u32();
@@ -432,7 +432,7 @@
}
- void font::output_cached_data(tu_file* out, const cache_options&
options)
+ void font::output_cached_data(tu_file* /* out */, const
cache_options& /* options */)
// Dump our cached data into the given stream.
{
// @@ Disabled. Need to fix input_cached_data, so that it has a
@@ -454,7 +454,7 @@
}
- void font::input_cached_data(tu_file* in)
+ void font::input_cached_data(tu_file* /* in */)
// Read our cached data from the given stream.
{
// @@ Disable. See comment in output_cached_data().
@@ -482,7 +482,5 @@
// Local Variables:
// mode: C++
-// c-basic-offset: 8
-// tab-width: 8
// indent-tabs-mode: t
// End:
Index: server/fontlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fontlib.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/fontlib.cpp 27 Jul 2006 01:47:11 -0000 1.12
+++ server/fontlib.cpp 6 Aug 2006 02:00:54 -0000 1.13
@@ -488,12 +488,12 @@
}
- struct draw_into_software_buffer : tesselate::trapezoid_accepter
// A trapezoid accepter that does B&W rendering into our
// software buffer.
+ struct draw_into_software_buffer : tesselate::trapezoid_accepter
{
// Overrides from trapezoid_accepter
- virtual void accept_trapezoid(int style, const
tesselate::trapezoid& tr)
+ virtual void accept_trapezoid(int /* style */, const
tesselate::trapezoid& tr)
{
// Transform the coords.
float x_scale = s_render_matrix.m_[0][0];
@@ -875,7 +875,7 @@
}
- static void generate_font_bitmaps(std::vector<rendered_glyph_info>*
glyph_info, font* f, movie_definition* owner)
+static void generate_font_bitmaps(std::vector<rendered_glyph_info>*
glyph_info, font* f, movie_definition* /* owner */)
// Render images for each of the font's glyphs, and put the
// info about them in the given array.
{
@@ -1143,7 +1143,7 @@
if (nf != (int) fonts.size())
{
// Font counts must match!
- log_error("mismatched font count (read %d, expected
%ld) in cached font data\n", nf, fonts.size());
+ log_error("mismatched font count (read %d, expected
%zd) in cached font data\n", nf, fonts.size());
in->go_to_end();
goto error_exit;
}
Index: server/movie.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/movie.h 3 Aug 2006 22:19:59 -0000 1.13
+++ server/movie.h 6 Aug 2006 02:00:54 -0000 1.14
@@ -230,7 +230,7 @@
/// user's mouse pointer has moved.
virtual void notify_mouse_moved(int /*x*/, int /*y*/)
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
}
/// \brief
@@ -239,14 +239,14 @@
/// Set mouse_pressed to true on click, false on release.
virtual void notify_mouse_clicked(bool /*mouse_pressed*/, int /*mask*/)
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
}
/// \brief
/// The host app uses this to tell the movie where the
/// user's mouse pointer is.
virtual void notify_mouse_state(int /*x*/, int /*y*/, int /*buttons*/)
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
}
/// \brief
@@ -376,7 +376,7 @@
virtual void get_url(const char* /* url */)
{
- GNASH_REPORT_FUNCTION;
+// GNASH_REPORT_FUNCTION;
}
@@ -478,7 +478,7 @@
}
virtual void execute_frame_tags(
- int /* frame */, bool state_only = false)
+ int /* frame */, bool /* state_only = false */)
{
}
@@ -493,7 +493,7 @@
// Override me to provide this functionality.
virtual void set_display_callback(
- void (*callback)(void*),
+ void * /* (*callback)(void*) */,
void* /* user_ptr */)
{
}
Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/movie_root.cpp 4 Aug 2006 15:30:36 -0000 1.11
+++ server/movie_root.cpp 6 Aug 2006 02:00:54 -0000 1.12
@@ -210,7 +210,7 @@
}
void
-movie_root::do_something(void *timer)
+movie_root::do_something(void */* timer */)
{
log_msg("FIXME: %s: unimplemented\n", __FUNCTION__);
}
Index: server/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shape_character_def.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/shape_character_def.cpp 1 Aug 2006 00:23:35 -0000 1.4
+++ server/shape_character_def.cpp 6 Aug 2006 02:00:54 -0000 1.5
@@ -392,10 +392,10 @@
static void debug_display_shape_paths(
const matrix& mat,
- float object_space_max_error,
+ float /* object_space_max_error */,
const std::vector<path>& paths,
- const std::vector<fill_style>& fill_styles,
- const std::vector<line_style>& line_styles)
+ const std::vector<fill_style>& /* fill_styles */,
+ const std::vector<line_style>& /* line_styles */)
{
for (unsigned int i = 0; i < paths.size(); i++) {
// if (i > 0) break;//xxxxxxxx
@@ -649,7 +649,7 @@
}
-void shape_character_def::output_cached_data(tu_file* out, const
cache_options& options)
+void shape_character_def::output_cached_data(tu_file* out, const
cache_options& /* options */)
// Dump our precomputed mesh data to the given stream.
{
int n = m_cached_meshes.size();
Index: server/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shm.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/shm.cpp 27 Jul 2006 14:54:43 -0000 1.13
+++ server/shm.cpp 6 Aug 2006 02:00:54 -0000 1.14
@@ -276,7 +276,7 @@
#endif // end of HAVE_SHM_OPEN
#endif // end of FLAT_ADDR_SPACE
- log_msg("Opened Shared Memory segment \"%s\": %ld bytes at %p.\n",
+ log_msg("Opened Shared Memory segment \"%s\": %zd bytes at %p.\n",
filespec, _size, _addr);
}
@@ -333,7 +333,7 @@
}
bool
-Shm::resize(int bytes)
+Shm::resize(int /* bytes */)
{
# ifdef HAVE_MREMAP
Index: server/sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sound.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/sound.cpp 3 Aug 2006 19:16:37 -0000 1.15
+++ server/sound.cpp 6 Aug 2006 02:00:54 -0000 1.16
@@ -53,7 +53,7 @@
//
void
-start_sound_tag::read(stream* in, int tag_type, movie_definition* m,
+start_sound_tag::read(stream* in, int /* tag_type */, movie_definition* m,
const sound_sample_impl* sam)
{
assert(sam);
@@ -82,7 +82,7 @@
void
-start_sound_tag::execute(movie* m)
+start_sound_tag::execute(movie* /* m */)
{
using globals::s_sound_handler;
@@ -115,7 +115,7 @@
void
-start_stream_sound_tag::execute(movie* m)
+start_stream_sound_tag::execute(movie* /* m */)
{
using globals::s_sound_handler;
if (s_sound_handler)
Index: server/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_definition.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/sprite_definition.cpp 4 Aug 2006 13:10:35 -0000 1.10
+++ server/sprite_definition.cpp 6 Aug 2006 02:00:54 -0000 1.11
@@ -143,7 +143,7 @@
void
sprite_definition::add_frame_name(const char* name)
{
- assert(m_loading_frame >= 0 && m_loading_frame < m_frame_count);
+ assert((int)m_loading_frame >= 0 && m_loading_frame < m_frame_count);
tu_string n = name;
size_t currently_assigned = 0;
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/sprite_instance.cpp 5 Aug 2006 18:10:26 -0000 1.28
+++ server/sprite_instance.cpp 6 Aug 2006 02:00:54 -0000 1.29
@@ -221,7 +221,7 @@
fn.result->set_int(sprite->get_bytes_total());
}
-static void sprite_load_movie(const fn_call& fn)
+static void sprite_load_movie(const fn_call& /* fn */)
{
log_error("FIXME: %s not implemented yet", __PRETTY_FUNCTION__);
//moviecliploader_loadclip(fn);
@@ -1203,7 +1203,7 @@
// Execute the current frame's tags.
// execute_frame_tags(0) already executed in dlist.cpp
- if (m_current_frame != prev_frame)
+ if (m_current_frame != (size_t)prev_frame)
{
execute_frame_tags(m_current_frame);
}
@@ -1378,7 +1378,7 @@
smart_ptr<as_object> this_ptr(this);
assert(frame >= 0);
- assert(frame < m_def->get_frame_count());
+ assert((size_t)frame < m_def->get_frame_count());
// Execute this frame's init actions, if necessary.
if (m_init_actions_executed[frame] == false)
@@ -1420,7 +1420,7 @@
smart_ptr<as_object> this_ptr(this);
assert(frame >= 0);
- assert(frame < m_def->get_frame_count());
+ assert((size_t)frame < m_def->get_frame_count());
const std::vector<execute_tag*>& playlist = m_def->get_playlist(frame);
for (unsigned int i = 0; i < playlist.size(); i++)
@@ -1433,7 +1433,7 @@
void sprite_instance::execute_remove_tags(int frame)
{
assert(frame >= 0);
- assert(frame < m_def->get_frame_count());
+ assert((size_t)frame < m_def->get_frame_count());
const std::vector<execute_tag*>& playlist =
m_def->get_playlist(frame);
for (unsigned int i = 0; i < playlist.size(); i++)
@@ -1555,7 +1555,7 @@
const char* name,
const std::vector<swf_event*>& event_handlers,
uint16_t depth,
- bool replace_if_depth_is_occupied,
+ bool /* replace_if_depth_is_occupied */,
const cxform& color_transform, const matrix& matrix,
float ratio, uint16_t clip_depth)
{
@@ -1920,7 +1920,7 @@
}
character*
-sprite_instance::get_character(int character_id)
+sprite_instance::get_character(int /* character_id */)
{
//return m_def->get_character_def(character_id);
// @@ TODO -- look through our dlist for a match
Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/sprite_instance.h 5 Aug 2006 18:10:26 -0000 1.15
+++ server/sprite_instance.h 6 Aug 2006 02:00:54 -0000 1.16
@@ -321,7 +321,7 @@
/// NOTE: the id parameter is unused, but currently
/// required to avoid break of inheritance from movie.h
///
- void remove_display_object(uint16_t depth, int id)
+ void remove_display_object(uint16_t depth, int /* id */)
{
m_display_list.remove_display_object(depth);
}
@@ -467,7 +467,7 @@
movie* m = as_obj->to_movie();
if (m)
{
- m->set_display_callback(callback, user_ptr);
+ m->set_display_callback((void *)callback, user_ptr);
}
}
}
Index: server/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/xml.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/xml.cpp 7 Jul 2006 13:49:40 -0000 1.23
+++ server/xml.cpp 6 Aug 2006 02:00:54 -0000 1.24
@@ -95,7 +95,7 @@
parseXML(xml_in);
}
-XML::XML(struct node *childNode)
+XML::XML(struct node */* childNode */)
{
GNASH_REPORT_FUNCTION;
#ifdef DEBUG_MEMORY_ALLOCATION
@@ -142,7 +142,7 @@
}
void
-XML::nodeNameSet(char *name)
+XML::nodeNameSet(char */*name */)
{
if (!_nodes) {
_nodes = new XMLNode;
@@ -154,7 +154,7 @@
}
void
-XML::nodeValueSet(char *value)
+XML::nodeValueSet(char */* value */)
{
if (!_nodes) {
_nodes = new XMLNode;
@@ -167,7 +167,7 @@
// Dispatch event handler(s), if any.
bool
-XML::on_event(event_id id)
+XML::on_event(event_id /* id */)
{
// Keep m_as_environment alive during any method calls!
// smart_ptr<as_object_interface> this_ptr(this);
@@ -597,7 +597,7 @@
}
void
-XML::cleanupStackFrames(XMLNode *xml)
+XML::cleanupStackFrames(XMLNode */* xml */)
{
GNASH_REPORT_FUNCTION;
}
@@ -705,7 +705,7 @@
/// If multiple calls are made to set the same header name, each
/// successive value replaces the value set in the previous call.
void
-XML::addRequestHeader(const char *name, const char *value)
+XML::addRequestHeader(const char */* name */, const char */* value */)
{
log_msg("%s:unimplemented \n", __FUNCTION__);
}
@@ -763,7 +763,7 @@
/// the XML.createTextNode() method are the constructor methods for
/// creating nodes for an XML object.
XMLNode *
-XML::createElement(const char *name)
+XML::createElement(const char */* name */)
{
log_msg("%s:unimplemented \n", __FUNCTION__);
return (XMLNode*)0;
@@ -778,7 +778,7 @@
/// XML.createElement() method are the constructor methods for
/// creating nodes for an XML object.
XMLNode *
-XML::createTextNode(const char *name)
+XML::createTextNode(const char */* name */)
{
log_msg("%s:unimplemented \n", __FUNCTION__);
return (XMLNode*)0;
@@ -792,7 +792,7 @@
/// method. If beforeNode is not a child of my_xml, the insertion
/// fails.
void
-XML::insertBefore(XMLNode *newnode, XMLNode *node)
+XML::insertBefore(XMLNode */* newnode */, XMLNode */* node */)
{
log_msg("%s:unimplemented \n", __FUNCTION__);
}
Index: server/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/xmlnode.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/xmlnode.cpp 27 Jul 2006 01:47:11 -0000 1.13
+++ server/xmlnode.cpp 6 Aug 2006 02:00:54 -0000 1.14
@@ -241,7 +241,7 @@
/// method. If beforeNode is not a child of my_xml, the insertion
/// fails.
void
-XMLNode::insertBefore(XMLNode *newnode, XMLNode *node)
+XMLNode::insertBefore(XMLNode */* newnode */, XMLNode */* node */)
{
log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
}
@@ -276,7 +276,7 @@
as_object *
XMLNode::previousSibling(int x)
{
- log_msg("%s: partially implemented. %ld objects\n",
+ log_msg("%s: partially implemented. %zd objects\n",
__PRETTY_FUNCTION__, _objects.size());
if (_objects.size() > 0) {
return _objects[x-1];
Index: server/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/xmlsocket.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/xmlsocket.cpp 7 Jul 2006 13:49:40 -0000 1.19
+++ server/xmlsocket.cpp 6 Aug 2006 02:00:54 -0000 1.20
@@ -412,25 +412,25 @@
// Callbacks
void
-XMLSocket::onClose(tu_string str)
+XMLSocket::onClose(tu_string /* str */)
{
log_msg("%s: \n", __FUNCTION__);
}
void
-XMLSocket::onConnect(tu_string str)
+XMLSocket::onConnect(tu_string /* str */)
{
log_msg("%s: \n", __FUNCTION__);
}
void
-XMLSocket::onData(tu_string str)
+XMLSocket::onData(tu_string /* str */)
{
log_msg("%s: \n", __FUNCTION__);
}
void
-XMLSocket::onXML(tu_string str)
+XMLSocket::onXML(tu_string /* str */)
{
log_msg("%s: \n", __FUNCTION__);
}
@@ -741,7 +741,7 @@
}
void
-xmlsocket_event_close(const fn_call& fn)
+xmlsocket_event_close(const fn_call& /* fn */)
{
#if 0
as_value* result = fn.result;
@@ -801,7 +801,7 @@
fn.result->set_bool(val.to_bool());
}
void
-xmlsocket_event_xml(const fn_call& fn)
+xmlsocket_event_xml(const fn_call& /* fn */)
{
#if 0
as_value* result = fn.result;
Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/NetConnection.cpp 1 Aug 2006 16:57:36 -0000 1.2
+++ server/asobj/NetConnection.cpp 6 Aug 2006 02:00:54 -0000 1.3
@@ -42,17 +42,18 @@
#include <iostream>
#include <string>
-#include "log.h"
+#include <new>
#include "NetConnection.h"
#include "fn_call.h"
#include "rtmp.h"
using namespace std;
using namespace amf;
-using namespace rtmp;
namespace gnash {
+#include "log.h"
+
/// \class NetConnection
/// \brief Opens a local connection through which you can play
/// back video (FLV) files from an HTTP address or from the local file
Index: server/asobj/NetConnection.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/swf/ASHandlers.cpp 5 Aug 2006 18:10:26 -0000 1.44
+++ server/swf/ASHandlers.cpp 6 Aug 2006 02:00:54 -0000 1.45
@@ -646,7 +646,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 == %zu (expected 3)", SWF::ACTION_WAITFORFRAME, tag_len);
}
// If we haven't loaded a specified frame yet, then
@@ -1460,7 +1460,7 @@
SWFHandlers::CommonGetUrl(as_environment& env,
const char* target, // the target window, or _level1..10
const char* url,
- uint8_t method // 0:NONE, 1:GET, 2:POST
+ uint8_t /* method */ // 0:NONE, 1:GET, 2:POST
)
{
@@ -1554,8 +1554,8 @@
if (next_pc > stop_pc)
{
- log_error("branch to offset %lu -- "
- " this section only runs to %lu. "
+ log_error("branch to offset %zu -- "
+ " this section only runs to %zu. "
" Malformed SWF !.",
next_pc,
stop_pc);
@@ -2649,7 +2649,7 @@
size_t pc = thread.pc;
size_t next_pc = thread.next_pc;
- log_action("-------------- with block start: stack size is %lu",
+ log_action("-------------- with block start: stack size is %zu",
with_stack.size());
if (with_stack.size() < 8)
@@ -2784,7 +2784,7 @@
{
if ( static_cast<size_t>(x) > _handlers.size() )
{
- log_error("at SWFHandlers::action_name(%d) call time, _handlers
size is %lu", x, _handlers.size());
+ log_error("at SWFHandlers::action_name(%d) call time, _handlers
size is %zu", x, _handlers.size());
return NULL;
}
else
@@ -2801,8 +2801,8 @@
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.",
+ log_error("Stack underrun: %zu elements required, %zu available. "
+ "Fixing by pushing %zu undefined values on the missing slots.",
required, env.stack_size(), missing);
for (size_t i=0; i<missing; ++i)
Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- utilities/parser.cpp 8 Jun 2006 12:25:35 -0000 1.8
+++ utilities/parser.cpp 6 Aug 2006 02:00:54 -0000 1.9
@@ -292,7 +292,7 @@
bool cxform::has_mult;
// tag 0
-void parse_end_movie(stream* input, int tag_type)
+void parse_end_movie(stream* /* input */, int tag_type)
{
assert(tag_type == 0);
ident--;
@@ -301,7 +301,7 @@
}
// tag 1
-void parse_show_frame(stream* input, int tag_type)
+void parse_show_frame(stream* /* input */, int tag_type)
{
assert(tag_type == 1);
ident--;
@@ -446,7 +446,7 @@
ident--;
}
-void parse_jpeg_tables(stream* input, int tag_type)
+void parse_jpeg_tables(stream* /* input */, int tag_type)
{
assert(tag_type==8);
log_msg("define jpeg table\n\n");
@@ -460,7 +460,7 @@
rgb::write();
}
-void parse_do_action(stream* input, int tag_type)
+void parse_do_action(stream* /* input */, int tag_type)
{
assert(tag_type==12);
log_msg("do action:\n");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash configure.ac ChangeLog plugin/klash/Makef...,
Rob Savoye <=