[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/curl_adapter.cpp server...
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] gnash ChangeLog libbase/curl_adapter.cpp server... |
|
Date: |
Mon, 17 Jul 2006 01:22:33 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 06/07/17 01:22:33
Modified files:
. : ChangeLog
libbase : curl_adapter.cpp
server : ActionExec.cpp action_buffer.cpp array.cpp
server/swf : ASHandlers.cpp tag_loaders.cpp
Log message:
Trivially fix compiler warnings.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.498&r2=1.499
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ActionExec.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action_buffer.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.16&r2=1.17
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -b -r1.498 -r1.499
--- ChangeLog 16 Jul 2006 21:42:35 -0000 1.498
+++ ChangeLog 17 Jul 2006 01:22:32 -0000 1.499
@@ -1,3 +1,9 @@
+2006-07-17 Bastiaan Jacques <address@hidden>
+
+ * libbase/curl_adapter.cpp, server/{ActionExec.cpp, action_buffer.cpp,
+ array.cpp, swf/ASHandlers.cpp, swf/tag_loaders.cpp}: Trivially fix
+ compiler warnings.
+
2006-07-16 Bastiaan Jacques <address@hidden>
* gui/kde.cpp: Update setCallback() to match the arguments in the
Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/curl_adapter.cpp 7 Jun 2006 04:28:46 -0000 1.7
+++ libbase/curl_adapter.cpp 17 Jul 2006 01:22:32 -0000 1.8
@@ -143,7 +143,7 @@
// Attempt at filling the cache up to the given size.
// Will call libcurl routines to fetch data.
- void fill_cache(size_t size);
+ void fill_cache(off_t size);
// Append sz bytes to the cache
size_t cache(void *from, size_t sz);
@@ -205,7 +205,7 @@
char errmsg[256];
snprintf(errmsg, 255,
- "writing to cache file: requested %d, wrote %d (%s)",
+ "writing to cache file: requested %zd, wrote %zd (%s)",
sz, wrote, strerror(errno));
fprintf(stderr, "%s\n", errmsg);
throw gnash::GnashException(errmsg);
@@ -220,7 +220,7 @@
/*private*/
void
-CurlStreamFile::fill_cache(size_t size)
+CurlStreamFile::fill_cache(off_t size)
{
#ifdef GNASH_CURL_VERBOSE
fprintf(stderr, "fill_cache(%d) called\n", size);
Index: server/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/ActionExec.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/ActionExec.cpp 7 Jul 2006 13:49:40 -0000 1.14
+++ server/ActionExec.cpp 17 Jul 2006 01:22:32 -0000 1.15
@@ -130,7 +130,7 @@
//UNUSED(original_target); // Avoid warnings.
#if DEBUG_STACK
- log_action("at ActionExec operator() start, pc=%d, stop_pc=%d,
code.size=%d.", 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);
@@ -178,7 +178,7 @@
ash.execute((action_type)action_id, *this);
#if DEBUG_STACK
- log_action( " PC is now %d.", pc);
+ log_action( " PC is now %zd.", pc);
stringstream ss;
env.dump_stack(ss);
env.dump_global_registers(ss);
Index: server/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action_buffer.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/action_buffer.cpp 7 Jul 2006 13:49:40 -0000 1.9
+++ server/action_buffer.cpp 17 Jul 2006 01:22:32 -0000 1.10
@@ -86,9 +86,10 @@
{
// Read action bytes.
for (;;) {
+#if 0
size_t instruction_start = m_buffer.size();
-
size_t pc = m_buffer.size();
+#endif
uint8_t action_id = in->read_u8();
m_buffer.push_back(action_id);
@@ -138,7 +139,7 @@
}
if (m_decl_dict_processed_at != -1) {
- log_error("process_decl_dict(%d, %d): 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/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/array.cpp 7 Jul 2006 13:49:40 -0000 1.32
+++ server/array.cpp 17 Jul 2006 01:22:32 -0000 1.33
@@ -559,7 +559,7 @@
// Get our index, log, then return result
(*fn.result) = array->pop();
- log_action("calling array pop, result:%s, new array
size:%zd\n",fn.result->to_string(),array->size());
+ log_action("calling array pop, result:%s, new array
size:%d\n",fn.result->to_string(),array->size());
}
// Callback to pop a value from the front of an array
@@ -572,7 +572,7 @@
// Get our index, log, then return result
(*fn.result) = array->shift();
- log_action("calling array shift, result:%s, new array
size:%zd\n",fn.result->to_string(),array->size());
+ log_action("calling array shift, result:%s, new array
size:%d\n",fn.result->to_string(),array->size());
}
// Callback to reverse the position of the elements in an array
@@ -587,7 +587,7 @@
fn.result->set_as_object(array);
- log_action("called array reverse, result:%s, new array
size:%zd\n",fn.result->to_string(),array->size());
+ log_action("called array reverse, result:%s, new array
size:%d\n",fn.result->to_string(),array->size());
}
@@ -696,7 +696,7 @@
// if it's still negative, this is a problem
if (startindex < 0 || (unsigned int)startindex > array->size())
{
- log_action("ERROR: bad startindex sent to array_slice!
startindex: %s, Length: %zd",
+ log_action("ERROR: bad startindex sent to array_slice!
startindex: %s, Length: %d",
fn.arg(0).to_string(),array->size());
return;
}
@@ -711,7 +711,7 @@
endindex++;
if (endindex < 0)
{
- log_action("ERROR: bad endindex sent to array_slice!
endindex: %s, length: %zd",
+ log_action("ERROR: bad endindex sent to array_slice!
endindex: %s, length: %d",
fn.arg(1).to_string(),array->size());
return;
}
Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/swf/ASHandlers.cpp 8 Jul 2006 00:15:09 -0000 1.35
+++ server/swf/ASHandlers.cpp 17 Jul 2006 01:22:32 -0000 1.36
@@ -684,7 +684,7 @@
size_t tag_len = code.read_int16(thread.pc+1);
if ( tag_len != 3 )
{
- log_warning("Malformed SWF: ActionWaitForFrame (0x%X) tag
length == %d (expected 3)", SWF::ACTION_WAITFORFRAME, tag_len);
+ log_warning("Malformed SWF: ActionWaitForFrame (0x%X) tag
length == %zd (expected 3)", SWF::ACTION_WAITFORFRAME, tag_len);
}
// we don't use the stack!
@@ -1548,8 +1548,8 @@
if (next_pc > stop_pc)
{
- log_error("branch to offset %d -- "
- " this section only runs to %d. "
+ log_error("branch to offset %zd -- "
+ " this section only runs to %zd. "
" Malformed SWF !.\n",
next_pc,
stop_pc);
@@ -2778,7 +2778,7 @@
{
if ( static_cast<size_t>(x) > _handlers.size() )
{
- log_error("at SWFHandlers::action_name(%d) call time, _handlers
size is %d", x, _handlers.size());
+ log_error("at SWFHandlers::action_name(%d) call time, _handlers
size is %zd", x, _handlers.size());
return NULL;
}
else
@@ -2795,8 +2795,8 @@
size_t missing = required-env.stack_size();
- log_error("Stack underrun: %d elements required, %d available. "
- "Fixing by pushing %d undefined values on the missing slots.",
+ log_error("Stack underrun: %zd elements required, %zd available. "
+ "Fixing by pushing %zd 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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/swf/tag_loaders.cpp 7 Jul 2006 13:49:40 -0000 1.16
+++ server/swf/tag_loaders.cpp 17 Jul 2006 01:22:32 -0000 1.17
@@ -871,9 +871,9 @@
action_buffer action;
action.read(in);
- if (action.get_length() != (int)
event_length)
+ if (action.get_length() != event_length)
{
- log_error("error --
swf_event::read(), event_length = %d, but read %d\n",
+ log_error("error --
swf_event::read(), event_length = %d, but read %zd\n",
event_length,
action.get_length());
break;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog libbase/curl_adapter.cpp server...,
Bastiaan Jacques <=