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 2007/10/10 13:36:58 UTC
svn commit: r583437 - in /harmony/enhanced/classlib/trunk/modules:
luni/src/main/native/include/shared/iohelp.h
luni/src/main/native/include/unix/jclprots.h
luni/src/main/native/include/windows/jclprots.h
portlib/src/main/native/common/shared/iohelp.c
Author: hindessm
Date: Wed Oct 10 04:36:58 2007
New Revision: 583437
URL: http://svn.apache.org/viewvc?rev=583437&view=rev
Log:
Removing unused code.
Modified:
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h
harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/shared/iohelp.c
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h?rev=583437&r1=583436&r2=583437&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/shared/iohelp.h Wed Oct 10 04:36:58 2007
@@ -26,7 +26,6 @@
void *getJavaIoFileDescriptorContentsAsPointer (JNIEnv * env, jobject fd);
jint ioh_readcharImpl (JNIEnv * env, jobject recv, IDATA descriptor);
void ioh_convertToPlatform (char *path);
-jint new_ioh_available (JNIEnv * env, jobject recv, jfieldID fdFID);
void setJavaIoFileDescriptorContentsAsPointer (JNIEnv * env, jobject fd,
void *value);
void ioh_writebytesImpl (JNIEnv * env, jobject recv, jbyteArray buffer,
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h?rev=583437&r1=583436&r2=583437&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/unix/jclprots.h Wed Oct 10 04:36:58 2007
@@ -315,7 +315,6 @@
void throwJavaIoIOException PROTOTYPE((JNIEnv* env, const char* message));
void throwJavaIoIOExceptionClosed PROTOTYPE((JNIEnv* env));
void ioh_convertToPlatform PROTOTYPE((char *path));
-jint new_ioh_available PROTOTYPE((JNIEnv * env, jobject recv, jfieldID fdFID));
void throwNPException PROTOTYPE((JNIEnv* env, const char* message));
void setJavaIoFileDescriptorContentsAsPointer PROTOTYPE((JNIEnv * env, jobject fd, void *value));
void ioh_writebytesImpl PROTOTYPE((JNIEnv * env, jobject recv, jbyteArray buffer, jint offset, jint count, IDATA descriptor));
Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h?rev=583437&r1=583436&r2=583437&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/windows/jclprots.h Wed Oct 10 04:36:58 2007
@@ -562,8 +562,6 @@
void throwJavaIoIOException PROTOTYPE ((JNIEnv* env, const char* message));
void throwJavaIoIOExceptionClosed PROTOTYPE ((JNIEnv* env));
void ioh_convertToPlatform PROTOTYPE ((char *path));
- jint new_ioh_available
- PROTOTYPE ((JNIEnv * env, jobject recv, jfieldID fdFID));
void throwNPException PROTOTYPE ((JNIEnv* env, const char* message));
void setJavaIoFileDescriptorContentsAsPointer
PROTOTYPE ((JNIEnv * env, jobject fd, void *value));
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/shared/iohelp.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/shared/iohelp.c?rev=583437&r1=583436&r2=583437&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/shared/iohelp.c (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/common/shared/iohelp.c Wed Oct 10 04:36:58 2007
@@ -291,40 +291,6 @@
}
/**
- * This will return the number of chars left in the file
- */
-jint
-new_ioh_available (JNIEnv * env, jobject recv, jfieldID fdFID)
-{
- jobject fd;
- I_64 currentPosition, endOfFile;
- IDATA descriptor;
- PORT_ACCESS_FROM_ENV (env);
-
- /* fetch the fd field from the object */
- fd = (*env)->GetObjectField (env, recv, fdFID);
-
- /* dereference the C pointer from the wrapper object */
- descriptor = (IDATA) getJavaIoFileDescriptorContentsAsPointer (env, fd);
- if (descriptor == -1)
- {
- throwJavaIoIOExceptionClosed (env);
- return -1;
- }
- /**
- * If the descriptor represents StdIn, call the hytty port library.
- */
- if (descriptor == 0)
- {
- return hytty_available ();
- }
- currentPosition = hyfile_seek (descriptor, 0, HySeekCur);
- endOfFile = hyfile_seek (descriptor, 0, HySeekEnd);
- hyfile_seek (descriptor, currentPosition, HySeekSet);
- return (jint) (endOfFile - currentPosition);
-}
-
-/**
* This will close a file descriptor
*/
void