harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r382442 [2/2] - in /incubator/harmony/enhanced/classlib/trunk/native-src: ./ linux.IA32/archive/ linux.IA32/common/ linux.IA32/include/ linux.IA32/launcher/ linux.IA32/luni/ linux.IA32/math/ linux.IA32/nio/ linux.IA32/pool/ linux.IA32/port/...
Date Thu, 02 Mar 2006 16:51:54 GMT
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/jarfile.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/jarfile.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/jarfile.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/jarfile.c Thu Mar
 2 08:51:48 2006
@@ -92,7 +92,7 @@
   nameBuf = (char *) &startNameBuf;
 
   jclZipFile =
-    (JCLZipFile *) (*env)->GetLongField (env, recv,
+    (JCLZipFile *) (IDATA) (*env)->GetLongField (env, recv,
                                          JCL_CACHE_GET (env,
                                                         FID_java_util_zip_ZipFile_descriptor));
   if (jclZipFile == (void *) -1)

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/zip.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/zip.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/zip.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/zip.c Thu Mar  2
08:51:48 2006
@@ -30,7 +30,8 @@
 throwNewInternalError (JNIEnv * env, char *message)
 {
   jclass exceptionClass = (*env)->FindClass(env, "java/lang/InternalError");
-  if (0 == exceptionClass) { 
+  if (0 == exceptionClass)
+    {
     /* Just return if we can't load the exception class. */
     return;
     }
@@ -44,7 +45,8 @@
 throwJavaZIOException (JNIEnv * env, char *message)
 {
   jclass exceptionClass = (*env)->FindClass(env, "java/util/zip/ZipException");
-  if (0 == exceptionClass) { 
+  if (0 == exceptionClass)
+    { 
     /* Just return if we can't load the exception class. */
     return;
     }
@@ -91,8 +93,9 @@
         return 2;
     }
 
-  /* Add the zipFile we just allocated to the list of zip files -- we will free this on UnLoad
if its not already
-     free'd */
+  /* Add the zipFile we just allocated to the list of zip files -- we will
+   * free this on UnLoad if its not already free'd.
+   */
   zipfileHandles = JCL_CACHE_GET (env, zipfile_handles);
   jclZipFile->last = (JCLZipFile *) zipfileHandles;
   jclZipFile->next = zipfileHandles->next;
@@ -103,7 +106,7 @@
   (*env)->SetLongField (env, recv,
                         JCL_CACHE_GET (env,
                                        FID_java_util_zip_ZipFile_descriptor),
-                        ((jlong) jclZipFile));
+			            ((IDATA) jclZipFile));
   return 0;
 }
 
@@ -120,14 +123,14 @@
   jclass entryClass;
   jmethodID mid;
   const char *entryCopy;
+  JCLZipFile *jclZipFile = (JCLZipFile *) (IDATA) zipPointer;
 
-  if ((JCLZipFile *) zipPointer == (void *) -1)
+  if (jclZipFile == (void *) -1)
     {
       throwNewIllegalStateException (env, "");
       return NULL;
     }
-
-  zipFile = &(((JCLZipFile *) zipPointer)->hyZipFile);
+  zipFile = &(jclZipFile->hyZipFile);
   entryCopy = (*env)->GetStringUTFChars (env, entryName, NULL);
   if (entryCopy == NULL)
     return (jobject) NULL;
@@ -188,7 +191,7 @@
   jfieldID descriptorFID =
     JCL_CACHE_GET (env, FID_java_util_zip_ZipFile_descriptor);
 
-  jclZipFile = (JCLZipFile *) (*env)->GetLongField (env, recv, descriptorFID);
+  jclZipFile = (JCLZipFile *) (IDATA) (*env)->GetLongField (env, recv, descriptorFID);
   if (jclZipFile != (void *) -1)
     {
       retval =
@@ -217,7 +220,8 @@
 throwNewIllegalStateException (JNIEnv * env, char *message)
 {
   jclass exceptionClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
-  if (0 == exceptionClass) { 
+  if (0 == exceptionClass)
+    {
     /* Just return if we can't load the exception class. */
     return;
     }
@@ -231,7 +235,8 @@
 throwNewIllegalArgumentException (JNIEnv * env, char *message)
 {
   jclass exceptionClass = (*env)->FindClass(env, "java/lang/IllegalArgumentException");
-  if (0 == exceptionClass) { 
+  if (0 == exceptionClass)
+    {
     /* Just return if we can't load the exception class. */
     return;
     }
@@ -290,14 +295,15 @@
   PORT_ACCESS_FROM_ENV (env);
 
   IDATA nextEntryPointer;
+  JCLZipFile *jclZipFile = (JCLZipFile *) (IDATA) descriptor;
 
-  if ((JCLZipFile *) descriptor == (void *) -1)
+  if (jclZipFile == (void *) -1)
     {
       throwNewIllegalStateException (env, "");
       return 0;
     }
   zip_resetZipFile (privatePortLibrary,
-                    &(((JCLZipFile *) descriptor)->hyZipFile),
+		    &(jclZipFile->hyZipFile), 
                     &nextEntryPointer);
   return nextEntryPointer;
 }
@@ -318,13 +324,14 @@
   jmethodID mid;
   jstring entryName = NULL;
   IDATA nextEntryPointer;
+  JCLZipFile *jclZipFile = (JCLZipFile *) (IDATA) descriptor;
 
-  if ((JCLZipFile *) descriptor == (void *) -1)
+  if (jclZipFile == (void *) -1)
     {
       throwNewIllegalStateException (env, "");
       return NULL;
     }
-  zipFile = &(((JCLZipFile *) descriptor)->hyZipFile);
+  zipFile = &(jclZipFile->hyZipFile);
   zip_initZipEntry (PORTLIB, &zipEntry);
 
   nextEntryPointer = (IDATA) nextEntry;
@@ -387,7 +394,7 @@
 
 jbyteArray JNICALL
 Java_java_util_zip_ZipFile_inflateEntryImpl2 (JNIEnv * env, jobject recv,
-                                              jlong zipPointer,
+					                          jlong descriptor,
                                               jstring entryName)
 {
   PORT_ACCESS_FROM_ENV (env);
@@ -397,14 +404,15 @@
   HyZipEntry zipEntry;
   const char *entryCopy;
   jbyteArray buf;
+  JCLZipFile *jclZipFile = (JCLZipFile *) (IDATA) descriptor;
 
   /* Build the zipFile */
-  if ((JCLZipFile *) zipPointer == (void *) -1)
+  if (jclZipFile == (void *) -1)
     {
       throwNewIllegalStateException (env, "");
       return NULL;
     }
-  zipFile = &(((JCLZipFile *) zipPointer)->hyZipFile);
+  zipFile = &(jclZipFile->hyZipFile);
   entryCopy = (*env)->GetStringUTFChars (env, entryName, NULL);
   if (entryCopy == NULL)
     return NULL;

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/iohelp.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/iohelp.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/iohelp.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/iohelp.c Thu Mar
 2 08:51:48 2006
@@ -171,11 +171,14 @@
 
   result = hyfile_write (descriptor, buf, count);
 
-  /* if there is an error, find the error message before calling free in case hymem_free_memory
changes the error code */
+  /**
+   * if there is an error, find the error message before calling free in case 
+   * hymem_free_memory changes the error code 
+   */
   if (result < 0)
     errorMessage = ioLookupErrorString (env, result);
 
-  if (buf != internalBuffer)
+  if (buf != (jbyte*)internalBuffer)
     {
       jclmem_free_memory (env, buf);
     }
@@ -263,8 +266,11 @@
     }
 
   len = (*env)->GetArrayLength (env, buffer);
-  /* Throw IndexOutOfBoundsException according to spec. * Must test offset > len, or len
- offset < count to avoid * 
-     int overflow caused by offset + count */
+  /** 
+   * Throw IndexOutOfBoundsException according to spec. 
+   * Must test offset > len, or len - offset < count to avoid 
+   * int overflow caused by offset + count 
+   */
   if (offset < 0 || count < 0 || offset > len || (len - offset) < count)
     {
       throwIndexOutOfBoundsException (env);
@@ -297,6 +303,7 @@
 
   if (descriptor == 0)
     {
+      /* hytty_get_chars() returns zero on EOF */
       if ((result = hytty_get_chars (buf, count)) == 0)
         result = -1;
     }
@@ -307,7 +314,7 @@
   if (result > 0)
     (*env)->SetByteArrayRegion (env, buffer, offset, result, buf);
 
-  if (buf != internalBuffer)
+  if (buf != (jbyte*)internalBuffer)
     {
       jclmem_free_memory (env, buf);
     }
@@ -318,7 +325,7 @@
 
 /**
   * Throw java.lang.NullPointerException with the message provided
-  * Note: This is not named throwNullPointerException because is conflicts
+  * Note: This is not named throwNullPointerException because it conflicts
   * with a VM function of that same name and this causes problems on
   * some platforms.
   */
@@ -415,7 +422,7 @@
     {
       return (void *) -1;
     }
-  return (void *) ((*env)->GetLongField (env, fd, descriptorFID));
+  return (void *)(IDATA) ((*env)->GetLongField (env, fd, descriptorFID));
 }
 
 /**
@@ -429,7 +436,7 @@
   jfieldID fid = getJavaIoFileDescriptorDescriptorFID (env);
   if (NULL != fid)
     {
-      (*env)->SetLongField (env, fd, fid, (jlong) value);
+      (*env)->SetLongField (env, fd, fid, (IDATA)value);
     }
 }
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/utf8decode.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/utf8decode.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/utf8decode.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/utf8decode.c Thu
Mar  2 08:51:48 2006
@@ -15,27 +15,6 @@
 
 #include "hycomp.h"
 
-/* Prototypes */
-U_32 decodeUTF8Char (const U_8 * input, U_16 * result);
-U_32 decodeUTF8CharN (const U_8 * input, U_16 * result, U_32 bytesRemaining);
-
-/**
- * Decode the UTF8 character.
- *
- * Decode the input UTF8 character and stores it into result.
- *
- * @param[in] input The UTF8 character
- * @param[in,out] result buffer for unicode characters
- *
- * @return The number of UTF8 characters consumed (1,2,3) on success, 0 on failure
- */
-U_32
-decodeUTF8Char (const U_8 * input, U_16 * result)
-{
-  /* a UTF8 character can't require more than 3 bytes */
-  return decodeUTF8CharN (input, result, 3);
-}
-
 /**
  * Decode the UTF8 character.
  *
@@ -132,3 +111,20 @@
       return 0;
     }
 }
+/**
+ * Decode the UTF8 character.
+ *
+ * Decode the input UTF8 character and stores it into result.
+ *
+ * @param[in] input The UTF8 character
+ * @param[in,out] result buffer for unicode characters
+ *
+ * @return The number of UTF8 characters consumed (1,2,3) on success, 0 on failure
+ */
+U_32
+decodeUTF8Char (const U_8 * input, U_16 * result)
+{
+  /* a UTF8 character can't require more than 3 bytes */
+  return decodeUTF8CharN (input, result, 3);
+}
+

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/utf8encode.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/utf8encode.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/utf8encode.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/utf8encode.c Thu
Mar  2 08:51:48 2006
@@ -15,10 +15,6 @@
 
 #include "hycomp.h"
 
-/* Prototypes */
-U_32 encodeUTF8CharN (UDATA unicode, U_8 * result, U_32 bytesRemaining);
-U_32 encodeUTF8Char (UDATA unicode, U_8 * result);
-
 /**
  * Encode the Unicode character.
  *

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/hycomp.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/hycomp.h?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/hycomp.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/hycomp.h Thu Mar
 2 08:51:48 2006
@@ -311,8 +311,7 @@
 #define PTR_LONG_STORE(dstPtr, aLongPtr) (*(dstPtr) = *(aLongPtr))
 #define PTR_LONG_VALUE(dstPtr, aLongPtr) (*(aLongPtr) = *(dstPtr))
 #endif
-/* Macro used when declaring tables which require relocations.
- */
+/* Macro used when declaring tables which require relocations.*/
 #if !defined(HYCONST_TABLE)
 #define HYCONST_TABLE const
 #endif
@@ -321,4 +320,4 @@
 #define HY_SORT(base, nmemb, size, compare) qsort((base), (nmemb), (size), (compare))
 #endif
 
-#endif /* escomp_h */
+#endif /* hycomp_h */

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/hyport.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/hyport.h?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/hyport.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/hyport.h Thu Mar
 2 08:51:48 2006
@@ -22,12 +22,12 @@
 #if !defined(hyport_h)
 #define hyport_h
 
-#include <stdarg.h>
+#include <stdarg.h>	/* for va_list */
 #include "hycomp.h"
 #include "hythread.h"
 #include "hysocket.h"
 #include "gp.h"                 /* for typedefs of function arguments to gp functions */
-#if defined(LINUX)
+#if (defined(LINUX) || defined(DECUNIX))
 #include <unistd.h>
 #endif
 
@@ -1416,4 +1416,4 @@
 #endif /* !HYPORT_LIBRARY_DEFINE */
 /** @} */
 
-#endif
+#endif /* hyport_h */

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/vmi.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/vmi.h?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/vmi.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/vmi.h Thu Mar  2
08:51:48 2006
@@ -209,7 +209,8 @@
  */
   JavaVMInitArgs *JNICALL GetInitArgs (VMInterface * vmi);
 
-  /**
+ /**
+  * @fn VMInterfaceFunctions_::GetSystemProperty(VMInterface * vmi, char *key, char **valuePtr)
   * Retrieve the value of a VM system property. 
   * 
   * @note The returned string is owned by the VM, and should not be freed.

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/cmain.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/cmain.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/cmain.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/cmain.c Thu Mar
 2 08:51:48 2006
@@ -15,7 +15,6 @@
 
 #include "hycomp.h"
 #include "hyport.h"
-#include "hythread.h" /* TPE */
 #include <stdlib.h>     /* for malloc for atoe and abort */
 
 struct haCmdlineOptions
@@ -110,7 +109,6 @@
       rc = result;
     }
 
-	  hythread_attach(NULL); /* TPE */
       hyportLibrary.port_shutdown_library (&hyportLibrary);
     }
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/main.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/main.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/main.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/main.c Thu Mar
 2 08:51:48 2006
@@ -542,6 +542,7 @@
   char *portLibOptionStr = NULL;
 
   PORT_ACCESS_FROM_PORT (portLibrary);
+  /* get the path to the executable */
   hysysinfo_get_executable_name (argv[0], &exeName);
   endPathPtr = strrchr (exeName, DIR_SEPERATOR);
   endPathPtr[0] = '\0';
@@ -722,7 +723,7 @@
     }
 
   /* Check that the minimum required -D options have been included.  If not, calculate and
add the defaults */
-  initDefaultDefines (portLibrary, &options, argc, argv,
+  initDefaultDefines (portLibrary, (void **)&options, argc, argv,
           isStandaloneJar ? classArg : 0, &classPath2, &javaHome,
           &javaLibraryPath, isJvmSubDir, vmdllsubdir, &j);
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/bigint.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/bigint.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/bigint.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/bigint.c Thu Mar  2
08:51:48 2006
@@ -725,10 +725,11 @@
       topSize++;
     }
 
-  /* If the bottom int is larger than the top int, the result is the top
-  int.  Subtract one from the topSize before comparison to account for
-  the 0 added to the end.
-  */
+  /**
+   * If the bottom int is larger than the top int, the result is the top
+   * int.  Subtract one from the topSize before comparison to account for
+   * the 0 added to the end.
+   */
   if (bottomSize > (topSize - 1))
     {
       /* clean up and ensure we are returning a new long[] with the same value as that passed
in */
@@ -747,8 +748,10 @@
             }
           else
             {
-              /* we still have the original top, so must copy before returning because
-              we don't want to return the passed in object */
+              /**
+				* we still have the original top, so must copy before returning because
+                * we don't want to return the passed in object 
+                */
               if (!(resultObject = NEW_OBJECT (topLength)))
                 goto error;
               if (!(resultStart = GET_ELEMENTS (resultObject)))
@@ -788,8 +791,10 @@
 
     /* Initialize */
 
-    /* algorithm wants to make the result a modified (in place) top,
-    * so allocate new result and copy top into it, point top at the result */
+/**
+  * algorithm wants to make the result a modified (in place) top,
+  * so allocate new result and copy top into it, point top at the result 
+  */
     resultLength = topLength;
     if (!(resultObject = NEW_OBJECT (resultLength)))
       goto error;

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/inetadds.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/inetadds.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/inetadds.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/inetadds.c Thu Mar
 2 08:51:48 2006
@@ -189,7 +189,10 @@
         }
     }
 
-  /* check if there was no match for the preferIPv6Addresses.  If not just return the first
one */
+  /**
+   * check if there was no match for the preferIPv6Addresses.  
+   * If not just return the first one 
+   */
   if (i == addrLength)
     {
       hysock_getaddrinfo_family (&addrinfo, &family, 0);
@@ -292,6 +295,7 @@
   char *strHost;
 
   nipAddr = hysock_htonl ((I_32) hipAddr);
+  /* if this native method is not synchronized in Java, the underlying implementation of
hysock_inetntoa must be threadsafe */
   result = hysock_inetntoa (&strHost, nipAddr);
   if (0 != result)
     {

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/math.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/math.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/math.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/math.c Thu Mar  2 08:51:48
2006
@@ -15,6 +15,9 @@
 
 #include "jni.h"
 /* #include "fltconst.h" */
+#if defined(__P)
+#undef __P
+#endif /* defined(__P) */
 #include "fdlibm.h"
 
 jdouble internal_ceil (jdouble arg1);

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/nethelp.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/nethelp.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/nethelp.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/nethelp.c Thu Mar 
2 08:51:48 2006
@@ -1030,8 +1030,11 @@
 
   aString = (*env)->NewStringUTF (env, hostName);
 
-  /* check if the address being returned is the any address.  If so we need to check the
prefer flags to see how it should be returned
-     (either as IPv4 Any or IPv6 ANY) */
+  /**
+    * check if the address being returned is the any address.  
+    * If so we need to check the prefer flags to see how it should be returned
+    * (either as IPv4 Any or IPv6 ANY) 
+    */
 
   if (jcl_supports_ipv6 (env))
     {

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/process.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/process.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/process.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/process.c Thu Mar 
2 08:51:48 2006
@@ -18,8 +18,10 @@
 
 #include "jclglob.h"
 
-/* Create a System Process with the specified */
-/* environment and arguments */
+/**
+  * Create a System Process with the specified
+  * environment and arguments 
+  */
 jlongArray JNICALL
 Java_com_ibm_oti_lang_SystemProcess_createImpl (JNIEnv * env, jclass clazz,
             jobject recv,
@@ -234,8 +236,7 @@
                 jobject recv,
                 jobject arg1, jlong arg2)
 {
-
-  setJavaIoFileDescriptorContentsAsPointer (env, arg1, (void *) arg2);
+  setJavaIoFileDescriptorContentsAsPointer (env, arg1, (void *) ((IDATA) arg2));
 }
 
 void JNICALL
@@ -243,8 +244,7 @@
                  jobject recv,
                  jobject arg1, jlong arg2)
 {
-
-  setJavaIoFileDescriptorContentsAsPointer (env, arg1, (void *) arg2);
+  setJavaIoFileDescriptorContentsAsPointer (env, arg1, (void *) ((IDATA) arg2));
 }
 
 /* Wait for the receiver to finish then return the exit value */

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/simpl.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/simpl.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/simpl.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/simpl.c Thu Mar  2
08:51:48 2006
@@ -335,7 +335,7 @@
   if (result > 0)
     (*env)->SetByteArrayRegion (env, data, offset, result, message);
 
-  if (message != internalBuffer)
+  if (message != (jbyte *) internalBuffer)
     {
       jclmem_free_memory (env, message);
     }
@@ -409,7 +409,7 @@
         getJavaIoFileDescriptorContentsAsPointer (env, fileDescriptor);
       if (!hysock_socketIsValid (socketP))
         {
-          if (message != internalBuffer)
+          if (message != (jbyte *) internalBuffer)
             {
               jclmem_free_memory (env, message);
             }
@@ -427,7 +427,7 @@
         break;
       sent += result;
     }
-  if (message != internalBuffer)
+  if (message != (jbyte *) internalBuffer)
     {
       jclmem_free_memory (env, message);
     }

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/IFileSystem.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/IFileSystem.h?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/IFileSystem.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/IFileSystem.h Thu Mar
 2 08:51:48 2006
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-/* DO NOT EDIT THIS FILE - it is machine generated */
 #include <jni.h>
 /* Header for class com_ibm_platform_IFileSystem */
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSMemory.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSMemory.h?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSMemory.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSMemory.h Thu Mar 
2 08:51:48 2006
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-/* DO NOT EDIT THIS FILE - it is machine generated */
 #include <jni.h>
 /* Header for class com_ibm_platform_OSMemory */
 

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/nethelp.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/nethelp.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/nethelp.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/nethelp.c Thu Mar  2
08:51:48 2006
@@ -313,7 +313,7 @@
 
   /*former: tempClass = JCL_CACHE_GET (env, CLS_java_lang_Boolean);*/
   tempClass = getJavaLangBooleanClass(env);
-  /*fromer: tempMethod = JCL_CACHE_GET (env, MID_java_lang_Boolean_init);*/
+  /*former: tempMethod = JCL_CACHE_GET (env, MID_java_lang_Boolean_init);*/
   tempMethod = getJavaLangBooleanInit(env);
   return (*env)->NewObject (env, tempClass, tempMethod, (jboolean) aBool);
 }
@@ -333,10 +333,10 @@
   jclass tempClass;
   jmethodID tempMethod;
 
-  /*tempClass = JCL_CACHE_GET (env, CLS_java_lang_Byte);*/
+  /* former: tempClass = JCL_CACHE_GET (env, CLS_java_lang_Byte);*/
   tempClass = getJavaLangByteClass(env);
   tempMethod = getJavaLangByteInit(env);
-  /*tempMethod = JCL_CACHE_GET (env, MID_java_lang_Byte_init);*/
+  /* former: tempMethod = JCL_CACHE_GET (env, MID_java_lang_Byte_init);*/
   return (*env)->NewObject (env, tempClass, tempMethod, (jbyte) aByte);
 }
 
@@ -355,8 +355,8 @@
   jclass tempClass;
   jmethodID tempMethod;
 
-  /*tempClass = JCL_CACHE_GET (env, CLS_java_lang_Integer);
-  //tempMethod = JCL_CACHE_GET (env, MID_java_lang_Integer_init);*/
+  /* former: tempClass = JCL_CACHE_GET (env, CLS_java_lang_Integer);
+     former: tempMethod = JCL_CACHE_GET (env, MID_java_lang_Integer_init);*/
   tempClass = getJavaLangIntegerClass(env);
   tempMethod = getJavaLangIntegerInit(env);
   return (*env)->NewObject (env, tempClass, tempMethod, (jint) anInt);

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/BidiWrapper.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/BidiWrapper.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/BidiWrapper.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/BidiWrapper.c Thu Mar
 2 08:51:48 2006
@@ -23,13 +23,13 @@
   (JNIEnv * env, jclass clazz)
 {
   UBiDi *pBiDi = ubidi_open ();
-  return (jlong) pBiDi;
+  return (jlong) ((IDATA) pBiDi);
 }
 
 JNIEXPORT void JNICALL Java_org_apache_harmony_text_BidiWrapper_ubidi_1close
   (JNIEnv * env, jclass clazz, jlong pBiDi)
 {
-  ubidi_close ((UBiDi *) pBiDi);
+  ubidi_close ((UBiDi *) ((IDATA) pBiDi));
 }
 
 JNIEXPORT void JNICALL Java_org_apache_harmony_text_BidiWrapper_ubidi_1setPara
@@ -48,8 +48,8 @@
         (*env)->GetByteArrayElements (env, embeddingLevels, NULL);
     }
 
-  ubidi_setPara ((UBiDi *) pBiDi, _text, length, paraLevel, _embeddingLevels,
-                 &err);
+  ubidi_setPara ((UBiDi *) ((IDATA) pBiDi), _text, length, paraLevel,
+		 _embeddingLevels, &err);
   check_fail (env, err);
 
   (*env)->ReleaseCharArrayElements (env, text, _text, 0);
@@ -68,28 +68,29 @@
   UBiDi *pLineBiDi = ubidi_openSized (limit - start, 0, &err);
   check_fail (env, err);
 
-  ubidi_setLine ((UBiDi *) pParaBiDi, start, limit, pLineBiDi, &err);
+  ubidi_setLine ((UBiDi *) ((IDATA) pParaBiDi), start, limit, pLineBiDi,
+		 &err);
   check_fail (env, err);
 
-  return (jlong) pLineBiDi;
+  return (jlong) ((IDATA) pLineBiDi);
 }
 
 JNIEXPORT jint JNICALL Java_org_apache_harmony_text_BidiWrapper_ubidi_1getDirection
   (JNIEnv * env, jclass clazz, jlong pBiDi)
 {
-  return ubidi_getDirection ((const UBiDi *) pBiDi);
+  return ubidi_getDirection ((const UBiDi *) ((IDATA) pBiDi));
 }
 
 JNIEXPORT jint JNICALL Java_org_apache_harmony_text_BidiWrapper_ubidi_1getLength
   (JNIEnv * env, jclass clazz, jlong pBiDi)
 {
-  return ubidi_getLength ((const UBiDi *) pBiDi);
+  return ubidi_getLength ((const UBiDi *) ((IDATA) pBiDi));
 }
 
 JNIEXPORT jbyte JNICALL Java_org_apache_harmony_text_BidiWrapper_ubidi_1getParaLevel
   (JNIEnv * env, jclass clazz, jlong pBiDi)
 {
-  return ubidi_getParaLevel ((const UBiDi *) pBiDi);
+  return ubidi_getParaLevel ((const UBiDi *) ((IDATA) pBiDi));
 }
 
 JNIEXPORT jbyteArray JNICALL Java_org_apache_harmony_text_BidiWrapper_ubidi_1getLevels
@@ -100,10 +101,10 @@
   jbyteArray result = NULL;
   int len = 0;
 
-  levels = ubidi_getLevels ((UBiDi *) pBiDi, &err);
+  levels = ubidi_getLevels ((UBiDi *) ((IDATA) pBiDi), &err);
   check_fail (env, err);
 
-  len = ubidi_getLength ((const UBiDi *) pBiDi);
+  len = ubidi_getLength ((const UBiDi *) ((IDATA) pBiDi));
   result = (*env)->NewByteArray (env, len);
   (*env)->SetByteArrayRegion (env, result, 0, len, (jbyte *) levels);
 
@@ -115,7 +116,7 @@
 {
   UErrorCode err = 0;
 
-  int count = ubidi_countRuns ((UBiDi *) pBiDi, &err);
+  int count = ubidi_countRuns ((UBiDi *) ((IDATA) pBiDi), &err);
   check_fail (env, err);
 
   return count;
@@ -131,8 +132,8 @@
   jmethodID initID = 0;
   jobject run = 0;
 
-  ubidi_getVisualRun ((UBiDi *) pBiDi, index, &start, &length);
-  ubidi_getLogicalRun ((const UBiDi *) pBiDi, start, NULL, &level);
+  ubidi_getVisualRun ((UBiDi *) ((IDATA) pBiDi), index, &start, &length);
+  ubidi_getLogicalRun ((const UBiDi *) ((IDATA) pBiDi), start, NULL, &level);
 
   run_clazz = (*env)->FindClass (env, "org/apache/harmony/text/BidiRun");
   initID = (*env)->GetMethodID (env, run_clazz, "<init>", "(III)V");

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/hyzip_zh_CN.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/hyzip_zh_CN.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/hyzip_zh_CN.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/hyzip_zh_CN.nls Thu
Mar  2 08:51:48 2006
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 
-# This file was automatically deduced from hyzip.nls and java_zh_CN.properties
 HYNLS.MODULE=ZIPS
 HYNLS.HEADER=hyzipnls.h
 



Mime
View raw message