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 16:30:25 UTC
svn commit: r583488 - 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 07:30:24 2007
New Revision: 583488
URL: http://svn.apache.org/viewvc?rev=583488&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=583488&r1=583487&r2=583488&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 07:30:24 2007
@@ -24,14 +24,12 @@
/* DIR_SEPARATOR is defined in hycomp.h */
#define jclSeparator DIR_SEPARATOR
void *getJavaIoFileDescriptorContentsAsPointer (JNIEnv * env, jobject fd);
-jint ioh_readcharImpl (JNIEnv * env, jobject recv, IDATA descriptor);
void ioh_convertToPlatform (char *path);
void setJavaIoFileDescriptorContentsAsPointer (JNIEnv * env, jobject fd,
void *value);
void ioh_writebytesImpl (JNIEnv * env, jobject recv, jbyteArray buffer,
jint offset, jint count, IDATA descriptor);
char *ioLookupErrorString (JNIEnv * env, I_32 anErrorNum);
-void ioh_writecharImpl (JNIEnv * env, jobject recv, jint c, IDATA descriptor);
jint ioh_readbytesImpl (JNIEnv * env, jobject recv, jbyteArray buffer,
jint offset, jint count, IDATA descriptor);
void new_ioh_close (JNIEnv * env, jobject recv, jfieldID fdFID);
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=583488&r1=583487&r2=583488&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 07:30:24 2007
@@ -311,7 +311,6 @@
void throwNewExceptionByName PROTOTYPE((JNIEnv* env,
const char* name, const char* message));
void throwNewOutOfMemoryError PROTOTYPE((JNIEnv* env, const char* message));
-jint ioh_readcharImpl PROTOTYPE((JNIEnv * env, jobject recv, IDATA descriptor));
void throwJavaIoIOException PROTOTYPE((JNIEnv* env, const char* message));
void throwJavaIoIOExceptionClosed PROTOTYPE((JNIEnv* env));
void ioh_convertToPlatform PROTOTYPE((char *path));
@@ -319,7 +318,6 @@
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));
char* ioLookupErrorString PROTOTYPE((JNIEnv* env, I_32 anErrorNum));
-void ioh_writecharImpl PROTOTYPE((JNIEnv *env, jobject recv, jint c, IDATA descriptor));
jint ioh_readbytesImpl PROTOTYPE((JNIEnv * env, jobject recv, jbyteArray buffer, jint offset, jint count, IDATA descriptor));
void new_ioh_close PROTOTYPE((JNIEnv * env, jobject recv, jfieldID fdFID));
void throwIndexOutOfBoundsException PROTOTYPE((JNIEnv* env));
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=583488&r1=583487&r2=583488&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 07:30:24 2007
@@ -557,8 +557,6 @@
const char* name,
const char* message));
void throwNewOutOfMemoryError PROTOTYPE ((JNIEnv* env, const char* message));
- jint ioh_readcharImpl
- PROTOTYPE ((JNIEnv * env, jobject recv, IDATA descriptor));
void throwJavaIoIOException PROTOTYPE ((JNIEnv* env, const char* message));
void throwJavaIoIOExceptionClosed PROTOTYPE ((JNIEnv* env));
void ioh_convertToPlatform PROTOTYPE ((char *path));
@@ -569,8 +567,6 @@
PROTOTYPE ((JNIEnv * env, jobject recv, jbyteArray buffer, jint offset,
jint count, IDATA descriptor));
char *ioLookupErrorString PROTOTYPE ((JNIEnv * env, I_32 anErrorNum));
- void ioh_writecharImpl
- PROTOTYPE ((JNIEnv * env, jobject recv, jint c, IDATA descriptor));
jint ioh_readbytesImpl
PROTOTYPE ((JNIEnv * env, jobject recv, jbyteArray buffer, jint offset,
jint count, IDATA descriptor));
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=583488&r1=583487&r2=583488&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 07:30:24 2007
@@ -155,61 +155,6 @@
}
/**
- * This will write one byte
- */
-void
-ioh_writecharImpl (JNIEnv * env, jobject recv, jint c, IDATA descriptor)
-{
- I_32 result = 0;
- char buf[1];
- PORT_ACCESS_FROM_ENV (env);
-
- if (descriptor == -1)
- {
- throwJavaIoIOExceptionClosed (env);
- return;
- }
-
- buf[0] = (char) c;
-
- result = hyfile_write (descriptor, buf, 1);
-
- if (result < 0)
- throwJavaIoIOException (env, ioLookupErrorString (env, result));
-}
-
-/**
- * This will read a single character from the descriptor
- */
-jint
-ioh_readcharImpl (JNIEnv * env, jobject recv, IDATA descriptor)
-{
- I_32 result;
- char buf[1];
- PORT_ACCESS_FROM_ENV (env);
-
- if (descriptor == -1)
- {
- throwJavaIoIOExceptionClosed (env);
- return 0;
- }
-
- if (descriptor == 0)
- {
- result = hytty_get_chars (buf, 1);
- }
- else
- {
- result = hyfile_read (descriptor, buf, 1);
- }
-
- if (result <= 0)
- return -1;
-
- return (jint) buf[0] & 0xFF;
-}
-
-/**
* This will read a up to count bytes into buffer starting at offset
*/
jint