From 819760193644a3543d63c3530f18552def3494cf Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Sun, 17 Feb 2013 21:15:37 +0100
Subject: fix jni warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 Makefile          |  5 ++---
 java-c-jni/SHA3.c | 10 ++++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 9f69c97..b20e12f 100644
--- a/Makefile
+++ b/Makefile
@@ -38,10 +38,9 @@ c: $(C_OBJS) $(C_BINS)
 bin/c/%.o: c/%.h c/%.c
 	mkdir -p "bin/c"
 	$(CC) $(C_FLAGS) -c "c/$*".{c,h}
-	mv "$*.o" "c/$*.o"
+	mv "$*.o" "bin/c/$*.o"
 bin/c/%: c/%.c
-	mkdir -p "bin/c"
-	$(CC) $(C_FLAGS) -o "$@" "c/$*".c "c/"*.o
+	$(CC) $(C_FLAGS) -o "$@" "c/$*".c "bin/c/"*.o
 
 java-c-jni: bin/java-c-jni/SHA3.so
 bin/java-c-jni/%.so: java-c-jni/%.c
diff --git a/java-c-jni/SHA3.c b/java-c-jni/SHA3.c
index 50bc20c..9e93f01 100644
--- a/java-c-jni/SHA3.c
+++ b/java-c-jni/SHA3.c
@@ -28,7 +28,7 @@
 
 
 #define null    0
-#define byte    char
+#define byte    jbyte
 #define boolean long
 #define true    1
 #define false   0
@@ -409,7 +409,7 @@ inline byte* pad10star1(byte* msg, long len, long r, long* outlen)
     }
   else
     {
-      char* M;
+      byte* M;
       long N;
       len = (nrf + 1) << 3;
       len = ((len - (len % r) + (r - 8)) >> 3) + 1;
@@ -696,10 +696,12 @@ JNIEXPORT void JNICALL Java_SHA3_update(JNIEnv* env, jclass class, jbyteArray ms
 
 JNIEXPORT jbyteArray JNICALL Java_SHA3_digest(JNIEnv* env, jclass class, jbyteArray msg, jint msglen)
 {
+  byte* rcn;
+  jbyteArray rcj;
   (void) class;
   
-  byte* rcn = digest((*env)->GetByteArrayElements(env, msg, 0), msglen);
-  jbyteArray rcj = (*env)->NewByteArray(env, (n + 7) >> 3);
+  rcn = digest((*env)->GetByteArrayElements(env, msg, 0), msglen);
+  rcj = (*env)->NewByteArray(env, (n + 7) >> 3);
   (*env)->SetByteArrayRegion(env, rcj, 0, (n + 7) >> 3, rcn);
   return rcj;
 }
-- 
cgit v1.2.3-70-g09d2