[kaffe] CVS kaffe (doogie): Sparse NULL-constant fixes.
Kaffe CVS
cvs-commits at kaffe.org
Sun Dec 19 16:17:15 PST 2004
PatchSet 5671
Date: 2004/12/20 00:13:14
Author: doogie
Branch: HEAD
Tag: (none)
Log:
Sparse NULL-constant fixes.
Members:
ChangeLog:1.3216->1.3217
kaffe/kaffevm/jni/jni-arrays.c:1.4->1.5
kaffe/kaffevm/jni/jni-base.c:1.8->1.9
kaffe/kaffevm/jni/jni-callmethod.c:1.3->1.4
kaffe/kaffevm/jni/jni-fields.c:1.2->1.3
kaffe/kaffevm/jni/jni-helpers.c:1.2->1.3
kaffe/kaffevm/jni/jni-string.c:1.4->1.5
kaffe/kaffevm/jni/jni.c:1.12->1.13
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3216 kaffe/ChangeLog:1.3217
--- kaffe/ChangeLog:1.3216 Sun Dec 19 23:45:06 2004
+++ kaffe/ChangeLog Mon Dec 20 00:13:14 2004
@@ -1,5 +1,13 @@
2004-12-19 Adam Heath <doogie at brainfood.com>
+ * kaffe/kaffevm/jni/jni-arrays.c, kaffe/kaffevm/jni/jni-base.c
+ kaffe/kaffevm/jni/jni-callmethod.c, kaffe/kaffevm/jni/jni-fields.c,
+ kaffe/kaffevm/jni/jni-helpers.c, kaffe/kaffevm/jni/jni-string.c,
+ kaffe/kaffevm/jni/jni.c:
+ Sparse NULL-constant fixes.
+
+2004-12-19 Adam Heath <doogie at brainfood.com>
+
* config/i386/jit-i386.def, kaffe/kaffevm/intrp/machine.c,
kaffe/kaffevm/jit/machine.c:
With recent DBG() macro now behaving like a real statement, all
Index: kaffe/kaffe/kaffevm/jni/jni-arrays.c
diff -u kaffe/kaffe/kaffevm/jni/jni-arrays.c:1.4 kaffe/kaffe/kaffevm/jni/jni-arrays.c:1.5
--- kaffe/kaffe/kaffevm/jni/jni-arrays.c:1.4 Sat Dec 11 20:49:40 2004
+++ kaffe/kaffe/kaffevm/jni/jni-arrays.c Mon Dec 20 00:13:16 2004
@@ -26,7 +26,7 @@
{
jobject obj;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (elem >= (jsize)obj_length((HArrayOfObject*)arr)) {
throwException(ArrayIndexOutOfBoundsException);
@@ -57,7 +57,7 @@
HArrayOfObject* obj;
jsize i;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
obj = (HArrayOfObject*)newArray((Hjava_lang_Class*)cls, len);
@@ -76,7 +76,7 @@
{
jbooleanArray arr;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
arr = newArray(booleanClass, len);
@@ -90,7 +90,7 @@
{
jbyteArray arr;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
arr = newArray(byteClass, len);
@@ -104,7 +104,7 @@
{
jcharArray arr;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
arr = newArray(charClass, len);
@@ -118,7 +118,7 @@
{
jshortArray arr;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
arr = newArray(shortClass, len);
@@ -132,7 +132,7 @@
{
jintArray arr;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
arr = newArray(intClass, len);
@@ -146,7 +146,7 @@
{
jlongArray arr;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
arr = newArray(longClass, len);
@@ -160,7 +160,7 @@
{
jfloatArray arr;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
arr = newArray(floatClass, len);
@@ -174,7 +174,7 @@
{
jdoubleArray arr;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
arr = newArray(doubleClass, len);
@@ -187,7 +187,7 @@
KaffeJNI_GetBooleanArrayElements(JNIEnv* env UNUSED, jbooleanArray arr, jbool* iscopy)
{
jboolean* array;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
@@ -202,7 +202,7 @@
KaffeJNI_GetByteArrayElements(JNIEnv* env UNUSED, jbyteArray arr, jbool* iscopy)
{
jbyte* array;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
@@ -223,7 +223,7 @@
KaffeJNI_GetCharArrayElements(JNIEnv* env UNUSED, jcharArray arr, jbool* iscopy)
{
jchar* array;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
@@ -238,7 +238,7 @@
KaffeJNI_GetShortArrayElements(JNIEnv* env UNUSED, jshortArray arr, jbool* iscopy)
{
jshort* array;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
@@ -253,7 +253,7 @@
KaffeJNI_GetIntArrayElements(JNIEnv* env UNUSED, jintArray arr, jbool* iscopy)
{
jint* array;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
@@ -268,7 +268,7 @@
KaffeJNI_GetLongArrayElements(JNIEnv* env UNUSED, jlongArray arr, jbool* iscopy)
{
jlong* array;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
@@ -283,7 +283,7 @@
KaffeJNI_GetFloatArrayElements(JNIEnv* env UNUSED, jfloatArray arr, jbool* iscopy)
{
jfloat* array;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
@@ -298,7 +298,7 @@
KaffeJNI_GetDoubleArrayElements(JNIEnv* env UNUSED, jdoubleArray arr, jbool* iscopy)
{
jdouble* array;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (iscopy != NULL) {
*iscopy = JNI_FALSE;
Index: kaffe/kaffe/kaffevm/jni/jni-base.c
diff -u kaffe/kaffe/kaffevm/jni/jni-base.c:1.8 kaffe/kaffe/kaffevm/jni/jni-base.c:1.9
--- kaffe/kaffe/kaffevm/jni/jni-base.c:1.8 Sun Dec 12 21:16:02 2004
+++ kaffe/kaffe/kaffevm/jni/jni-base.c Mon Dec 20 00:13:16 2004
@@ -46,7 +46,7 @@
break;
case JNI_VERSION_1_2:
vm_args->ignoreUnrecognized = JNI_FALSE;
- vm_args->options = JNI_FALSE;
+ vm_args->options = NULL;
vm_args->nOptions = 0;
break;
default:
Index: kaffe/kaffe/kaffevm/jni/jni-callmethod.c
diff -u kaffe/kaffe/kaffevm/jni/jni-callmethod.c:1.3 kaffe/kaffe/kaffevm/jni/jni-callmethod.c:1.4
--- kaffe/kaffe/kaffevm/jni/jni-callmethod.c:1.3 Thu Aug 19 19:29:06 2004
+++ kaffe/kaffe/kaffevm/jni/jni-callmethod.c Mon Dec 20 00:13:16 2004
@@ -66,7 +66,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodV(m, getMethodFunc (m, o), obj, args, 0);
+ callMethodV(m, getMethodFunc (m, o), obj, args, NULL);
END_EXCEPTION_HANDLING();
}
@@ -97,7 +97,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodA(m, getMethodFunc (m, o), obj, args, 0, 0);
+ callMethodA(m, getMethodFunc (m, o), obj, args, NULL, 0);
END_EXCEPTION_HANDLING();
}
@@ -113,7 +113,7 @@
jvalue retval;
Method* m = (Method*)meth;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (METHOD_IS_STATIC(m)) {
throwException(NoSuchMethodError(m->name->data));
@@ -132,7 +132,7 @@
va_list args;
jobject r;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
va_start(args, meth);
r = KaffeJNI_CallNonvirtualObjectMethodV(env, obj, cls, meth, args);
@@ -148,7 +148,7 @@
jvalue retval;
Method* m = (Method*)meth;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (METHOD_IS_STATIC(m)) {
throwException(NoSuchMethodError(m->name->data));
@@ -457,7 +457,7 @@
Hjava_lang_Object* o = (Hjava_lang_Object*)obj;
Method* m = (Method*)meth;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (METHOD_IS_STATIC(m)) {
throwException(NoSuchMethodError(m->name->data));
@@ -477,7 +477,7 @@
va_list args;
jobject r;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
va_start(args, meth);
r = KaffeJNI_CallObjectMethodV(env, obj, meth, args);
@@ -494,7 +494,7 @@
Hjava_lang_Object* o = (Hjava_lang_Object*)obj;
Method* m = (Method*)meth;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (METHOD_IS_STATIC(m)) {
throwException(NoSuchMethodError(m->name->data));
@@ -1165,7 +1165,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodV(m, METHOD_NATIVECODE(m), obj, args, 0);
+ callMethodV(m, METHOD_NATIVECODE(m), obj, args, NULL);
END_EXCEPTION_HANDLING();
}
@@ -1195,7 +1195,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodA(m, METHOD_NATIVECODE(m), obj, args, 0, 0);
+ callMethodA(m, METHOD_NATIVECODE(m), obj, args, NULL, 0);
END_EXCEPTION_HANDLING();
}
@@ -1211,13 +1211,13 @@
jvalue retval;
Method* m = (Method*)meth;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (!METHOD_IS_STATIC(m)) {
throwException(NoSuchMethodError(m->name->data));
}
- callMethodV(m, METHOD_NATIVECODE(m), 0, args, &retval);
+ callMethodV(m, METHOD_NATIVECODE(m), NULL, args, &retval);
ADD_REF(retval.l);
END_EXCEPTION_HANDLING();
@@ -1230,7 +1230,7 @@
va_list args;
jobject r;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
va_start(args, meth);
r = KaffeJNI_CallStaticObjectMethodV(env, cls, meth, args);
@@ -1246,13 +1246,13 @@
jvalue retval;
Method* m = (Method*)meth;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (!METHOD_IS_STATIC(m)) {
throwException(NoSuchMethodError(m->name->data));
}
- callMethodA(m, METHOD_NATIVECODE(m), 0, args, &retval, 0);
+ callMethodA(m, METHOD_NATIVECODE(m), NULL, args, &retval, 0);
ADD_REF(retval.l);
END_EXCEPTION_HANDLING();
@@ -1276,7 +1276,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodV(m, METHOD_NATIVECODE(m), 0, args, &retval);
+ callMethodV(m, METHOD_NATIVECODE(m), NULL, args, &retval);
END_EXCEPTION_HANDLING();
return ((jboolean) retval.i);
@@ -1310,7 +1310,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodA(m, METHOD_NATIVECODE(m), 0, args, &retval, 0);
+ callMethodA(m, METHOD_NATIVECODE(m), NULL, args, &retval, 0);
END_EXCEPTION_HANDLING();
return ((jboolean) retval.i);
@@ -1333,7 +1333,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodV(m, METHOD_NATIVECODE(m), 0, args, &retval);
+ callMethodV(m, METHOD_NATIVECODE(m), NULL, args, &retval);
END_EXCEPTION_HANDLING();
return ((jbyte) retval.i);
@@ -1367,7 +1367,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodA(m, METHOD_NATIVECODE(m), 0, args, &retval, 0);
+ callMethodA(m, METHOD_NATIVECODE(m), NULL, args, &retval, 0);
END_EXCEPTION_HANDLING();
return ((jbyte) retval.i);
@@ -1390,7 +1390,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodV(m, METHOD_NATIVECODE(m), 0, args, &retval);
+ callMethodV(m, METHOD_NATIVECODE(m), NULL, args, &retval);
END_EXCEPTION_HANDLING();
return ((jchar) retval.i);
@@ -1424,7 +1424,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodA(m, METHOD_NATIVECODE(m), 0, args, &retval, 0);
+ callMethodA(m, METHOD_NATIVECODE(m), NULL, args, &retval, 0);
END_EXCEPTION_HANDLING();
return ((jchar) retval.i);
@@ -1447,7 +1447,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodV(m, METHOD_NATIVECODE(m), 0, args, &retval);
+ callMethodV(m, METHOD_NATIVECODE(m), NULL, args, &retval);
END_EXCEPTION_HANDLING();
return ((jshort) retval.i);
@@ -1481,7 +1481,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodA(m, METHOD_NATIVECODE(m), 0, args, &retval, 0);
+ callMethodA(m, METHOD_NATIVECODE(m), NULL, args, &retval, 0);
END_EXCEPTION_HANDLING();
return ((jshort) retval.i);
@@ -1504,7 +1504,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodV(m, METHOD_NATIVECODE(m), 0, args, &retval);
+ callMethodV(m, METHOD_NATIVECODE(m), NULL, args, &retval);
END_EXCEPTION_HANDLING();
return (retval.i);
@@ -1538,7 +1538,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodA(m, METHOD_NATIVECODE(m), 0, args, &retval, 0);
+ callMethodA(m, METHOD_NATIVECODE(m), NULL, args, &retval, 0);
END_EXCEPTION_HANDLING();
return (retval.i);
@@ -1561,7 +1561,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodV(m, METHOD_NATIVECODE(m), 0, args, &retval);
+ callMethodV(m, METHOD_NATIVECODE(m), NULL, args, &retval);
END_EXCEPTION_HANDLING();
return (retval.j);
@@ -1595,7 +1595,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodA(m, METHOD_NATIVECODE(m), 0, args, &retval, 0);
+ callMethodA(m, METHOD_NATIVECODE(m), NULL, args, &retval, 0);
END_EXCEPTION_HANDLING();
return (retval.j);
@@ -1618,7 +1618,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodV(m, METHOD_NATIVECODE(m), 0, args, &retval);
+ callMethodV(m, METHOD_NATIVECODE(m), NULL, args, &retval);
END_EXCEPTION_HANDLING();
return (retval.f);
@@ -1652,7 +1652,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodA(m, METHOD_NATIVECODE(m), 0, args, &retval, 0);
+ callMethodA(m, METHOD_NATIVECODE(m), NULL, args, &retval, 0);
END_EXCEPTION_HANDLING();
return (retval.f);
@@ -1675,7 +1675,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodV(m, METHOD_NATIVECODE(m), 0, args, &retval);
+ callMethodV(m, METHOD_NATIVECODE(m), NULL, args, &retval);
END_EXCEPTION_HANDLING();
return (retval.d);
@@ -1710,7 +1710,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodA(m, METHOD_NATIVECODE(m), 0, args, &retval, 0);
+ callMethodA(m, METHOD_NATIVECODE(m), NULL, args, &retval, 0);
END_EXCEPTION_HANDLING();
return (retval.d);
@@ -1733,7 +1733,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodV(m, METHOD_NATIVECODE(m), 0, args, &retval);
+ callMethodV(m, METHOD_NATIVECODE(m), NULL, args, &retval);
END_EXCEPTION_HANDLING();
}
@@ -1763,7 +1763,7 @@
throwException(NoSuchMethodError(m->name->data));
}
- callMethodA(m, METHOD_NATIVECODE(m), 0, args, 0, 0);
+ callMethodA(m, METHOD_NATIVECODE(m), NULL, args, NULL, 0);
END_EXCEPTION_HANDLING();
}
Index: kaffe/kaffe/kaffevm/jni/jni-fields.c
diff -u kaffe/kaffe/kaffevm/jni/jni-fields.c:1.2 kaffe/kaffe/kaffevm/jni/jni-fields.c:1.3
--- kaffe/kaffe/kaffevm/jni/jni-fields.c:1.2 Mon Jul 5 16:40:47 2004
+++ kaffe/kaffe/kaffevm/jni/jni-fields.c Mon Dec 20 00:13:16 2004
@@ -36,7 +36,7 @@
{
jobject nobj;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
nobj = GET_FIELD(jobject, obj, fld);
@@ -248,7 +248,7 @@
{
jobject obj;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
obj = GET_STATIC_FIELD(jobject, fld);
Index: kaffe/kaffe/kaffevm/jni/jni-helpers.c
diff -u kaffe/kaffe/kaffevm/jni/jni-helpers.c:1.2 kaffe/kaffe/kaffevm/jni/jni-helpers.c:1.3
--- kaffe/kaffe/kaffevm/jni/jni-helpers.c:1.2 Sun Jul 11 08:54:39 2004
+++ kaffe/kaffe/kaffevm/jni/jni-helpers.c Mon Dec 20 00:13:16 2004
@@ -47,7 +47,7 @@
Method *allMethods;
int i;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
clazz = (Hjava_lang_Class *)cls;
refMeth = NULL;
@@ -74,7 +74,7 @@
Field *allFields;
int i;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
clazz = (Hjava_lang_Class *)cls;
refField = NULL;
Index: kaffe/kaffe/kaffevm/jni/jni-string.c
diff -u kaffe/kaffe/kaffevm/jni/jni-string.c:1.4 kaffe/kaffe/kaffevm/jni/jni-string.c:1.5
--- kaffe/kaffe/kaffevm/jni/jni-string.c:1.4 Sun Dec 12 06:54:28 2004
+++ kaffe/kaffe/kaffevm/jni/jni-string.c Mon Dec 20 00:13:16 2004
@@ -35,7 +35,7 @@
{
Hjava_lang_String* str;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
str = (Hjava_lang_String*)newObject(StringClass);
unhand(str)->offset = 0;
@@ -63,7 +63,7 @@
KaffeJNI_GetStringChars(JNIEnv* env UNUSED, jstring data, jboolean* copy)
{
jchar* c;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (copy != NULL) {
*copy = JNI_FALSE;
@@ -81,7 +81,7 @@
Utf8Const* utf8;
size_t len;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
len = strlen(data);
if (!utf8ConstIsValidUtf8(data, len)) {
@@ -142,7 +142,7 @@
jsize i;
jsize j;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
/* We always copy data */
if (copy != NULL) {
Index: kaffe/kaffe/kaffevm/jni/jni.c
diff -u kaffe/kaffe/kaffevm/jni/jni.c:1.12 kaffe/kaffe/kaffevm/jni/jni.c:1.13
--- kaffe/kaffe/kaffevm/jni/jni.c:1.12 Thu Dec 16 06:13:53 2004
+++ kaffe/kaffe/kaffevm/jni/jni.c Mon Dec 20 00:13:16 2004
@@ -163,7 +163,7 @@
static jref
Kaffe_NewGlobalRef(JNIEnv* env, jref obj)
{
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
if (!gc_add_ref(obj)) {
errorInfo info;
postOutOfMemory(&info);
@@ -191,7 +191,7 @@
classFile hand;
errorInfo info;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
classFileInit(&hand, buf, len, CP_BYTEARRAY);
@@ -223,7 +223,7 @@
Utf8Const* utf8;
jvalue retval;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
/* We accepts slashes, but Class.forName() does not */
utf8 = checkPtr(utf8ConstNew(name, -1));
@@ -244,7 +244,7 @@
{
jclass clz;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
clz = ((Hjava_lang_Class*)cls)->superclass;
@@ -307,7 +307,7 @@
{
jobject obj;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
obj = thread_data->exceptObj;
@@ -338,7 +338,7 @@
if (thread_data->exceptObj != 0) {
do_execute_java_method(NULL, thread_data->exceptObj, "printStackTrace", "()V",
- 0, 0, thread_data->exceptObj);
+ NULL, 0, thread_data->exceptObj);
}
END_EXCEPTION_HANDLING();
}
@@ -348,7 +348,7 @@
{
BEGIN_EXCEPTION_HANDLING_VOID();
- thread_data->exceptObj = 0;
+ thread_data->exceptObj = NULL;
END_EXCEPTION_HANDLING();
}
@@ -359,7 +359,7 @@
jobject obj;
Hjava_lang_Class* clazz;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
clazz = (Hjava_lang_Class*)cls;
@@ -381,7 +381,7 @@
jvalue retval;
Method* m = (Method*)meth;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
clazz = (Hjava_lang_Class*)cls;
@@ -403,7 +403,7 @@
jobject obj;
va_list args;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
va_start(args, meth);
obj = Kaffe_NewObjectV(env, cls, meth, args);
@@ -421,7 +421,7 @@
jvalue retval;
Method* m = (Method*)meth;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
clazz = (Hjava_lang_Class*)cls;
@@ -442,7 +442,7 @@
{
jclass cls;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
cls = ((Hjava_lang_Object*)obj)->vtable->class;
@@ -474,15 +474,15 @@
Method* meth;
errorInfo info;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
meth = lookupClassMethod((Hjava_lang_Class*)cls, (char*)name, (char*)sig, &info);
- if (meth == 0) {
+ if (meth == NULL) {
postError(env, &info);
}
else if (METHOD_IS_STATIC(meth)) {
postExceptionMessage(&info, JAVA_LANG(NoSuchMethodError), "%s", name);
postError(env, &info);
- meth = 0;
+ meth = NULL;
}
END_EXCEPTION_HANDLING();
@@ -497,7 +497,7 @@
errorInfo info;
Utf8Const* utf8;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
utf8 = checkPtr(utf8ConstNew(name, -1));
fld = lookupClassField((Hjava_lang_Class*)cls, utf8, false, &info);
utf8ConstRelease(utf8);
@@ -514,14 +514,14 @@
Method* meth;
errorInfo info;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
meth = lookupClassMethod((Hjava_lang_Class*)cls, (char*)name, (char*)sig, &info);
- if (meth == 0) {
+ if (meth == NULL) {
postError(env, &info);
} else if (!METHOD_IS_STATIC(meth)) {
postExceptionMessage(&info, JAVA_LANG(NoSuchMethodError), "%s", name);
postError(env, &info);
- meth = 0;
+ meth = NULL;
}
END_EXCEPTION_HANDLING();
@@ -535,7 +535,7 @@
errorInfo info;
Utf8Const* utf8;
- BEGIN_EXCEPTION_HANDLING(0);
+ BEGIN_EXCEPTION_HANDLING(NULL);
utf8 = checkPtr(utf8ConstNew(name, -1));
fld = lookupClassField((Hjava_lang_Class*)cls, utf8, true, &info);
utf8ConstRelease(utf8);
@@ -983,7 +983,7 @@
KaffeVM_Arguments Kaffe_JavaVMInitArgs = {
0, /* Version */
- 0, /* Properties */
+ NULL, /* Properties */
0, /* Check source */
THREADSTACKSIZE,/* Native stack size */
0, /* Java stack size */
@@ -992,7 +992,7 @@
/* 2, */ /* Verify mode ... verify remote by default */
0, /* Verify mode ... noverify by default */
".", /* Classpath */
- 0, /* Bootclasspath */
+ NULL, /* Bootclasspath */
(void*)&vfprintf,/* Vprintf */
(void*)&exit, /* Exit */
(void*)&abort, /* Abort */
@@ -1003,8 +1003,8 @@
0, /* Enable verbose JIT */
0, /* Enable verbose calls */
ALLOC_HEAPSIZE, /* Inc heap size */
- 0, /* Class home */
- 0, /* Library home */
+ NULL, /* Class home */
+ NULL, /* Library home */
};
/*
More information about the kaffe
mailing list