[vmkit-commits] [vmkit] r69593 - in /vmkit/trunk/lib/JnJVM/VMCore: Jnjvm.cpp JnjvmClassLoader.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Mon Apr 20 08:50:08 2009
New Revision: 69593

URL: http://llvm.org/viewvc/llvm-project?rev=69593&view=rev
Log:
Remove casting by giving correct types to locals.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp?rev=69593&r1=69592&r2=69593&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Mon Apr 20 08:50:08 2009
@@ -518,7 +518,7 @@
 }
 
 extern "C" int sys_strnstr(const char *haystack, const char *needle) {
-  char * res = (char*)strstr(haystack, needle);
+  const char* res = strstr(haystack, needle);
   if (res) return res - haystack;
   else return -1; 
 }

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp?rev=69593&r1=69592&r2=69593&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Mon Apr 20 08:50:08 2009
@@ -996,7 +996,7 @@
                                       const char* file) {
 
   char* soName = (char*)alloca(strlen(name) + strlen(DYLD_EXTENSION));
-  char* ptr = (char*)strrchr(name, '/');
+  const char* ptr = strrchr(name, '/');
   sprintf(soName, "%s%s", ptr ? ptr + 1 : name, DYLD_EXTENSION);
   void* handle = dlopen(soName, RTLD_LAZY | RTLD_LOCAL);
   if (handle) {