[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/server/asobj Date.cpp Global.cpp string.cpp
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash/server/asobj Date.cpp Global.cpp string.cpp |
|
Date: |
Fri, 02 Feb 2007 02:10:36 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/02/02 02:10:36
Modified files:
server/asobj : Date.cpp Global.cpp string.cpp
Log message:
* server/asobj/Date.cpp, Global.cpp, string.cpp: Add comma after
__FUNCTION__ for log_aserror.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.14&r2=1.15
Patches:
Index: Date.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Date.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- Date.cpp 2 Feb 2007 02:00:39 -0000 1.11
+++ Date.cpp 2 Feb 2007 02:10:36 -0000 1.12
@@ -496,7 +496,7 @@
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
date->obj.date = (long int)(fn.arg(0).to_number());
@@ -505,7 +505,7 @@
if (fn.nargs > 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than one argument");
+ log_aserror(__FUNCTION__, " has more than one argument");
)
}
@@ -520,7 +520,7 @@
// assert(fn.nargs >= 1 && fn.nargs <= 3);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
date->obj.year = (long int)(fn.arg(0).to_number() - 1900);
@@ -530,7 +530,7 @@
date->obj.date = (long int)(fn.arg(2).to_number());
if (fn.nargs > 3) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than three arguments");
+ log_aserror(__FUNCTION__, " has more than three arguments");
)
}
date->obj.Normalize();
@@ -543,7 +543,7 @@
// assert(fn.nargs >= 1 && fn.nargs <= 4);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
date->obj.hour = (long int)(fn.arg(0).to_number());
@@ -555,7 +555,7 @@
date->obj.millisecond = (long int)(fn.arg(3).to_number());
if (fn.nargs > 4) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than four arguments");
+ log_aserror(__FUNCTION__, " has more than four arguments");
)
}
date->obj.Normalize();
@@ -568,13 +568,13 @@
// assert(fn.nargs == 1);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
date->obj.millisecond = (long int)(fn.arg(0).to_number());
if (fn.nargs > 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than one argument");
+ log_aserror(__FUNCTION__, " has more than one argument");
)
}
date->obj.Normalize();
@@ -587,7 +587,7 @@
//assert(fn.nargs >= 1 && fn.nargs <= 3);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
// Seconds (value between 0 and 59) won't be affected by timezone
@@ -596,7 +596,7 @@
if (fn.nargs >= 3) date->obj.millisecond = (long
int)(fn.arg(2).to_number());
if (fn.nargs > 3) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than three arguments");
+ log_aserror(__FUNCTION__, " has more than three arguments");
)
}
date->obj.Normalize();
@@ -609,7 +609,7 @@
// assert(fn.nargs >= 1 && fn.nargs <= 2);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
date->obj.month = (long int)(fn.arg(0).to_number());
@@ -617,7 +617,7 @@
date->obj.date = (long int)(fn.arg(1).to_number());
if (fn.nargs > 2) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than two arguments");
+ log_aserror(__FUNCTION__, " has more than two arguments");
)
}
@@ -631,7 +631,7 @@
// assert(fn.nargs >= 1 && fn.nargs <= 2);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
// Seconds (value between 0 and 59) won't be affected by timezone
@@ -640,7 +640,7 @@
date->obj.millisecond = (long int)(fn.arg(1).to_number());
if (fn.nargs > 2) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than two arguments");
+ log_aserror(__FUNCTION__, " has more than two arguments");
)
}
@@ -654,7 +654,7 @@
// assert(fn.nargs == 1);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
double millitime = fn.arg(0).to_number();
@@ -679,7 +679,7 @@
// assert(fn.nargs == 1);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
tm utctime = date->obj.convertUTC();
@@ -695,7 +695,7 @@
if (fn.nargs > 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than one argument");
+ log_aserror(__FUNCTION__, " has more than one argument");
)
}
}
@@ -708,7 +708,7 @@
// assert(fn.nargs >= 1 && fn.nargs <= 3);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
tm utctime = date->obj.convertUTC();
@@ -720,7 +720,7 @@
utctime.tm_mday = (long int)(fn.arg(2).to_number());
if (fn.nargs > 3) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than three arguments");
+ log_aserror(__FUNCTION__, " has more than three arguments");
)
}
@@ -740,7 +740,7 @@
// assert(fn.nargs >= 1 && fn.nargs <= 4);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
@@ -759,7 +759,7 @@
utctime.tm_sec = (long int)(fn.arg(2).to_number());
if (fn.nargs > 4) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than four arguments");
+ log_aserror(__FUNCTION__, " has more than four arguments");
)
}
@@ -779,13 +779,13 @@
// assert(fn.nargs == 1);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
date->obj.millisecond = (long int)(fn.arg(0).to_number());
if (fn.nargs > 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than one argument");
+ log_aserror(__FUNCTION__, " has more than one argument");
)
}
@@ -799,7 +799,7 @@
// assert(fn.nargs >= 1 && fn.nargs <= 3);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
// Seconds (value between 0 and 59) won't be affected by timezone
@@ -808,7 +808,7 @@
if (fn.nargs >= 3) date->obj.millisecond = (long
int)(fn.arg(2).to_number());
if (fn.nargs > 3) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than three arguments");
+ log_aserror(__FUNCTION__, " has more than three arguments");
)
}
@@ -828,7 +828,7 @@
// assert(fn.nargs >= 1 && fn.nargs <= 2);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
tm utctime = date->obj.convertUTC();
@@ -838,7 +838,7 @@
utctime.tm_mday = (long int)(fn.arg(1).to_number());
if (fn.nargs > 2) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than two arguments");
+ log_aserror(__FUNCTION__, " has more than two arguments");
)
}
@@ -857,7 +857,7 @@
// assert(fn.nargs >= 1 && fn.nargs <= 2);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
// Seconds (value between 0 and 59) won't be affected by timezone
@@ -866,7 +866,7 @@
date->obj.millisecond = (long int)(fn.arg(1).to_number());
if (fn.nargs > 2) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than two arguments");
+ log_aserror(__FUNCTION__, " has more than two arguments");
)
}
@@ -883,14 +883,14 @@
// assert(fn.nargs == 1);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
} else {
date->obj.year = (long int)(fn.arg(0).to_number());
if (date->obj.year < 100) date->obj.year += 1900;
if (fn.nargs > 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " has more than two arguments");
+ log_aserror(__FUNCTION__, " has more than two arguments");
)
}
Index: Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- Global.cpp 1 Feb 2007 23:18:21 -0000 1.39
+++ Global.cpp 2 Feb 2007 02:10:36 -0000 1.40
@@ -18,7 +18,7 @@
// Implementation of the Global ActionScript Object
-/* $Id: Global.cpp,v 1.39 2007/02/01 23:18:21 martinwguy Exp $ */
+/* $Id: Global.cpp,v 1.40 2007/02/02 02:10:36 rsavoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -72,13 +72,13 @@
#define ASSERT_FN_ARGS_IS_1 \
if (fn.nargs < 1) {
\
IF_VERBOSE_ASCODING_ERRORS( \
- log_aserror(__FUNCTION__ " needs one argument"); \
+ log_aserror(__FUNCTION__, " needs one argument"); \
) \
return; \
} \
IF_VERBOSE_ASCODING_ERRORS(
\
if (fn.nargs > 1) \
- log_aserror(__FUNCTION__ " has more than one argument"); \
+ log_aserror(__FUNCTION__, " has more than one argument"); \
)
using namespace std;
@@ -217,13 +217,13 @@
// assert(fn.nargs == 2 || fn.nargs == 1);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs at least one argument");
+ log_aserror(__FUNCTION__, " needs at least one argument");
)
return;
}
IF_VERBOSE_ASCODING_ERRORS(
if (fn.nargs > 2)
- log_aserror(__FUNCTION__ " has more than two arguments");
+ log_aserror(__FUNCTION__, " has more than two arguments");
)
// Make sure our argument is the correct type
@@ -331,15 +331,15 @@
if (fn.nargs < 3) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs at least three arguments");
+ log_aserror(__FUNCTION__, " needs at least three arguments");
)
return;
}
IF_VERBOSE_ASCODING_ERRORS(
if (fn.nargs > 4)
- log_aserror(__FUNCTION__ " has more than four arguments");
+ log_aserror(__FUNCTION__, " has more than four arguments");
if (version == 5 && fn.nargs == 4)
- log_aserror(__FUNCTION__ " has four arguments in a SWF version 5
movie");
+ log_aserror(__FUNCTION__, " has four arguments in a SWF version 5
movie");
)
// ASSetPropFlags(obj, props, n, allowFalse=false)
Index: string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- string.cpp 1 Feb 2007 23:18:21 -0000 1.14
+++ string.cpp 2 Feb 2007 02:10:36 -0000 1.15
@@ -14,11 +14,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-//
-//
-
-/* $Id: string.cpp,v 1.14 2007/02/01 23:18:21 martinwguy Exp $ */
+/* $Id: string.cpp,v 1.15 2007/02/02 02:10:36 rsavoye Exp $ */
// Implementation of ActionScript String class.
@@ -452,14 +448,14 @@
// assert(fn.nargs == 1);
if (fn.nargs < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(__FUNCTION__ " needs one argument");
+ log_aserror(__FUNCTION__, " needs one argument");
)
fn.result->set_tu_string(""); // Same as for out-of-range arg
return;
}
IF_VERBOSE_ASCODING_ERRORS(
if (fn.nargs > 1)
- log_aserror(__FUNCTION__ " has more than one argument");
+ log_aserror(__FUNCTION__, " has more than one argument");
)
int index = static_cast<int>(fn.arg(0).to_number());
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash/server/asobj Date.cpp Global.cpp string.cpp,
Rob Savoye <=