shake it all up

[tripe-android] / jni.c

diff --git a/jni.c b/jni.c
index fd91d0c..934be91 100644 (file)
--- a/jni.c
+++ b/jni.c
@@ -59,17 +59,17 @@
 /*----- Magic class names and similar -------------------------------------*/
 
 /* The name decoration is horrific.  Hide it. */
-#define JNIFUNC(f) Java_uk_org_distorted_tripe_jni_package_00024_##f
+#define JNIFUNC(f) Java_uk_org_distorted_tripe_sys_package_00024_##f
 
 /* The little class for bundling up error codes. */
-#define ERRENTRY "uk/org/distorted/tripe/jni/package$ErrorEntry"
+#define ERRENTRY "uk/org/distorted/tripe/sys/package$ErrorEntry"
 
 /* The `stat' class. */
-#define STAT "uk/org/distorted/tripe/jni/package$FileInfo"
+#define STAT "uk/org/distorted/tripe/sys/package$FileInfo"
 
 /* Exception class names. */
 #define NULLERR "java/lang/NullPointerException"
-#define TYPEERR "uk/org/distorted/tripe/jni/package$NativeObjectTypeException"
+#define TYPEERR "uk/org/distorted/tripe/sys/package$NativeObjectTypeException"
 #define SYSERR "uk/org/distorted/tripe/sys/package$SystemError"
 #define ARGERR "java/lang/IllegalArgumentException"
 #define BOUNDSERR "java/lang/IndexOutOfBoundsException"
@@ -80,7 +80,7 @@ static void put_cstring(JNIEnv *jni, jbyteArray v, const char *p)
   { if (p) (*jni)->ReleaseByteArrayElements(jni, v, (jbyte *)p, JNI_ABORT); }
 
 static void vexcept(JNIEnv *jni, const char *clsname,
-                   const char *msg, va_list ap)
+                   const char *msg, va_list *ap)
 {
   jclass cls;
   int rc;
@@ -90,7 +90,7 @@ static void vexcept(JNIEnv *jni, const char *clsname,
   if (!msg)
     rc = (*jni)->ThrowNew(jni, cls, 0);
   else {
-    dstr_vputf(&d, msg, &ap);
+    dstr_vputf(&d, msg, ap);
     rc = (*jni)->ThrowNew(jni, cls, d.buf);
     assert(!rc);
     dstr_destroy(&d);
@@ -103,7 +103,7 @@ static void except(JNIEnv *jni, const char *clsname, const char *msg, ...)
   va_list ap;
 
   va_start(ap, msg);
-  vexcept(jni, clsname, msg, ap);
+  vexcept(jni, clsname, msg, &ap);
   va_end(ap);
 }
 
@@ -164,7 +164,7 @@ static const char *get_cstring(JNIEnv *jni, jbyteArray v)
 }
 
 static void vexcept_syserror(JNIEnv *jni, const char *clsname,
-                            int err, const char *msg, va_list ap)
+                            int err, const char *msg, va_list *ap)
 {
   jclass cls;
   int rc;
@@ -175,7 +175,7 @@ static void vexcept_syserror(JNIEnv *jni, const char *clsname,
 
   cls = (*jni)->FindClass(jni, clsname); assert(cls);
   init = (*jni)->GetMethodID(jni, cls, "<init>", "(I[B)V"); assert(init);
-  dstr_vputf(&d, msg, &ap);
+  dstr_vputf(&d, msg, ap);
   msgstr = wrap_cstring(jni, d.buf); assert(msgstr);
   dstr_destroy(&d);
   e = (*jni)->NewObject(jni, cls, init, err, msgstr); assert(e);
@@ -188,7 +188,7 @@ static void except_syserror(JNIEnv *jni, const char *clsname,
   va_list ap;
 
   va_start(ap, msg);
-  vexcept_syserror(jni, clsname, err, msg, ap);
+  vexcept_syserror(jni, clsname, err, msg, &ap);
   va_end(ap);
 }
 
@@ -1193,8 +1193,8 @@ end:
   return (rc);
 }
 
-JNIEXPORT void JNICALL JNIFUNC(close)(JNIEnv *jni, jobject cls,
-                                     wrapper wconn, jint how)
+JNIEXPORT void JNICALL JNIFUNC(closeconn)(JNIEnv *jni, jobject cls,
+                                         wrapper wconn, jint how)
 {
   struct conn conn;
   int rc;