* src/native/vm/cldc1.1/com_sun_cldc_io_ResourceInputStream.c

[cacao.git] / src / native / vm / cldc1.1 / com_sun_cldc_io_j2me_socket_Protocol.c

diff --git a/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.c b/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.c
index 14fe27f2dd068b81d5634bfdb5e06f9ab0829117..0e6ea1dd15016bf687ff5ad4c26a600b1c2eb510 100644 (file)
--- a/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.c
+++ b/src/native/vm/cldc1.1/com_sun_cldc_io_j2me_socket_Protocol.c
@@ -40,6 +40,7 @@
 #include "mm/memory.h"
 
 #include "native/jni.h"
+#include "native/llni.h"
 #include "native/native.h"
 
 #include "native/include/com_sun_cldc_io_j2me_socket_Protocol.h"
@@ -82,7 +83,7 @@ void _Jv_com_sun_cldc_io_j2me_socket_Protocol_init(void)
  * Method:    open0
  * Signature: ([BII)I
  */
-JNIEXPORT s4 JNICALL Java_com_sun_cldc_io_j2me_socket_Protocol_open0(JNIEnv *env, jclass clazz, java_bytearray *hostname, s4 port, s4 mode)
+JNIEXPORT s4 JNICALL Java_com_sun_cldc_io_j2me_socket_Protocol_open0(JNIEnv *env, jclass clazz, java_handle_bytearray_t *hostname, s4 port, s4 mode)
 {
        struct hostent *phostent;
     struct sockaddr_in serv_addr;
@@ -92,7 +93,7 @@ JNIEXPORT s4 JNICALL Java_com_sun_cldc_io_j2me_socket_Protocol_open0(JNIEnv *env
 
        /* The hostname byte-array is a NULL terminated C-string. */
 
-       name = (char *) &(hostname->data);
+       name = (char *) &(LLNI_array_data(hostname));
 
        /* get the host */
 
@@ -131,14 +132,14 @@ JNIEXPORT s4 JNICALL Java_com_sun_cldc_io_j2me_socket_Protocol_open0(JNIEnv *env
  * Method:    readBuf
  * Signature: (I[BII)I
  */
-JNIEXPORT s4 JNICALL Java_com_sun_cldc_io_j2me_socket_Protocol_readBuf(JNIEnv *env, jclass clazz, s4 handle, java_bytearray *b, s4 off, s4 len)
+JNIEXPORT s4 JNICALL Java_com_sun_cldc_io_j2me_socket_Protocol_readBuf(JNIEnv *env, jclass clazz, s4 handle, java_handle_bytearray_t *b, s4 off, s4 len)
 {
        void    *buf;
        ssize_t  result;
 
        /* get pointer to the buffer */
 
-       buf = &(b->data[off]);
+       buf = &(LLNI_array_direct(b, off));
 
        /* receive from the socket */
 
@@ -191,14 +192,14 @@ JNIEXPORT s4 JNICALL Java_com_sun_cldc_io_j2me_socket_Protocol_readByte(JNIEnv *
  * Method:    writeBuf
  * Signature: (I[BII)I
  */
-JNIEXPORT s4 JNICALL Java_com_sun_cldc_io_j2me_socket_Protocol_writeBuf(JNIEnv *env, jclass clazz, s4 handle, java_bytearray* b, s4 off, s4 len) {
+JNIEXPORT s4 JNICALL Java_com_sun_cldc_io_j2me_socket_Protocol_writeBuf(JNIEnv *env, jclass clazz, s4 handle, java_handle_bytearray_t * b, s4 off, s4 len) {
 
        void    *buf;
        ssize_t  result;
 
        /* get pointer to the buffer */
 
-       buf = &(b->data[off]);
+       buf = &(LLNI_array_direct(b, off));
        
        /* send the given byte to the socket */