diff options
| author | Roman Kennke <roman@kennke.org> | 2006-01-17 12:54:26 +0000 |
|---|---|---|
| committer | Roman Kennke <roman@kennke.org> | 2006-01-17 12:54:26 +0000 |
| commit | 8bfdad6c49a5d15506ea9d8685194fb6b0a7c18d (patch) | |
| tree | 252b874da883a596deec448a280f81f5ca559a43 | |
| parent | 88368b65b491556d2596cc366fb3890277cb164a (diff) | |
| download | classpath-8bfdad6c49a5d15506ea9d8685194fb6b0a7c18d.tar.gz | |
2006-01-17 Roman Kennke <kennke@aicas.com>
* native/jni/java-io/java_io_VMObjectStreamClass.c:
(getFieldReference): Use MALLOC/FREE macros for portability instead
of direct call to malloc() and free().
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | native/jni/java-io/java_io_VMObjectStreamClass.c | 11 |
2 files changed, 14 insertions, 3 deletions
@@ -1,5 +1,11 @@ 2006-01-17 Roman Kennke <kennke@aicas.com> + * native/jni/java-io/java_io_VMObjectStreamClass.c: + (getFieldReference): Use MALLOC/FREE macros for portability instead + of direct call to malloc() and free(). + +2006-01-17 Roman Kennke <kennke@aicas.com> + * native/jni/classpath/jcl.c: Added missing imports. (JCL_realloc): Fixed signature to include oldsize. This is needed for some targets. Make this function use the MEMORY_REALLOC macro diff --git a/native/jni/java-io/java_io_VMObjectStreamClass.c b/native/jni/java-io/java_io_VMObjectStreamClass.c index 8c2556bcf..e1ff079bf 100644 --- a/native/jni/java-io/java_io_VMObjectStreamClass.c +++ b/native/jni/java-io/java_io_VMObjectStreamClass.c @@ -42,6 +42,9 @@ exception statement from your version. */ #include <stdlib.h> #include <string.h> +#include "target_native.h" +#include "target_native_memory.h" + #include "java_io_VMObjectStreamClass.h" /* @@ -179,7 +182,8 @@ getFieldReference (JNIEnv * env, jobject field, const char *type) if (type_name[0] != '[') { /* XXX - FIXME - should not use dynamic allocation in core lib. */ - the_type = (char *) malloc (type_len + 3); + TARGET_NATIVE_MEMORY_ALLOC(the_type,char *,type_len + 3); + assert(the_type!=NULL); the_type[0] = 'L'; the_type[type_len + 1] = ';'; the_type[type_len + 2] = '\0'; @@ -188,7 +192,8 @@ getFieldReference (JNIEnv * env, jobject field, const char *type) else { /* XXX - FIXME - should not use dynamic allocation in core lib. */ - the_type = (char *) malloc (type_len + 1); + TARGET_NATIVE_MEMORY_ALLOC(the_type,char *,type_len + 1); + assert(the_type!=NULL); the_type[type_len] = '\0'; } @@ -203,7 +208,7 @@ getFieldReference (JNIEnv * env, jobject field, const char *type) (*env)->ReleaseStringUTFChars (env, tname, type_name); fid = (*env)->GetFieldID (env, declaringClass, field_name, the_type); - free (the_type); + TARGET_NATIVE_MEMORY_FREE (the_type); } else { |