X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbejavacoal.c;h=6b44f06cad7e249c71ed52de047aaefbbcf0e1d3;hb=fa58db3dfe73586f59ba99952806e418849c9740;hp=e689168fa8777cd2eb91252e9e762bc45e072cc8;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/be/bejavacoal.c b/ir/be/bejavacoal.c
index e689168fa..6b44f06ca 100644
--- a/ir/be/bejavacoal.c
+++ b/ir/be/bejavacoal.c
@@ -27,8 +27,8 @@
 #include "config.h"
 #endif
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -153,7 +153,7 @@ static int start_vm(jni_env_t *env, int argc, char *argv[])
 	}
 
 	memset(&args, 0, sizeof(args));
-	opts = xmalloc(argc * sizeof(opts[0]));
+	opts = XMALLOCN(JavaVMOption, argc);
 	for(i = 0; i < argc; ++i) {
 		opts[i].optionString = argv[i];
 		opts[i].extraInfo    = NULL;
@@ -326,7 +326,6 @@ static int jc_call_int(be_java_coal_t *c, int mth_index, ...)
 
 be_java_coal_t *be_java_coal_init(const char *graph_name, int n_nodes, int n_regs, int dbg_level)
 {
-	be_java_coal_t *c;
 	jni_env_t *env = get_jvm();
 	JNIEnv *jni = env->jni;
 	jmethodID fact;
@@ -334,8 +333,7 @@ be_java_coal_t *be_java_coal_init(const char *graph_name, int n_nodes, int n_reg
 	jstring str;
 	int i;
 
-	c = xmalloc(sizeof(c[0]));
-	memset(c, 0, sizeof(c[0]));
+	be_java_coal_t *c = XMALLOCZ(be_java_coal_t);
 	c->env = env;
 
 	/* Find the class we are are looking for. */