You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/03/02 17:51:54 UTC
svn commit: r382442 [1/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/...
Author: tellison
Date: Thu Mar 2 08:51:48 2006
New Revision: 382442
URL: http://svn.apache.org/viewcvs?rev=382442&view=rev
Log:
Apply patch HARMONY-155 (Native code tidy up - comments and casts)
Modified:
incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/deflater.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/inflater.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/jarfile.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/zip.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/iohelp.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/hycomp.h
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/hyvmls.h
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/vmi.h
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/cmain.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/main.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/bigint.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/inetadds.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/luniglob.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/math.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/nethelp.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/process.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/socket.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/bigint.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/nethelp.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/socket.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/pool.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hynls.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hyportptb.h
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hystr.c
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ca.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_cs.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_de.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_es.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_fr.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_hu.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_it.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ja.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ko.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_pl.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_pt_BR.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ru.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_sk.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_sl.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_tr.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh_CN.nls
incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh_TW.nls
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/deflater.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/inflater.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/jarfile.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/zip.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/iohelp.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/utf8decode.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/common/utf8encode.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/hycomp.h
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/hyport.h
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/include/vmi.h
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/cmain.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/main.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/bigint.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/inetadds.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/math.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/nethelp.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/process.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/luni/simpl.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/IFileSystem.h
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/OSMemory.h
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/nio/nethelp.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/text/BidiWrapper.c
incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/zip/hyzip_zh_CN.nls
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/build.xml?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/build.xml Thu Mar 2 08:51:48 2006
@@ -173,16 +173,6 @@
<include name="jniport.h" />
</fileset>
</copy>
-
- <!-- Copy the binaries for security -->
-
- <copy todir="${target.output}/jre/bin" overwrite="yes"
- verbose="true" >
-
- <fileset dir="../modules/security/build/deploy/jre/bin/"
- includes="*${shlib.suffix}" />
- </copy>
-
</target>
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/deflater.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/deflater.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/deflater.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/deflater.c Thu Mar 2 08:51:48 2006
@@ -117,7 +117,8 @@
jstream->dict = NULL;
jstream->inaddr = NULL;
- if (noHeader) /*Unable to find official doc that this is the way to avoid zlib header use. However doc in zipsup.c claims it is so */
+ /*Unable to find official doc that this is the way to avoid zlib header use. However doc in zipsup.c claims it is so */
+ if (noHeader)
wbits = wbits / -1;
err = deflateInit2 (stream, level, Z_DEFLATED, /*Only supported ZLIB method */
wbits, /*Window bits to use. 15 is fastest but consumes the most memory */
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/inflater.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/inflater.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/inflater.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/inflater.c Thu Mar 2 08:51:48 2006
@@ -53,13 +53,13 @@
stream->opaque = (void *) privatePortLibrary;
stream->zalloc = zalloc;
stream->zfree = zfree;
- /* Initialize adler for compatibility with zlib 1.1.4 */
stream->adler = 1;
jstream->stream = stream;
jstream->dict = NULL;
jstream->inaddr = NULL;
- if (noHeader) /*Unable to find official doc that this is the way to avoid zlib header use. However doc in zipsup.c claims it is so. */
+ /*Unable to find official doc that this is the way to avoid zlib header use. However doc in zipsup.c claims it is so. */
+ if (noHeader)
wbits = wbits / -1;
err = inflateInit2 (stream, wbits); /*Window bits to use. 15 is fastest but consumes the most memory */
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/jarfile.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/jarfile.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/jarfile.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/jarfile.c Thu Mar 2 08:51:48 2006
@@ -53,7 +53,7 @@
javaClass = JCL_CACHE_GET (env, CLS_java_util_zip_ZipEntry);
mid = JCL_CACHE_GET (env, MID_java_util_zip_ZipEntry_init);
- java_ZipEntry = ((*env)->NewObject (env, javaClass, mid, entryName, NULL, /* comment */
+ java_ZipEntry = ((*env)->NewObject (env, javaClass, mid, entryName, NULL,
extra,
(jlong) zipEntry->lastModTime,
(jlong) zipEntry->uncompressedSize,
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/zip.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/zip.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/zip.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/archive/zip.c Thu Mar 2 08:51:48 2006
@@ -45,8 +45,7 @@
void
throwJavaZIOException (JNIEnv * env, char *message)
{
- jclass exceptionClass =
- (*env)->FindClass (env, "java/util/zip/ZipException");
+ jclass exceptionClass = (*env)->FindClass(env, "java/util/zip/ZipException");
if (0 == exceptionClass)
{
/* Just return if we can't load the exception class. */
@@ -108,7 +107,7 @@
(*env)->SetLongField (env, recv,
JCL_CACHE_GET (env,
FID_java_util_zip_ZipFile_descriptor),
- ((IDATA) jclZipFile));
+ ((IDATA) jclZipFile));
return 0;
}
@@ -170,7 +169,7 @@
entryClass = JCL_CACHE_GET (env, CLS_java_util_zip_ZipEntry);
mid = JCL_CACHE_GET (env, MID_java_util_zip_ZipEntry_init);
/* Build a new ZipEntry from the C struct */
- java_ZipEntry = ((*env)->NewObject (env, entryClass, mid, entryName, NULL, /* comment */
+ java_ZipEntry = ((*env)->NewObject (env, entryClass, mid, entryName, NULL,
extra,
(jlong) zipEntry.lastModTime,
(jlong) zipEntry.uncompressedSize,
@@ -193,8 +192,7 @@
jfieldID descriptorFID =
JCL_CACHE_GET (env, FID_java_util_zip_ZipFile_descriptor);
- jclZipFile =
- (JCLZipFile *) (IDATA) (*env)->GetLongField (env, recv, descriptorFID);
+ jclZipFile = (JCLZipFile *) (IDATA) (*env)->GetLongField (env, recv, descriptorFID);
if (jclZipFile != (void *) -1)
{
retval =
@@ -222,8 +220,7 @@
void
throwNewIllegalStateException (JNIEnv * env, char *message)
{
- jclass exceptionClass =
- (*env)->FindClass (env, "java/lang/IllegalStateException");
+ jclass exceptionClass = (*env)->FindClass (env, "java/lang/IllegalStateException");
if (0 == exceptionClass)
{
/* Just return if we can't load the exception class. */
@@ -238,8 +235,7 @@
void
throwNewIllegalArgumentException (JNIEnv * env, char *message)
{
- jclass exceptionClass =
- (*env)->FindClass (env, "java/lang/IllegalArgumentException");
+ jclass exceptionClass = (*env)->FindClass (env, "java/lang/IllegalArgumentException");
if (0 == exceptionClass)
{
/* Just return if we can't load the exception class. */
@@ -308,7 +304,8 @@
return 0;
}
zip_resetZipFile (privatePortLibrary,
- &(jclZipFile->hyZipFile), &nextEntryPointer);
+ &(jclZipFile->hyZipFile),
+ &nextEntryPointer);
return nextEntryPointer;
}
@@ -347,7 +344,6 @@
{
char buf[40];
sprintf (buf, "Error %d getting next zip entry", retval);
- /* Cannot throw IOException (or subclasses) */
throwNewInternalError (env, buf);
}
return (jobject) NULL;
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/iohelp.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/iohelp.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/iohelp.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/common/iohelp.c Thu Mar 2 08:51:48 2006
@@ -327,7 +327,7 @@
/**
* Throw java.lang.NullPointerException with the message provided
- * Note: This is not names 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.
*/
@@ -401,7 +401,9 @@
/* Check for closed file, in, out, and err */
if (descriptor >= -1 && descriptor <= 2)
+ {
return;
+ }
hyfile_close (descriptor);
setJavaIoFileDescriptorContentsAsPointer (env, fd, (void *) -1);
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/hycomp.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/hycomp.h?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/hycomp.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/hycomp.h Thu Mar 2 08:51:48 2006
@@ -24,7 +24,7 @@
NO_LVALUE_CASTING: This is for compilers that don't like the left side
of assigns to be cast. It hacks around to do the
right thing.
-ATOMIC_FLOAT_ACCESS: For the hp720 so that float operations will work.
+ATOMIC_FLOAT_ACCESS: So that float operations will work.
LINKED_USER_PRIMITIVES: Indicates that user primitives are statically linked
with the VM executeable.
OLD_SPACE_SIZE_DIFF: The 68k uses a different amount of old space.
@@ -36,17 +36,14 @@
VMAPICALL: Tag for all functions called via the PlatformFunction
callWith: mechanism.
-SYS_FLOAT: For the MPW C compiler on MACintosh. Most of the math functions
- there return extended type which has 80 or 96 bits depending on 68881 option.
- On All other platforms it is double
+SYS_FLOAT: For some math functions where extended types (80 or 96 bits) are returned
+ Most platforms return as a double
FLOAT_EXTENDED: If defined, the type name for extended precision floats.
PLATFORM_IS_ASCII: Must be defined if the platform is ASCII
EXE_EXTENSION_CHAR: the executable has a delimiter that we want to stop at as part of argv[0].
*/
/* By default order doubles in the native (i.e. big/little endian) ordering. */
#define HY_PLATFORM_DOUBLE_ORDER
-
-/* Linux ANSI compiler (gcc) */
#if defined(LINUX)
/* NOTE: Linux supports different processors -- do not assume 386 */
#if defined(LINUXPPC64)
@@ -62,8 +59,6 @@
typedef signed short I_16;
typedef signed char I_8;
typedef U_32 BOOLEAN;
-
-/* LinuxPPC64 is like AIX64 so we need direct function pointers */
#if defined(LINUXPPC64)
#define TOC_UNWRAP_ADDRESS(wrappedPointer) ((void *) (wrappedPointer)[0])
#define TOC_STORE_TOC(dest,wrappedPointer) (dest = ((UDATA*)wrappedPointer)[1])
@@ -111,6 +106,12 @@
#define DIR_SEPARATOR '\\'
#define DIR_SEPARATOR_STR "\\"
+/* Modifications for the Alpha running WIN-NT */
+#if defined(_ALPHA_)
+#undef small /* defined as char in rpcndr.h */
+typedef double FLOAT_EXTENDED;
+#endif
+
#define HY_PRIORITY_MAP { \
THREAD_PRIORITY_IDLE, /* 0 */\
THREAD_PRIORITY_LOWEST, /* 1 */\
@@ -291,7 +292,7 @@
#else
#define NORETURN
#endif
-/* on some systems (e.g. LinuxPPC) va_list is an array type. This is probably in
+/* on some systems va_list is an array type. This is probably in
* violation of the ANSI C spec, but it's not entirely clear. Because of this, we end
* up with an undesired extra level of indirection if we take the address of a
* va_list argument.
@@ -301,7 +302,6 @@
#if !defined(VA_PTR)
#define VA_PTR(valist) (&valist)
#endif
-/* Macros used on RS6000 to manipulate wrapped function pointers */
#if !defined(TOC_UNWRAP_ADDRESS)
#define TOC_UNWRAP_ADDRESS(wrappedPointer) (wrappedPointer)
#endif
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/hyvmls.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/hyvmls.h?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/hyvmls.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/hyvmls.h Thu Mar 2 08:51:48 2006
@@ -43,54 +43,6 @@
} HyVMLSFunctionTable;
#define HYSIZEOF_HyVMLSFunctionTable 16
-/**
- * @fn HyVMLSFunctionTable::HYVMLSAllocKeys
- * Allocate one or more slots of VM local storage.
- *
- * @code UDATA JNICALL HYVMLSAllocKeys(JNIEnv * env, UDATA * pInitCount, ...); @endcode
- *
- * @param[in] env A JNIEnv pointer
- * @param[in] pInitCount Pointer to the reference count for these slots
- * @param[out] ... Locations to store the allocated keys
- *
- * @return 0 on success, 1 on failure.
- *
- * @note Newly allocated VMLS slots contain NULL in all VMs.
- */
-/**
- * @fn HyVMLSFunctionTable::HYVMLSFreeKeys
- * Destroy one or more slots of VM local storage.
- *
- * @code void JNICALL HYVMLSFreeKeys(JNIEnv * env, UDATA * pInitCount, ...); @endcode
- *
- * @param[in] env A JNIEnv pointer
- * @param[in] pInitCount Pointer to the reference count for these slots
- * @param[out] ... Pointers to the allocated keys
- */
-/**
- * @fn HyVMLSFunctionTable::HyVMLSGet
- * Retrieve the value in a VM local storage slot.
- *
- * @code void* JNICALL HyVMLSGet(JNIEnv * env, void * key); @endcode
- *
- * @param[in] env JNIEnv pointer
- * @param[in] key The VMLS key
- *
- * @return The contents of the VM local storage slot in the VM that contains the specified env
- */
-/**
- * @fn HyVMLSFunctionTable::HyVMLSSet
- * Store a value into a VM local storage slot.
- *
- * @code void* JNICALL HyVMLSSet(JNIEnv * env, void ** pKey, void * value); @endcode
- *
- * @param[in] env JNIEnv pointer
- * @param[in] pKey Pointer to the VM local storage key
- * @param[in] value Value to store
- *
- * @return The value stored
- */
-
#if defined(USING_VMI)
#define HY_VMLS_FNTBL(env) (*VMI_GetVMIFromJNIEnv(env))->GetVMLSFunctions(VMI_GetVMIFromJNIEnv(env))
#else
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/vmi.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/vmi.h?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/vmi.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/include/vmi.h Thu Mar 2 08:51:48 2006
@@ -96,39 +96,23 @@
vmiError (JNICALL * IterateSystemProperties) (VMInterface* vmi, vmiSystemPropertyIterator iterator, void* userData);
};
/**
- *
- * @name VM Interface Support Functions
- * @htmlonly <a name='VMIExports'> </a> @endhtmlonly Non-table VM interface functions. Directly exported from the VMI library.
- */
-/*@{*/
-/**
* Extract the VM interface from a JNIEnv
- *
- * @param[in] env The JNIEnv to query
- *
- * @return a VMInterface pointer
*/
VMInterface * JNICALL VMI_GetVMIFromJNIEnv(JNIEnv* env);
/**
* Extract the VM interface from a JNI JavaVM
- *
- * @param[in] vm The JavaVM to query
- *
- * @return a VMInterface pointer
*/
VMInterface * JNICALL VMI_GetVMIFromJavaVM(JavaVM* vm);
-/*@}*/
-/** @name VM Interface Access Macros
- *
+
+/**
* Convenience macros for acquiring a VMInterface
*/
-/*@{*/
#define VMI_ACCESS_FROM_ENV(env) VMInterface* privateVMI = VMI_GetVMIFromJNIEnv(env)
#define VMI_ACCESS_FROM_JAVAVM(javaVM) VMInterface* privateVMI = VMI_GetVMIFromJavaVM(javaVM)
#define VMI privateVMI
-/*@}*/
+
/**
- * @fn VMInterfaceFunctions_::CheckVersion
+ * @fn VMInterfaceFunctions_::CheckVersion(VMInterface * vmi, vmiVersion * version)
* Check the version of the VM interface
*
* @code vmiError JNICALL CheckVersion(VMInterface* vmi, vmiVersion* version); @endcode
@@ -145,7 +129,7 @@
*/
vmiError JNICALL CheckVersion(VMInterface* vmi, vmiVersion* version);
/**
- * @fn VMInterfaceFunctions_::GetJavaVM
+ * @fn VMInterfaceFunctions_::GetJavaVM(VMInterface * vmi)
* Return the JNI JavaVM associated with the VM interface
*
* @code JavaVM* JNICALL GetJavaVM(VMInterface* vmi); @endcode
@@ -156,9 +140,8 @@
*/
JavaVM* JNICALL GetJavaVM(VMInterface* vmi);
/**
- * @fn VMInterfaceFunctions_::GetPortLibrary
+ * @fn VMInterfaceFunctions_::GetPortLibrary(VMInterface * vmi)
* Return a pointer to an initialized HyPortLibrary structure.
- *
* @code HyPortLibrary* JNICALL GetPortLibrary(VMInterface* vmi); @endcode
*
* The @ref hyport.h "port library" is a table of functions that implement useful platform specific
@@ -173,7 +156,7 @@
*/
HyPortLibrary* JNICALL GetPortLibrary(VMInterface* vmi);
/**
- * @fn VMInterfaceFunctions_::GetVMLSFunctions
+ * @fn VMInterfaceFunctions_::GetVMLSFunctions(VMInterface * vmi)
* Return a pointer to a HyVMLSFunctionTable. This is a table of functions for allocating,
* freeing, getting, and setting thread local storage.
*
@@ -185,7 +168,7 @@
*/
HyVMLSFunctionTable* JNICALL GetVMLSFunctions(VMInterface* vmi);
/**
- * @fn VMInterfaceFunctions_::GetZipCachePool
+ * @fn VMInterfaceFunctions_::GetZipCachePool(VMInterface * vmi)
* Return a pointer to the HyZipCachePool structure used by the VM. It is the
* responsibility of the vm to allocate the pool using zipCachePool_new().
*
@@ -197,7 +180,7 @@
*/
HyZipCachePool* JNICALL GetZipCachePool(VMInterface* vmi);
/**
- * @fn VMInterfaceFunctions_::GetInitArgs
+ * @fn VMInterfaceFunctions_::GetInitArgs(VMInterface * vmi)
* Return a pointer to a JavaVMInitArgs structure as defined by the 1.2 JNI
* specification. This structure contains the arguments used to invoke the vm.
*
@@ -209,42 +192,14 @@
*/
JavaVMInitArgs* JNICALL GetInitArgs(VMInterface* vmi);
/**
- * @fn VMInterfaceFunctions_::GetSystemProperty
+ * @fn VMInterfaceFunctions_::GetSystemProperty(VMInterface * vmi, char *key, char **valuePtr)
* Retrieve the value of a VM system property.
*
- * @code vmiError JNICALL GetSystemProperty (VMInterface* vmi, char* key, char** valuePtr); @endcode
- *
- * The following properties must be defined by the vm.
- *
- * <TABLE>
- * <TR><TD><B>Property Name</B></TD> <TD><B>Example Value or Description</B></TD></TR>
- * <TR><TD>java.vendor</TD> <TD>"MY Corporation"</TD></TR>
- * <TR><TD>java.vendor.url</TD> <TD>"http://www.MYCorp.com/"</TD></TR>
- * <TR><TD>java.vm.specification.version</TD> <TD>"1.0"</TD></TR>
- * <TR><TD>java.vm.specification.vendor</TD> <TD>"Sun Microsystems Inc."</TD></TR>
- * <TR><TD>java.vm.specification.name</TD> <TD>"Java Virtual Machine Specification"</TD></TR>
- * <TR><TD>java.vm.version</TD> <TD>"2.3"</TD></TR>
- * <TR><TD>java.vm.vendor</TD> <TD>"MY Corporation"</TD></TR>
- * <TR><TD>java.vm.name </TD> <TD>"MYVM"</TD></TR>
- * <TR><TD>java.vm.info</TD> <TD>"MYVM 2.3 Windows XP x86-32 (JIT enabled)
-<BR>MYVM version 2.3
- * <TR><TD>java.compiler</TD> <TD>"MYjit"</TD></TR>
- * <TR><TD>java.runtime.name</TD> <TD>"MY Virtual Machine"</TD></TR>
- * <TR><TD>java.runtime.version</TD> <TD>"2.3"</TD></TR>
- * <TR><TD>java.class.version</TD> <TD>"49.0"</TD></TR>
- * <TR><TD>java.home</TD> <TD>the absolute path of the parent directory of the directory containing the vm
-<BR>i.e. for a vm /harmony/bin/vm.exe, java.home is /harmony</TD></TR>
- * <TR><TD>java.class.path</TD> <TD>the application class path</TD></TR>
- * <TR><TD>java.library.path</TD> <TD>the application library path</TD></TR>
- * </TABLE>
- *
- * @return a @ref vmiError "VMI error code"
- *
* @note The returned string is owned by the VM, and should not be freed.
*/
vmiError JNICALL GetSystemProperty (VMInterface* vmi, char* key, char** valuePtr);
/**
- * @fn VMInterfaceFunctions_::SetSystemProperty
+ * @fn VMInterfaceFunctions_::SetSystemProperty(VMInterface * vmi, char *key, char *value)
* Override the value of a VM system property
*
* @code vmiError JNICALL SetSystemProperty(VMInterface* vmi, char* key, char* value); @endcode
@@ -262,7 +217,7 @@
*/
vmiError JNICALL SetSystemProperty(VMInterface* vmi, char* key, char* value);
/**
- * @fn VMInterfaceFunctions_::CountSystemProperties
+ * @fn VMInterfaceFunctions_::CountSystemProperties(VMInterface * vmi, int *countPtr)
* Return the number of VM system properties
*
* @code vmiError JNICALL CountSystemProperties(VMInterface* vmi, int* countPtr); @endcode
@@ -277,10 +232,9 @@
*/
vmiError JNICALL CountSystemProperties(VMInterface* vmi, int* countPtr);
/**
- * @fn VMInterfaceFunctions_::IterateSystemProperties
+ * @fn VMInterfaceFunctions_::IterateSystemProperties(VMInterface * vmi, vmiSystemPropertyIterator iterator, void *userData)
* Iterate over the VM system properties calling a function.
*
- * @code vmiError JNICALL IterateSystemProperties(VMInterface* vmi, vmiSystemPropertyIterator iterator, void* userData); @endcode
*
* @param[in] vmi The VM interface pointer
* @param[in] iterator The iterator function to call with each property
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/cmain.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/cmain.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/cmain.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/cmain.c Thu Mar 2 08:51:48 2006
@@ -15,7 +15,6 @@
#include "hycomp.h"
#include "hyport.h"
-//#include "libhlp.h" /* haCmdlineOptions structure moved to here */
#include <stdlib.h> /* for malloc for atoe and abort */
struct haCmdlineOptions
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/main.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/main.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/main.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/main.c Thu Mar 2 08:51:48 2006
@@ -456,8 +456,6 @@
{
(*env)->ExceptionClear (env);
(*jvm)->DestroyJavaVM (jvm);
- /* "-jar option is not available for this class library\n" */
- // portLibrary->nls_printf(portLibrary, HYNLS_ERROR, HYNLS_EXE_JAR_OPTION_NOT_AVAIL );
rc = 3;
//goto cleanup;
}
@@ -553,7 +551,6 @@
if (rc == 0)
{
- //printf ("filecontents =%s\n", fileContents);
lineDelimiter = strstr (fileContents, PLATFORM_LINE_DELIMITER);
startOfLine = fileContents;
/* note this logic means you need a line feed at the end of every line */
@@ -581,7 +578,6 @@
lineDelimiter = lineDelimiter + strlen (PLATFORM_LINE_DELIMITER);
lineDelimiter = strstr (lineDelimiter, PLATFORM_LINE_DELIMITER);
}
- //printf ("line count = %d\n", linecount);
}
/* now expand strings with %LAUNCHER_HOME% */
for (l = 0; l < linecount; l++)
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/bigint.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/bigint.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/bigint.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/bigint.c Thu Mar 2 08:51:48 2006
@@ -1094,7 +1094,7 @@
{
IDATA len1, lenR;
jlong *ar1, *arR;
- IDATA neg1 = 0, i;
+ IDATA neg1 = 0;
jlongArray resultObject = NULL;
len1 = GET_LENGTH (src1);
@@ -1139,7 +1139,7 @@
jlongArray
grow (JNIEnv * env, jlongArray src1, jlong element)
{
- IDATA len1, lenR;
+ IDATA len1;
jlong *ar1, *arR;
jlongArray resultObject = NULL;
@@ -1274,8 +1274,6 @@
resultObject = internalBigIntegerAdd (env, negObject, oneObject);
return resultObject;
-error:
- RELEASE_ELEMENTS_CRITICAL (oneObject, arO, 0);
releaseN:
RELEASE_ELEMENTS_CRITICAL (negObject, arN, 0);
release1:
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/inetadds.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/inetadds.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/inetadds.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/inetadds.c Thu Mar 2 08:51:48 2006
@@ -147,7 +147,7 @@
U_32 length = 0;
I_32 family;
U_32 scope_id = 0;
- U_32 i = 0;
+ I_32 i = 0;
I_32 addrLength = 0;
BOOLEAN preferIPv4StackValue = preferIPv4Stack (env);
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/luniglob.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/luniglob.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/luniglob.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/luniglob.c Thu Mar 2 08:51:48 2006
@@ -90,7 +90,6 @@
goto fail;
}
- /* This allocate must actually be done by hymem_allocate_memory */
idCache = (JniIDCache *) hymem_allocate_memory (sizeof (JniIDCache));
if (!idCache)
goto fail2;
@@ -484,7 +483,6 @@
char propsFile[HyMaxPath];
char cpSeparator[2];
char *bootstrapClassPath = NULL;
- char *fileWritePos;
vmiError rcGetProperty;
jint returnCode = JNI_OK;
IDATA propsFD = -1;
@@ -505,7 +503,7 @@
}
/* Make a string version of the CP separator */
- cpSeparator[0] = hysysinfo_get_classpathSeparator ();
+ cpSeparator[0] = (char)hysysinfo_get_classpathSeparator ();
cpSeparator[1] = '\0';
/* Load the java.home system property */
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/math.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/math.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/math.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/math.c Thu Mar 2 08:51:48 2006
@@ -15,7 +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/linux.IA32/luni/nethelp.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/nethelp.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/nethelp.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/nethelp.c Thu Mar 2 08:51:48 2006
@@ -904,7 +904,7 @@
static jbyte IPv4ANY[4] = { 0, 0, 0, 0 };
static jbyte IPv6ANY[16] =
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
- int i = 0;
+ U_32 i = 0;
/* 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) */
@@ -1027,14 +1027,15 @@
static jbyte IPv4ANY[4] = { 0, 0, 0, 0 };
static jbyte IPv6ANY[16] =
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
- int i = 0;
+ U_32 i = 0;
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) */
+ * (either as IPv4 Any or IPv6 ANY)
+ */
if (jcl_supports_ipv6 (env))
{
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/process.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/process.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/process.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/process.c Thu Mar 2 08:51:48 2006
@@ -116,7 +116,8 @@
}
if (!retVal)
- { /* Failed to exec program */
+ {
+ /* Failed to exec program */
jclass exClass = (*env)->FindClass (env, "java/io/IOException");
(*env)->ThrowNew (env, exClass, "Unable to start program");
goto failed;
@@ -194,19 +195,19 @@
}
-/*Return the number of bytes available to be read without blocking */
+/* Return the number of byes available to be read without blocking */
jint JNICALL
Java_com_ibm_oti_lang_ProcessInputStream_availableImpl (JNIEnv * env,
jobject recv)
{
- jint sHandle;
+ jlong sHandle;
int retVal;
sHandle =
(*env)->GetLongField (env, recv,
JCL_CACHE_GET (env,
FID_com_ibm_oti_lang_ProcessInputStream_handle));
- retVal = getAvailable (sHandle);
+ retVal = getAvailable ((jint)sHandle);
if (retVal < 0)
{
/* Couldn't read bytes */
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/socket.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/socket.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/socket.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/luni/socket.c Thu Mar 2 08:51:48 2006
@@ -804,6 +804,7 @@
else
{
hysock_sockaddr_address6 (&sockaddrP, byte_array, &length, &scope_id);
+ /* Cannot call gethostbyaddr since it is not reentrant on some OS's */
return newJavaNetInetAddressGenericB (env, byte_array, length,
scope_id);
}
@@ -927,8 +928,6 @@
*
* @exception SocketException if an error occurs during the call
*/
-/* Support datagram broadcasts */
-
void JNICALL
Java_java_net_Socket_setSocketOptionImpl (JNIEnv * env, jclass thisClz,
jobject aFileDescriptor,
@@ -1027,9 +1026,6 @@
* @param thisClz pointer to the class of the receiver (of the java message)
* @param fileDescriptor pointer to the file descriptor of the socket to close
*/
-
-/* Descriptor field now set after socket closed. */
-
void JNICALL
Java_java_net_Socket_socketCloseImpl (JNIEnv * env, jclass thisClz,
jobject fileDescriptor)
@@ -1088,7 +1084,6 @@
* @param env pointer to the JNI library
* @param hysocketP socket pointer
* @param timeout timeout value
- *
*/
I_32
@@ -1099,7 +1094,7 @@
I_32 result;
hysocket_t hysocketP;
-#if (defined(WIN32))
+#if defined(WIN32)
PORT_ACCESS_FROM_ENV (env);
hysocketP = getJavaIoFileDescriptorContentsAsPointer (env, fileDescriptor);
if (!hysock_socketIsValid (hysocketP))
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/bigint.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/bigint.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/bigint.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/math/bigint.c Thu Mar 2 08:51:48 2006
@@ -1089,7 +1089,7 @@
{
IDATA len1, lenR;
jlong *ar1, *arR;
- IDATA neg1 = 0, i;
+ IDATA neg1 = 0;
jlongArray resultObject = NULL;
len1 = GET_LENGTH (src1);
@@ -1134,7 +1134,7 @@
jlongArray
grow (JNIEnv * env, jlongArray src1, jlong element)
{
- IDATA len1, lenR;
+ IDATA len1;
jlong *ar1, *arR;
jlongArray resultObject = NULL;
@@ -1269,8 +1269,6 @@
resultObject = internalBigIntegerAdd (env, negObject, oneObject);
return resultObject;
-error:
- RELEASE_ELEMENTS_CRITICAL (oneObject, arO, 0);
releaseN:
RELEASE_ELEMENTS_CRITICAL (negObject, arN, 0);
release1:
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/nethelp.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/nethelp.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/nethelp.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/nethelp.c Thu Mar 2 08:51:48 2006
@@ -57,9 +57,9 @@
I_32 netGetSockAddr (JNIEnv * env, jobject fileDescriptor,
hysockaddr_t sockaddrP, jboolean preferIPv6Addresses);
-//--------------------------------------
+/*--------------------------------------
//reflect function
-//--------------------------------------
+----------------------------------------*/
jclass
getJavaLangBooleanClass(JNIEnv * env);
@@ -312,9 +312,9 @@
jclass tempClass;
jmethodID tempMethod;
- //tempClass = JCL_CACHE_GET (env, CLS_java_lang_Boolean);
+ /*former: tempClass = JCL_CACHE_GET (env, CLS_java_lang_Boolean);*/
tempClass = getJavaLangBooleanClass(env);
- //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);
}
@@ -334,10 +334,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);
}
@@ -356,8 +356,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);
@@ -421,10 +421,10 @@
BOOLEAN
booleanValue (JNIEnv * env, jobject aBoolean)
{
- //return (BOOLEAN) ((*env)->
+ /*return (BOOLEAN) ((*env)->
// GetBooleanField (env, aBoolean,
// JCL_CACHE_GET (env,
- // FID_java_lang_Boolean_value)));
+ // FID_java_lang_Boolean_value)));*/
return (BOOLEAN) ((*env)->
GetBooleanField (env, aBoolean,
getJavaLangBooleanValue(env)));
@@ -442,9 +442,9 @@
U_8
byteValue (JNIEnv * env, jobject aByte)
{
- //return (U_8) ((*env)->
+ /*return (U_8) ((*env)->
// GetByteField (env, aByte,
- // JCL_CACHE_GET (env, FID_java_lang_Byte_value)));
+ // JCL_CACHE_GET (env, FID_java_lang_Byte_value)));*/
return (U_8) ((*env)->
GetByteField (env, aByte,
getJavaLangByteValue(env)));
@@ -462,10 +462,11 @@
I_32
intValue (JNIEnv * env, jobject anInteger)
{
- //return (I_32) ((*env)->
+ /*return (I_32) ((*env)->
// GetIntField (env, anInteger,
// JCL_CACHE_GET (env,
// FID_java_lang_Integer_value)));
+ */
return (I_32) ((*env)->
GetIntField (env, anInteger,
getJavaLangIntegerValue(env)));
@@ -607,10 +608,11 @@
netGetJavaNetInetAddressValue (JNIEnv * env, jobject anInetAddress,
U_8 * buffer, U_32 * length)
{
- //jbyteArray byte_array =
+ /*jbyteArray byte_array =
// (jbyteArray) ((*env)->GetObjectField (env, anInetAddress,
// JCL_CACHE_GET (env,
// FID_java_net_InetAddress_address)));
+ */
jbyteArray byte_array =
(jbyteArray) ((*env)->GetObjectField (env, anInetAddress,
getJavaNetInetAddressIpaddress(env)));
@@ -632,8 +634,9 @@
jclass tempClass;
jobject globalRef;
- //tempClass = JCL_CACHE_GET (env, CLS_java_lang_Thread);
+ /*tempClass = JCL_CACHE_GET (env, CLS_java_lang_Thread);
//tempMethod = JCL_CACHE_GET (env, MID_java_lang_Thread_yield);
+ */
tempClass = getJavaLangThreadClass(env);
tempMethod = getJavaLangThreadYield(env);
if (tempClass == 0)
@@ -647,8 +650,9 @@
tempMethod = (*env)->GetStaticMethodID (env, tempClass, "yield", "()V");
if (!tempMethod)
return;
- //JCL_CACHE_SET (env, CLS_java_lang_Thread, globalRef);
+ /*JCL_CACHE_SET (env, CLS_java_lang_Thread, globalRef);
//JCL_CACHE_SET (env, MID_java_lang_Thread_yield, tempMethod);
+ */
}
(*env)->CallStaticVoidMethod (env, tempClass, tempMethod);
}
@@ -798,9 +802,11 @@
BOOLEAN
jcl_supports_ipv6 (JNIEnv * env)
{
- //return (BOOLEAN) JCL_CACHE_GET (env, jcl_supports_ipv6);
+ static int support = 1;
+ /*return (BOOLEAN) JCL_CACHE_GET (env, jcl_supports_ipv6);
//TODO check support
- return (BOOLEAN) 1;
+ */
+ return (BOOLEAN) support;
}
/**
@@ -906,12 +912,13 @@
tempMethodWithScope = NULL;
if (scope_id != 0)
{
- //tempMethodWithScope =
+ /*tempMethodWithScope =
// (*env)->GetStaticMethodID (env,
// JCL_CACHE_GET (env,
// CLS_java_net_InetAddress),
// "getByAddress",
// "([BI)Ljava/net/InetAddress;");
+ */
tempMethodWithScope =
(*env)->GetStaticMethodID (env,
getJavaNetInetAddressClass(env),
@@ -927,7 +934,7 @@
if (tempMethodWithScope != NULL)
{
/* create using the scope id */
- //tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);
+ /*tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);*/
tempClass = getJavaNetInetAddressClass(env);
return (*env)->CallStaticObjectMethod (env, tempClass,
tempMethodWithScope,
@@ -935,11 +942,12 @@
}
else
{
- //tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);
+ /*tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);*/
tempClass = getJavaNetInetAddressClass(env);
- //tempMethod =
+ /*tempMethod =
// JCL_CACHE_GET (env,
// MID_java_net_InetAddress_getByAddress_byteArray);
+ */
tempMethod = getJavaNetInetAddressGetByAddressByteArray(env);
return (*env)->CallStaticObjectMethod (env, tempClass, tempMethod,
byte_array);
@@ -947,9 +955,10 @@
}
else
{
- //tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);
+ /*tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);
//tempMethod =
// JCL_CACHE_GET (env, MID_java_net_InetAddress_init_byteArray);
+ */
tempClass = getJavaNetInetAddressClass(env);
tempMethod = getJavaNetInetAddressInitByteArray(env);
return (*env)->NewObject (env, tempClass, tempMethod, byte_array);
@@ -1063,7 +1072,7 @@
if (tempMethodWithScope != NULL)
{
/* create using the scope id */
- //tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);
+ /*tempClass = JCL_CACHE_GET (env, CLS_java_net_InetAddress);*/
tempClass = getJavaNetInetAddressClass(env);
return (*env)->CallStaticObjectMethod (env, tempClass,
tempMethodWithScope, aString,
@@ -1638,7 +1647,7 @@
return (void *) ((*env)->GetLongField (env, fd, descriptorFID));
}
-//Alternative Select function
+/* Alternative Select function */
int
selectRead (JNIEnv * env,hysocket_t hysocketP, I_32 uSecTime, BOOLEAN accept){
PORT_ACCESS_FROM_ENV (env);
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/socket.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/socket.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/socket.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/nio/socket.c Thu Mar 2 08:51:48 2006
@@ -1,4 +1,4 @@
-/* Copyright 1998, 2005 The Apache Software Foundation or its licensors, as applicable
+/* Copyright 1998, 2006 The Apache Software Foundation or its licensors, as applicable
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
#include "nethelp.h"
#include "jclprots.h"
-#include "helpers.h"
#include "jclglob.h"
#include "portsock.h"
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/pool.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/pool.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/pool.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/pool/pool.c Thu Mar 2 08:51:48 2006
@@ -40,11 +40,13 @@
#endif
/**
+ * @section pool_new
+ * @fn pool_new(U_32 structSize, U_32 minNumberElements, U_32 elementAlignment, UDATA poolFlags, void *(VMCALL * memAlloc) (void *, U_32), void (VMCALL * memFree) (void *, void *), void *userData)
* Returns a handle to a variable sized pool of structures.
* This handle should be passed into all other pool functions.
*
* @param[in] structSize Size of the pool-elements
- * @param[in] minNumberElelements If zero, will default to 1
+ * @param[in] minNumberElements If zero, will default to 1
* @param[in] elementAlignment If zero will default to MIN_GRANULARITY
* @param[in] poolFlags
* @param[in] memAlloc Allocate function pointer
@@ -52,7 +54,6 @@
* @param[in] userData
*
* @return pointer to a new pool
- *
*/
HyPool *VMCALL
pool_new (U_32 structSize, U_32 minNumberElements, U_32 elementAlignment,
@@ -82,7 +83,7 @@
finalAllocSize = ROUND_TO (OS_PAGE_SIZE, tempAllocSize);
finalNumberOfElements = minNumberElements;
finalNumberOfElements +=
- (finalAllocSize - tempAllocSize) / roundedStructSize;
+ (U_32)((finalAllocSize - tempAllocSize) / roundedStructSize);
/*
* finalAllocSize is a U_64 so that we can detect pool sizes which overflow 32-bits.
@@ -97,7 +98,7 @@
if (newHandle)
{
memset ((void *) newHandle, 0, (size_t) finalAllocSize);
- newHandle->elementSize = roundedStructSize;
+ newHandle->elementSize = (UDATA)roundedStructSize;
newHandle->alignment = (U_16) elementAlignment; /* we assume no alignment is > 64k */
newHandle->flags = poolFlags | POOL_SORTED; /* list starts sorted */
newHandle->numberOfElements = finalNumberOfElements;
@@ -118,7 +119,7 @@
while (tempNumElems--)
{
oldFreeLocation = (UDATA *) freeLocation;
- freeLocation += roundedStructSize;
+ freeLocation += (UDATA)roundedStructSize;
*oldFreeLocation = freeLocation;
}
*oldFreeLocation = 0; /* end of list */
@@ -127,6 +128,7 @@
}
/**
+ * @fn pool_kill(HyPool * aPool)
* Deallocates all memory associated with a pool.
*
* @param[in] aPool Pool to be deallocated
@@ -148,6 +150,7 @@
}
/**
+ * @fn pool_newElement (HyPool * aPool)
* Asks for the address of a new pool element.
* If it succeeds, the address returned will have space for
* one element of the correct structure size.
@@ -209,6 +212,7 @@
}
/**
+ * @fn pool_removeElement (HyPool * aPool, void *anElement)
* Deallocates an element from a pool
*
* It is safe to call pool_removeElement() while looping over
@@ -221,7 +225,6 @@
* @param[in] anElement Pointer to the element to be removed
*
* @return none
- *
*/
void VMCALL
pool_removeElement (HyPool * aPool, void *anElement)
@@ -307,6 +310,7 @@
}
/**
+ * @fn pool_do (HyPool * aPool, void (*aFunction) (void *anElement, void *userData), void *userData)
* Calls a user provided function for each element in the list.
*
* @param[in] aPool The pool to "do" things to
@@ -334,6 +338,7 @@
}
/**
+ * @fn pool_numElements (HyPool * aPool)
* Returns the number of elements in a given pool.
*
* @param[in] aPool
@@ -356,6 +361,8 @@
}
/**
+ * @section pool_startDo
+ * @fn pool_startDo (HyPool * aPool, pool_state * lastHandle)
* Start of an iteration set that will return when code is to be executed.
* This is based strongly on pool_sortFreeAndIterateUsed.
* Pass in a pointer to an empty pool_state and it will be filled in.
@@ -367,7 +374,6 @@
* @return pointer to element otherwise
*
* @see pool_do, pool_nextDo
- *
*/
void *VMCALL
pool_startDo (HyPool * aPool, pool_state * lastHandle)
@@ -414,6 +420,8 @@
}
/**
+ * @section pool_nextDo
+ * @fn pool_nextDo (pool_state * lastHandle)
* Continue an iteration based on state passed in by lastHandle.
* It is safe to stop an iteration midway through.
*
@@ -460,6 +468,7 @@
}
/**
+ * @fn pool_sortFree (HyPool * aPool)
* Sorts the free list of the current pool.
* (ie: does not follow nextPool pointers...)
* This is a O(n) most of the time.
@@ -467,7 +476,6 @@
* @param[in] aPool The pool to be sorted
*
* @return none
- *
*/
void VMCALL
pool_sortFree (HyPool * aPool)
@@ -525,6 +533,7 @@
}
/**
+ * @fn pool_forPortLib (U_32 structSize, HyPortLibrary * portLibrary)
* Shortcut for @ref pool_new, using the default malloc/free from the portLibrary
*
* @param[in] structSize size of pool-element
@@ -533,7 +542,6 @@
* @return pointer to a Pool
*
* @see pool_new
- *
*/
HyPool *VMCALL
pool_forPortLib (U_32 structSize, HyPortLibrary * portLibrary)
@@ -542,14 +550,15 @@
}
/**
+ * @fn pool_clear (HyPool * aPool)
* Clear the contents of a pool but not delete it
*
- * @note Make no assumptions about the contents of the pool after invoking this method (it currently does not zero the memory)
+ * @note Make no assumptions about the contents of the pool after invoking
+ * this method (it currently does not zero the memory)
*
* @param[in] aPool The pool to clear
*
* @return none
- *
*/
void VMCALL
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hynls.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hynls.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hynls.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hynls.c Thu Mar 2 08:51:48 2006
@@ -493,10 +493,9 @@
/* try the following way to look for the catalog:
* The base name will typically be "<path>/java.properties". Append as many locale descriptors to the file name as possible to find a file.
* e.g.
- * java_en_US_Texas.properties
- * java_en_US.properties
- * java_en.properties
- * java.properties
+ * harmony_en_GB.properties
+ * harmony_en.properties
+ * harmony.properties
*/
for (p = 0; p < (I_32) nls->nPaths; p++)
@@ -1080,7 +1079,6 @@
* @ref hynls_startup should be destroyed here.
*
* @param[in] portLibrary The port library
- *
*/
void VMCALL
hynls_shutdown (struct HyPortLibrary *portLibrary)
@@ -1229,6 +1227,3 @@
#undef CDEV_CURRENT_FUNCTION
-#define CDEV_CURRENT_FUNCTION
-
-#undef CDEV_CURRENT_FUNCTION
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hyportptb.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hyportptb.h?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hyportptb.h (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hyportptb.h Thu Mar 2 08:51:48 2006
@@ -33,7 +33,7 @@
#define HYERROR_DEFAULT_BUFFER_SIZE 256 /**< default customized error message size if we need to create one */
/**
- * @typedef
+ * @typedef struct PortlibPTBuffers_struct
* @brief The per thread buffer
* Storage for data related to the threads state.
*/
@@ -64,7 +64,7 @@
} PortlibPTBuffers_struct;
/**
- * @typedef
+ * @typedef struct PortlibPTBuffers_struct
* @brief The per thread buffer
* Storage for data related to the threads state.
*/
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hystr.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hystr.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hystr.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/port/hystr.c Thu Mar 2 08:51:48 2006
@@ -532,7 +532,7 @@
index =
writeStringToBuffer (result, length, width, precision, " ",
spec->tag);
- if (index <= length)
+ if (index <= (I_32)length)
{
if (result)
{
@@ -587,12 +587,12 @@
writeIntToBuffer (char *buf, U_32 bufLen, U_64 width, U_64 precision,
U_64 value, U_8 tag, int isSigned, const char *digits)
{
- I_32 index = 0;
- I_32 length = 0;
+ U_32 index = 0;
+ U_32 length = 0;
I_32 rightSpace = 0;
U_64 temp;
int base = strlen (digits);
- I_32 actualPrecision = 0;
+ U_32 actualPrecision = 0;
char signChar = 0;
if (isSigned)
@@ -964,6 +964,7 @@
void VMCALL
hystr_shutdown (struct HyPortLibrary *portLibrary)
{
+ /* empty */
}
/**
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
#
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ca.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ca.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ca.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ca.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_cs.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_cs.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_cs.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_cs.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_de.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_de.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_de.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_de.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_es.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_es.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_es.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_es.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_fr.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_fr.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_fr.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_fr.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_hu.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_hu.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_hu.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_hu.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_it.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_it.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_it.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_it.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ja.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ja.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ja.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ja.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ko.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ko.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ko.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ko.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_pl.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_pl.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_pl.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_pl.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_pt_BR.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_pt_BR.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_pt_BR.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_pt_BR.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ru.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ru.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ru.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_ru.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_sk.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_sk.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_sk.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_sk.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_sl.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_sl.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_sl.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_sl.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_tr.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_tr.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_tr.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_tr.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh_CN.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh_CN.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh_CN.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh_CN.nls Thu Mar 2 08:51:48 2006
@@ -1,4 +1,19 @@
-# This file was automatically reverse engineered from hyzip.nls and java_zh_CN.properties
+#
+# Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
HYNLS.MODULE=ZIPS
HYNLS.HEADER=hyzipnls.h
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh_TW.nls
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh_TW.nls?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh_TW.nls (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/zip/hyzip_zh_TW.nls Thu Mar 2 08:51:48 2006
@@ -1,3 +1,18 @@
+#
+# # Copyright 2005 The Apache Software Foundation or its licensors, as applicable
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
# Externalised messages for the VM components of the JCL module.
# New messages MUST be added at the end of this file.
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/deflater.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/deflater.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/deflater.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/deflater.c Thu Mar 2 08:51:48 2006
@@ -32,7 +32,7 @@
PORT_ACCESS_FROM_ENV (env);
int err = 0;
char *dBytes;
- JCLZipStream *stream = (JCLZipStream *) handle;
+ JCLZipStream *stream = (JCLZipStream *) ((IDATA) handle);
dBytes = jclmem_allocate_memory (env, len);
if (dBytes == NULL)
@@ -57,7 +57,7 @@
{
JCLZipStream *stream;
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
return stream->stream->total_in;
}
@@ -67,7 +67,7 @@
{
JCLZipStream *stream;
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
return stream->stream->total_out;
}
@@ -77,7 +77,7 @@
{
JCLZipStream *stream;
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
return stream->stream->adler;
}
@@ -131,7 +131,7 @@
return -1;
}
- return (jlong) jstream;
+ return (jlong) ((IDATA) jstream);
}
void JNICALL
@@ -144,7 +144,7 @@
jbyte *in;
JCLZipStream *stream;
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
if (stream->inaddr != NULL) /*Input has already been provided, free the old buffer */
jclmem_free_memory (env, stream->inaddr);
stream->inaddr = jclmem_allocate_memory (env, len);
@@ -182,7 +182,7 @@
GetIntField (env, recv,
JCL_CACHE_GET (env, FID_java_util_zip_Deflater_inRead)));
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
stream->stream->avail_out = len;
sin = stream->stream->total_in;
sout = stream->stream->total_out;
@@ -222,7 +222,7 @@
PORT_ACCESS_FROM_ENV (env);
JCLZipStream *stream;
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
deflateEnd (stream->stream);
if (stream->inaddr != NULL)
@@ -239,7 +239,7 @@
{
JCLZipStream *stream;
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
deflateReset (stream->stream);
}
@@ -259,7 +259,7 @@
throwNewIllegalStateException (env, "");
return;
}
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
stream->stream->next_out = (Bytef *) & b;
err = deflateParams (stream->stream, level, strategy);
if (err != Z_OK)
Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/inflater.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/inflater.c?rev=382442&r1=382441&r2=382442&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/inflater.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/archive/inflater.c Thu Mar 2 08:51:48 2006
@@ -70,7 +70,7 @@
return -1;
}
- return (jlong) jstream;
+ return (jlong) ((IDATA) jstream);
}
void JNICALL
@@ -82,9 +82,7 @@
jbyte *in;
U_8 *baseAddr;
- JCLZipStream *stream;
-
- stream = (JCLZipStream *) handle;
+ JCLZipStream *stream = (JCLZipStream *) ((IDATA) handle);
if (stream->inaddr != NULL) /*Input has already been provided, free the old buffer */
jclmem_free_memory (env, stream->inaddr);
@@ -113,7 +111,7 @@
PORT_ACCESS_FROM_ENV (env);
jbyte *out;
- JCLZipStream *stream;
+ JCLZipStream *stream = (JCLZipStream *) ((IDATA) handle);
jint err = 0;
jfieldID fid = 0, fid2 = 0;
jint sin, sout, inBytes = 0;
@@ -122,7 +120,6 @@
fid = JCL_CACHE_GET (env, FID_java_util_zip_Inflater_inRead);
inBytes = ((*env)->GetIntField (env, recv, fid));
- stream = (JCLZipStream *) handle;
stream->stream->avail_out = len;
sin = stream->stream->total_in;
sout = stream->stream->total_out;
@@ -154,8 +151,9 @@
}
}
- /* Need to update the number of input bytes read. Is there a better way(Maybe global the fid then delete when end
- is called)? */
+ /* Need to update the number of input bytes read. Is there a better way
+ * (Maybe global the fid then delete when end is called)?
+ */
((*env)->
SetIntField (env, recv, fid,
(jint) stream->stream->total_in - sin + inBytes));
@@ -169,7 +167,7 @@
{
JCLZipStream *stream;
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
return stream->stream->adler;
}
@@ -180,7 +178,7 @@
PORT_ACCESS_FROM_ENV (env);
JCLZipStream *stream;
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
inflateEnd (stream->stream);
if (stream->inaddr != NULL) /*Input has been provided, free the buffer */
jclmem_free_memory (env, stream->inaddr);
@@ -198,7 +196,7 @@
PORT_ACCESS_FROM_ENV (env);
int err = 0;
U_8 *dBytes;
- JCLZipStream *stream = (JCLZipStream *) handle;
+ JCLZipStream *stream = (JCLZipStream *) ((IDATA) handle);
dBytes = jclmem_allocate_memory (env, len);
if (dBytes == NULL)
@@ -223,7 +221,7 @@
{
JCLZipStream *stream;
int err = 0;
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
err = inflateReset (stream->stream);
if (err != Z_OK)
@@ -253,7 +251,7 @@
{
JCLZipStream *stream;
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
return stream->stream->total_out;
}
@@ -263,7 +261,7 @@
{
JCLZipStream *stream;
- stream = (JCLZipStream *) handle;
+ stream = (JCLZipStream *) ((IDATA) handle);
return stream->stream->total_in;
}