[vmkit-commits] [vmkit] r145296 - /vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

[Will Dietz]

Author: wdietz2
Date: Mon Nov 28 16:27:05 2011
New Revision: 145296

URL: http://llvm.org/viewvc/llvm-project?rev=145296&view=rev
Log:
Fix various warnings in OpenJDK.inc

Modified:
    vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc

Modified: vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc?rev=145296&r1=145295&r2=145296&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc (original)
+++ vmkit/trunk/lib/j3/ClassLib/OpenJDK/OpenJDK.inc Mon Nov 28 16:27:05 2011
@@ -630,16 +630,18 @@
 
 
 JNIEXPORT void JNICALL
-JVM_Sleep(JNIEnv *env, jclass threadClass, jlong millis) {
+JVM_Sleep(JNIEnv *env, jclass threadClass, jlong _millis) {
 
   BEGIN_JNI_EXCEPTION
 
   Jnjvm * vm = th->getJVM();
 
   // Check for invalid sleep time
-  if (millis < 0)
+  if (_millis < 0)
     th->getJVM()->illegalArgumentException("Negative sleep value");
 
+  uint64 millis = _millis;
+
   // If Thread is interrupted, throw exception
   if (th->lockingThread.interruptFlag != 0) {
     th->lockingThread.interruptFlag = 0;
@@ -1057,7 +1059,7 @@
       UNREACHABLE();
     }
     char* buf = (char*)allocator.Allocate(dim_len+2);
-    for(unsigned i = 0; i < dim_len; ++i) buf[i] = I_TAB;
+    for(int i = 0; i < dim_len; ++i) buf[i] = I_TAB;
     buf[dim_len] = baseChar;
     buf[dim_len+1] = '\0';
     arrayName = loader->asciizConstructUTF8(buf);
@@ -1083,6 +1085,8 @@
   RETURN_FROM_JNI((jobject)th->pushJNIRef(array));
 
   END_JNI_EXCEPTION
+
+  return 0;
 }
 
 /*
@@ -1658,8 +1662,6 @@
 
   BEGIN_JNI_EXCEPTION
 
-  Jnjvm* vm = JavaThread::get()->getJVM();
-
   m = *(JavaObjectMethod**)_m;
 
   ret = proceedMethod(
@@ -1687,8 +1689,6 @@
 
   BEGIN_JNI_EXCEPTION
 
-  Jnjvm* vm = JavaThread::get()->getJVM();
-
   c = *(JavaObjectConstructor**)_c;
 
   ret = proceedConstructor(
@@ -2448,6 +2448,7 @@
 JNIEXPORT jint JNICALL
 JVM_InitializeSocketLibrary(void) {
   // Nothing to do here.
+  return 0;
 }
 
 JNIEXPORT jint JNICALL