You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2008/02/07 22:33:14 UTC
svn commit: r619649 -
/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c
Author: hindessm
Date: Thu Feb 7 13:33:01 2008
New Revision: 619649
URL: http://svn.apache.org/viewvc?rev=619649&view=rev
Log:
Fixing compiler warnings.
Modified:
harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c
Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c?rev=619649&r1=619648&r2=619649&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c (original)
+++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c Thu Feb 7 13:33:01 2008
@@ -93,7 +93,7 @@
length = (*env)->GetArrayLength (env, zipName);
length = length < HyMaxPath - 1 ? length : HyMaxPath - 1;
- ((*env)->GetByteArrayRegion (env, zipName, 0, length, pathCopy));
+ ((*env)->GetByteArrayRegion (env, zipName, 0, length, (jbyte*)pathCopy));
pathCopy[length++] = '\0';
ioh_convertToPlatform (pathCopy);
@@ -145,7 +145,6 @@
#ifdef HY_ZIP_API
VMI_ACCESS_FROM_ENV(env);
#endif /* HY_ZIP_API */
- PORT_ACCESS_FROM_ENV (env);
I_32 retval;
I_32 extraval;
@@ -230,7 +229,7 @@
}
((*env)->
SetByteArrayRegion (env, extra, 0, zipEntry.extraFieldLength,
- zipEntry.extraField));
+ (jbyte*)zipEntry.extraField));
}
entryClass = JCL_CACHE_GET (env, CLS_java_util_zip_ZipEntry);
@@ -375,7 +374,6 @@
Java_java_util_zip_ZipFile_00024ZFEnum_resetZip (JNIEnv * env, jobject recv,
jlong descriptor)
{
- PORT_ACCESS_FROM_ENV (env);
#ifdef HY_ZIP_API
VMI_ACCESS_FROM_ENV(env);
#endif /* HY_ZIP_API */
@@ -462,7 +460,7 @@
}
/* Build a new ZipEntry from the C struct */
- entryName = ((*env)->NewStringUTF (env, zipEntry.filename));
+ entryName = ((*env)->NewStringUTF (env, (const char*)zipEntry.filename));
if (((*env)->ExceptionCheck (env)))
return NULL;
@@ -499,13 +497,13 @@
#ifndef HY_ZIP_API
zip_freeZipEntry (PORTLIB, &zipEntry);
#else /* HY_ZIP_API */
- zipFuncs->zip_freeZipEntry (VMI, &zipEntry); //not valid zipEntry (-1)
+ zipFuncs->zip_freeZipEntry (VMI, &zipEntry); /* not valid zipEntry (-1) */
#endif /* HY_ZIP_API */
return NULL;
}
((*env)->
SetByteArrayRegion (env, extra, 0, zipEntry.extraFieldLength,
- zipEntry.extraField));
+ (jbyte*)zipEntry.extraField));
jclmem_free_memory (env, zipEntry.extraField);
zipEntry.extraField = NULL;
}
@@ -538,7 +536,6 @@
jlong descriptor,
jstring entryName)
{
- PORT_ACCESS_FROM_ENV (env);
#ifdef HY_ZIP_API
VMI_ACCESS_FROM_ENV(env);
#endif /* HY_ZIP_API */
@@ -609,7 +606,7 @@
zipEntry.uncompressedSize);
if (retval == 0)
(*env)->SetByteArrayRegion (env, buf, 0, zipEntry.uncompressedSize,
- zipEntry.data);
+ (jbyte*)zipEntry.data);
#ifndef HY_ZIP_API
zip_freeZipEntry (privatePortLibrary, &zipEntry);
#else /* HY_ZIP_API */
Re: svn commit: r619649 - /harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c
Posted by Mark Hindess <ma...@googlemail.com>.
On 8 February 2008 at 10:17, "Stepan Mishura" <st...@gmail.com> wrote:
> On 2/8/08, Ilya Berezhniuk <il...@gmail.com> wrote:
> > Hi Mark,
> >
> > I failed to build classlib after r619649 commit. Could you please take a lo
> ok?
> >
> > As I can see, PORT_ACCESS_FROM_ENV() macro cannot be removed because
> > it declares "HyPortLibrary *privatePortLibrary" variable used trough
> > PORTLIB macro.
>
> I've restored the macro at r619649.
Sorry, it built for me because I'm using hy.zip.api=true. I'll test
both cases next time (and I'll probably ifdef the macro's for the
appropriate mode).
Thanks Stepan.
-Mark.
Re: svn commit: r619649 - /harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c
Posted by Stepan Mishura <st...@gmail.com>.
On 2/8/08, Ilya Berezhniuk <il...@gmail.com> wrote:
> Hi Mark,
>
> I failed to build classlib after r619649 commit. Could you please take a look?
>
> As I can see, PORT_ACCESS_FROM_ENV() macro cannot be removed because
> it declares "HyPortLibrary *privatePortLibrary" variable used trough
> PORTLIB macro.
I've restored the macro at r619649.
-Stepan
Re: svn commit: r619649 - /harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c
Posted by Ilya Berezhniuk <il...@gmail.com>.
Hi Mark,
I failed to build classlib after r619649 commit. Could you please take a look?
As I can see, PORT_ACCESS_FROM_ENV() macro cannot be removed because
it declares "HyPortLibrary *privatePortLibrary" variable used trough
PORTLIB macro.
Thanks,
Ilya.
2008/2/8, hindessm@apache.org <hi...@apache.org>:
> Author: hindessm
> Date: Thu Feb 7 13:33:01 2008
> New Revision: 619649
>
> URL: http://svn.apache.org/viewvc?rev=619649&view=rev
> Log:
> Fixing compiler warnings.
>
> Modified:
> harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c
>
> Modified: harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c
> URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c?rev=619649&r1=619648&r2=619649&view=diff
> ==============================================================================
> --- harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c (original)
> +++ harmony/enhanced/classlib/trunk/modules/archive/src/main/native/archive/shared/zip.c Thu Feb 7 13:33:01 2008
> @@ -93,7 +93,7 @@
>
> length = (*env)->GetArrayLength (env, zipName);
> length = length < HyMaxPath - 1 ? length : HyMaxPath - 1;
> - ((*env)->GetByteArrayRegion (env, zipName, 0, length, pathCopy));
> + ((*env)->GetByteArrayRegion (env, zipName, 0, length, (jbyte*)pathCopy));
> pathCopy[length++] = '\0';
> ioh_convertToPlatform (pathCopy);
>
> @@ -145,7 +145,6 @@
> #ifdef HY_ZIP_API
> VMI_ACCESS_FROM_ENV(env);
> #endif /* HY_ZIP_API */
> - PORT_ACCESS_FROM_ENV (env);
>
> I_32 retval;
> I_32 extraval;
> @@ -230,7 +229,7 @@
> }
> ((*env)->
> SetByteArrayRegion (env, extra, 0, zipEntry.extraFieldLength,
> - zipEntry.extraField));
> + (jbyte*)zipEntry.extraField));
> }
>
> entryClass = JCL_CACHE_GET (env, CLS_java_util_zip_ZipEntry);
> @@ -375,7 +374,6 @@
> Java_java_util_zip_ZipFile_00024ZFEnum_resetZip (JNIEnv * env, jobject recv,
> jlong descriptor)
> {
> - PORT_ACCESS_FROM_ENV (env);
> #ifdef HY_ZIP_API
> VMI_ACCESS_FROM_ENV(env);
> #endif /* HY_ZIP_API */
> @@ -462,7 +460,7 @@
> }
>
> /* Build a new ZipEntry from the C struct */
> - entryName = ((*env)->NewStringUTF (env, zipEntry.filename));
> + entryName = ((*env)->NewStringUTF (env, (const char*)zipEntry.filename));
>
> if (((*env)->ExceptionCheck (env)))
> return NULL;
> @@ -499,13 +497,13 @@
> #ifndef HY_ZIP_API
> zip_freeZipEntry (PORTLIB, &zipEntry);
> #else /* HY_ZIP_API */
> - zipFuncs->zip_freeZipEntry (VMI, &zipEntry); //not valid zipEntry (-1)
> + zipFuncs->zip_freeZipEntry (VMI, &zipEntry); /* not valid zipEntry (-1) */
> #endif /* HY_ZIP_API */
> return NULL;
> }
> ((*env)->
> SetByteArrayRegion (env, extra, 0, zipEntry.extraFieldLength,
> - zipEntry.extraField));
> + (jbyte*)zipEntry.extraField));
> jclmem_free_memory (env, zipEntry.extraField);
> zipEntry.extraField = NULL;
> }
> @@ -538,7 +536,6 @@
> jlong descriptor,
> jstring entryName)
> {
> - PORT_ACCESS_FROM_ENV (env);
> #ifdef HY_ZIP_API
> VMI_ACCESS_FROM_ENV(env);
> #endif /* HY_ZIP_API */
> @@ -609,7 +606,7 @@
> zipEntry.uncompressedSize);
> if (retval == 0)
> (*env)->SetByteArrayRegion (env, buf, 0, zipEntry.uncompressedSize,
> - zipEntry.data);
> + (jbyte*)zipEntry.data);
> #ifndef HY_ZIP_API
> zip_freeZipEntry (privatePortLibrary, &zipEntry);
> #else /* HY_ZIP_API */
>
>
>