Signed-off-by: Vegard Nossum <vegard.nos...@gmail.com>
---
include/vm/class.h | 2 +-
vm/class.c | 2 +-
vm/classloader.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/vm/class.h b/include/vm/class.h
index 629356e..cb4060d 100644
--- a/include/vm/class.h
+++ b/include/vm/class.h
@@ -36,7 +36,7 @@ struct vm_class {
struct vm_object *object;
};
-int vm_class_init(struct vm_class *vmc, const struct cafebabe_class *class);
+int vm_class_link(struct vm_class *vmc, const struct cafebabe_class *class);
int vm_class_init_object(struct vm_class *vmc);
int vm_class_run_clinit(struct vm_class *vmc);
diff --git a/vm/class.c b/vm/class.c
index cdc9c0f..b0dc205 100644
--- a/vm/class.c
+++ b/vm/class.c
@@ -76,7 +76,7 @@ setup_vtable(struct vm_class *vmc)
extern struct vm_class *vm_java_lang_Class;
-int vm_class_init(struct vm_class *vmc, const struct cafebabe_class *class)
+int vm_class_link(struct vm_class *vmc, const struct cafebabe_class *class)
{
vmc->class = class;
diff --git a/vm/classloader.c b/vm/classloader.c
index ca83f69..05ffc16 100644
--- a/vm/classloader.c
+++ b/vm/classloader.c
@@ -120,7 +120,7 @@ struct vm_class *load_class_from_file(const char *filename)
result = malloc(sizeof *result);
if (result) {
- if (vm_class_init(result, class)) {
+ if (vm_class_link(result, class)) {
NOT_IMPLEMENTED;
return NULL;
}
@@ -207,7 +207,7 @@ struct vm_class *load_class_from_zip(const char *zipfile,
const char *file)
result = malloc(sizeof *result);
if (result) {
- if (vm_class_init(result, class)) {
+ if (vm_class_link(result, class)) {
NOT_IMPLEMENTED;
return NULL;
}
--
1.6.0.4
------------------------------------------------------------------------------
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
