[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/swf/ASHandlers.cpp
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/swf/ASHandlers.cpp |
|
Date: |
Thu, 03 Aug 2006 16:50:05 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/08/03 16:50:05
Modified files:
. : ChangeLog
server/swf : ASHandlers.cpp
Log message:
removed superflous newlines at end of debug messages.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.575&r2=1.576
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.40&r2=1.41
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.575
retrieving revision 1.576
diff -u -b -r1.575 -r1.576
--- ChangeLog 3 Aug 2006 16:48:11 -0000 1.575
+++ ChangeLog 3 Aug 2006 16:50:05 -0000 1.576
@@ -1,7 +1,7 @@
2006-08-03 Sandro Santilli <address@hidden>
- * server/as_environment.cpp: removed superflous newlines at
- end of debug messages.
+ * server/as_environment.cpp, server/swf/ASHandlers.cpp:
+ removed superflous newlines at end of debug messages.
2006-08-02 Sandro Santilli <address@hidden>
Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/swf/ASHandlers.cpp 30 Jul 2006 01:41:17 -0000 1.40
+++ server/swf/ASHandlers.cpp 3 Aug 2006 16:50:05 -0000 1.41
@@ -102,7 +102,7 @@
if (constructor.get_type() == as_value::C_FUNCTION)
{
- log_action("Constructor is a C_FUNCTION\n");
+ log_action("Constructor is a C_FUNCTION");
// C function is responsible for creating the new object and setting
members.
fn_call call(&new_obj, NULL, &env, nargs, first_arg_index);
@@ -113,7 +113,7 @@
{
// This function is being used as a constructor; make sure
// it has a prototype object.
- log_action("Constructor is an AS_FUNCTION\n");
+ log_action("Constructor is an AS_FUNCTION");
// a built-in class takes care of assigning a prototype
// TODO: change this
@@ -899,11 +899,11 @@
as_value variable = env.get_variable(var_string);
env.push(variable);
if (variable.to_object() == NULL) {
- log_action("-- get var: %s=%s\n",
+ log_action("-- get var: %s=%s",
var_string.c_str(),
variable.to_tu_string().c_str());
} else {
- log_action("-- get var: %s=%s at %p\n",
+ log_action("-- get var: %s=%s at %p",
var_string.c_str(),
variable.to_tu_string().c_str(),
(void*)variable.to_object());
@@ -921,7 +921,7 @@
ensure_stack(env, 2);
env.set_variable(env.top(1).to_tu_string(), env.top(0));
- log_action("\n-- set var: %s", env.top(1).to_string());
+ log_action("-- set var: %s", env.top(1).to_string());
env.drop(2);
}
@@ -1003,7 +1003,7 @@
else
{
log_error("invalid property query, property "
- "number %d\n", prop_number);
+ "number %d", prop_number);
env.top(1) = as_value();
}
}
@@ -1034,7 +1034,7 @@
}
else
{
- log_error("invalid set_property, property number %d\n",
prop_number);
+ log_error("invalid set_property, property number %d", prop_number);
}
}
@@ -1103,7 +1103,7 @@
st.m_character = env.find_target(env.top(0));
if (st.m_character == NULL) {
- log_error("start_drag of invalid target '%s'.\n",
+ log_error("start_drag of invalid target '%s'.",
env.top(0).to_string());
}
@@ -1178,7 +1178,7 @@
// Invalid args!
if (!super || ! instance)
{
- log_action("-- %s instance_of %s (invalid args?)\n",
+ log_action("-- %s instance_of %s (invalid args?)",
env.top(1).to_string(),
env.top(0).to_string());
@@ -1362,15 +1362,15 @@
++i;
if ( thread.isFunction2() ) {
env.push(env.local_register(reg));
- log_action("-------------- pushed local register[%d] =
'%s'\n",
+ log_action("-------------- pushed local register[%d] =
'%s'",
reg,
env.top(0).to_string());
} else if (reg >= 4) {
env.push(as_value());
- log_error("push register[%d] -- register out of
bounds!\n", reg);
+ log_error("push register[%d] -- register out of bounds!",
reg);
} else {
env.push(env.global_register(reg));
- log_action("-------------- pushed global register[%d] =
'%s'\n",
+ log_action("-------------- pushed global register[%d] =
'%s'",
reg,
env.top(0).to_string());
}
@@ -1378,7 +1378,7 @@
} else if (type == 5) {
bool bool_val = code[i+3] ? true : false;
i++;
-// log_msg("bool(%d)\n", bool_val);
+// log_msg("bool(%d)", bool_val);
env.push(bool_val);
log_action("-------------- pushed %s",
@@ -1406,7 +1406,7 @@
log_action("-------------- pushed '%s'",
code.dictionary_get(id));
} else {
- log_error("dict_lookup(%d) is out of bounds!\n", id);
+ log_error("dict_lookup(%d) is out of bounds!", id);
env.push(0);
log_action("-------------- pushed 0");
}
@@ -1415,10 +1415,10 @@
i += 2;
if ( id < (int) code.dictionary_size() ) {
env.push( code.dictionary_get(id) );
- log_action("-------------- pushed '%s'\n",
+ log_action("-------------- pushed '%s'",
code.dictionary_get(id) );
} else {
- log_error("dict_lookup(%d) is out of bounds!\n", id);
+ log_error("dict_lookup(%d) is out of bounds!", id);
env.push(0);
log_action("-------------- pushed 0");
@@ -1461,7 +1461,7 @@
else
{
#ifdef EXTERN_MOVIE
-// log_error("get url2: target=%s, url=%s\n", target, url);
+// log_error("get url2: target=%s, url=%s", target, url);
character* target_movie = env.find_target(target);
if (target_movie != NULL)
@@ -1471,7 +1471,7 @@
}
else
{
- log_error("get url2: target %s not found\n", target);
+ log_error("get url2: target %s not found", target);
}
#else
string command = "firefox -remote \"openurl(";
@@ -1531,8 +1531,7 @@
int16_t offset = code.read_int16(pc+3);
- bool test = env.top(0).to_bool();
- env.drop(1);
+ bool test = env.pop().to_bool();
if (test)
{
next_pc += offset;
@@ -1541,7 +1540,7 @@
{
log_error("branch to offset %ld -- "
" this section only runs to %ld. "
- " Malformed SWF !.\n",
+ " Malformed SWF !.",
next_pc,
stop_pc);
}
@@ -1734,7 +1733,7 @@
if (function.get_type() != as_value::AS_FUNCTION &&
function.get_type() != as_value::C_FUNCTION)
{
- log_error("error in call_function: '%s' is not a
function\n",
+ log_error("error in call_function: '%s' is not a function",
function_name.c_str());
}
}
@@ -1808,7 +1807,7 @@
result = fmod(x, y);
// env.top(1).set_double(fmod(env.top(1).to_bool() && env.top(0).to_bool());
// env.drop(1);
-// log_error("modulo x=%f, y=%f, z=%f\n",x,y,result.to_number());
+// log_error("modulo x=%f, y=%f, z=%f",x,y,result.to_number());
env.push(result);
}
@@ -1823,7 +1822,7 @@
// doActionNew(env, with_stack);
as_value classname = env.pop();
- log_action("---new object: %s\n",
+ log_action("---new object: %s",
classname.to_tu_string().c_str());
int nargs = (int) env.pop().to_number();
@@ -1838,7 +1837,7 @@
env.push(new_obj);
#if 0
- log_msg("new object at %p\n", new_obj.to_object());
+ log_msg("new object at %p", new_obj.to_object());
#endif
}
@@ -1867,7 +1866,7 @@
ensure_stack(env, (unsigned int)array_size); // array elements
- //log_msg("xxx init array: size = %d, top of stack = %d\n", array_size,
env.get_top_index());//xxxxx
+ //log_msg("xxx init array: size = %d, top of stack = %d", array_size,
env.get_top_index());//xxxxx
// Call the array constructor, to create an empty array.
as_value result;
@@ -1922,7 +1921,7 @@
}
// @@ TODO
- //log_error("checkme opcode: %02X\n", action_id);
+ //log_error("checkme opcode: %02X", action_id);
as_value new_obj;
new_obj.set_as_object(new_obj_ptr.get_ptr());
@@ -1963,7 +1962,7 @@
env.top(0).set_string("function");
break;
default:
- log_error("typeof unknown type: %02X\n", env.top(0).get_type());
+ log_error("typeof unknown type: %02X", env.top(0).get_type());
env.top(0).set_undefined();
break;
}
@@ -2003,7 +2002,7 @@
const char* val = it->first.c_str();
env.push(as_value(val));
- log_action("---enumerate - push: %s\n", val);
+ log_action("---enumerate - push: %s", val);
}
}
@@ -2030,7 +2029,7 @@
const char* val = it->first.c_str();
env.push(as_value(val));
- log_action("---enumerate - push: %s\n", val);
+ log_action("---enumerate - push: %s", val);
}
};
@@ -2054,7 +2053,7 @@
// The end of the enumeration, don't set top(0) *before*
// fetching the as_object* obj above or it will get lost
env.top(0).set_null();
- log_action("---enumerate - push: NULL\n");
+ log_action("---enumerate - push: NULL");
if ( ! obj )
{
@@ -2170,13 +2169,13 @@
if (!obj) {
// IF_VERBOSE_DEBUG(log_msg("getMember called against "
// "a value that does not cast "
-// "to an as_object: %s\n",
target.to_string()));
+// "to an as_object: %s",
target.to_string()));
env.top(1).set_undefined();
env.drop(1);
return;
}
- log_action(" ActionGetMember: target: %s (object %p)\n",
+ log_action(" ActionGetMember: target: %s (object %p)",
target.to_string(), (void*)obj);
// Special case: String has a member "length"
@@ -2189,7 +2188,7 @@
env.top(1).set_undefined();
}
- log_action("-- get_member %s=%s\n",
+ log_action("-- get_member %s=%s",
member_name.to_tu_string().c_str(),
env.top(1).to_tu_string().c_str());
}
@@ -2208,13 +2207,13 @@
as_object* obj = env.top(2).to_object();
if (obj) {
obj->set_member(env.top(1).to_tu_string(), env.top(0));
- log_action("-- set_member %s.%s=%s\n",
+ log_action("-- set_member %s.%s=%s",
env.top(2).to_tu_string().c_str(),
env.top(1).to_tu_string().c_str(),
env.top(0).to_tu_string().c_str());
} else {
// Invalid object, can't set.
- log_action("-- set_member %s.%s=%s on invalid object!\n",
+ log_action("-- set_member %s.%s=%s on invalid object!",
env.top(2).to_tu_string().c_str(),
env.top(1).to_tu_string().c_str(),
env.top(0).to_tu_string().c_str());
@@ -2257,30 +2256,30 @@
// Get name of the method
const tu_string &method_name = env.top(0).to_tu_string();
- log_action(" method name: %s\n", method_name.c_str());
+ log_action(" method name: %s", method_name.c_str());
// Get an object
as_value& obj_value = env.top(1);
as_object *obj = obj_value.to_object();
- log_action(" method object: %p\n", (void*)obj);
+ log_action(" method object: %p", (void*)obj);
// Get number of arguments
int nargs = static_cast<int>(env.top(2).to_number());
- log_action(" method nargs: %d\n", nargs);
+ log_action(" method nargs: %d", nargs);
ensure_stack(env, 3+nargs); // actual args
if (!obj) {
log_error("call_method invoked in something that "
- "doesn't cast to an as_object: %s\n",
+ "doesn't cast to an as_object: %s",
obj_value.to_string());
} else {
as_value method;
if (obj->get_member(method_name, &method)) {
if (method.get_type() != as_value::AS_FUNCTION &&
method.get_type() != as_value::C_FUNCTION) {
- log_error("call_method: '%s' is not a method\n",
+ log_error("call_method: '%s' is not a method",
method_name.c_str());
} else {
result = call_method( method, &env, obj, nargs,
@@ -2288,7 +2287,7 @@
}
} else {
log_error("call_method can't find method %s "
- "for object %s (%p)\n", method_name.c_str(),
+ "for object %s (%p)", method_name.c_str(),
typeid(*obj).name(), (void*)obj);
}
}
@@ -2297,7 +2296,7 @@
env.top(0) = result;
// This is to check stack status after call method
- //log_msg("at doActionCallMethod() end, stack: \n"); env.dump_stack();
+ //log_msg("at doActionCallMethod() end, stack: "); env.dump_stack();
}
@@ -2371,7 +2370,7 @@
// Invalid args!
if (!super || ! instance) {
//IF_VERBOSE_ACTION(
- log_action("-- %s instance_of %s (invalid args?)\n",
+ log_action("-- %s instance_of %s (invalid args?)",
env.top(1).to_string(),
env.top(0).to_string());
//);
@@ -2401,7 +2400,7 @@
// The end of the enumeration, don't set top(0) *before*
// fetching the as_object* obj above or it will get lost
env.top(0).set_null();
- log_action("---enumerate - push: NULL\n");
+ log_action("---enumerate - push: NULL");
if ( ! obj )
{
@@ -2583,7 +2582,7 @@
// @@ security: watch out for possible missing terminator here!
const char* arg = code.read_string(i);
- log_msg("Setting register %d/%d to %s", arg_register, nargs,
arg);
+ //log_msg("Setting register %d/%d to %s", arg_register, nargs,
arg);
func->add_arg(arg_register, arg);
i += strlen(arg)+1;
@@ -2634,7 +2633,7 @@
size_t pc = thread.pc;
size_t next_pc = thread.next_pc;
- log_action("-------------- with block start: stack size is %ld\n",
+ log_action("-------------- with block start: stack size is %ld",
with_stack.size());
if (with_stack.size() < 8)
@@ -2744,7 +2743,7 @@
{
env.local_register(reg) = env.top(0);
- log_action("-------------- local register[%d] = '%s'\n",
+ log_action("-------------- local register[%d] = '%s'",
reg, env.top(0).to_string());
}
@@ -2752,7 +2751,7 @@
{
env.global_register(reg) = env.top(0);
- log_action("-------------- global register[%d] = '%s'\n",
+ log_action("-------------- global register[%d] = '%s'",
reg, env.top(0).to_string() );
}
- [Gnash-commit] gnash ChangeLog server/swf/ASHandlers.cpp,
Sandro Santilli <=