From 5baafefa44dbfe117a58d25feeb370db3e70cf81 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 9 Feb 2016 11:17:44 +0100 Subject: Fixup symbol names in vpp-japi There is skew between symbol names of vppjni_env.[ch], causing the library to fail to load. This patch fixes that up. Change-Id: I972e6d0ce72fd05ee3518e7161e20946ff3426ca Signed-off-by: Robert Varga --- vpp-japi/japi/vppjni_env.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vpp-japi/japi/vppjni_env.c') diff --git a/vpp-japi/japi/vppjni_env.c b/vpp-japi/japi/vppjni_env.c index 84991eee..1c4ea6eb 100644 --- a/vpp-japi/japi/vppjni_env.c +++ b/vpp-japi/japi/vppjni_env.c @@ -21,7 +21,7 @@ static vppjni_class_t *class_head; // Head of the class registration list. static vppjni_field_t *field_head; -void vppjni_init_register_class(vppjni_class_t *ptr) +void vppjni_register_class(vppjni_class_t *ptr) { vppjni_class_t **where = &class_head; while (*where != NULL) { @@ -38,7 +38,7 @@ void vppjni_register_field(vppjni_field_t *ptr) { *where = ptr; } -jobject vppjni_init_new_object(JNIEnv *env, const vppjni_class_t *ptr, va_list ap) { +jobject vppjni_new_object(JNIEnv *env, const vppjni_class_t *ptr, va_list ap) { jobject obj = (*env)->NewObjectV(env, ptr->jclass, ptr->jinit, ap); if ((*env)->ExceptionCheck(env)) { (*env)->ExceptionDescribe(env); @@ -48,7 +48,7 @@ jobject vppjni_init_new_object(JNIEnv *env, const vppjni_class_t *ptr, va_list a return obj; } -int vppjni_env_init(JNIEnv *env) +int vppjni_init(JNIEnv *env) { vppjni_class_t *cwlk; vppjni_field_t *fwlk; @@ -91,7 +91,7 @@ int vppjni_env_init(JNIEnv *env) return 0; } -void vppjni_env_uninit(JNIEnv *env) { +void vppjni_uninit(JNIEnv *env) { vppjni_class_t *cwlk; vppjni_field_t *fwlk; -- cgit 1.2.3-korg