Attachment 106821 Details for Bug 147512 – patch-SerialImp.c

patch-SerialImp.c

patch-SerialImp.c (text/x-csrc; charset=us-ascii), 1.67 KB, created by Oliver Adler on 2010-06-21 12:17:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Adler

Created: 2010-06-21 12:17:00 UTC

Size: 1.67 KB

patch

obsolete

>--- /usr/ports/comms/rxtx.orig/work/rxtx-2.1-7r2/src/SerialImp.c	2006-01-29 23:19:04.000000000 +0100
>+++ /usr/ports/comms/rxtx/work/rxtx-2.1-7r2/src/SerialImp.c	2010-06-18 10:23:54.000000000 +0200
>@@ -2906,6 +2906,40 @@
> #endif /* !WIN32 */
> 
> /*----------------------------------------------------------
>+get_java_eis
>+
>+   accept:      env (keyhole to java)
>+                jobj (java RXTXPort object)
>+   return:      a pointer to the eis structure
>+   exceptions:  none
>+   comments:
>+----------------------------------------------------------*/
>+struct event_info_struct* get_java_eis( JNIEnv *env, jobject jobj, char *id, char *type )
>+{
>+	struct event_info_struct * result = 0;
>+	jclass jclazz = (*env)->GetObjectClass( env, jobj );
>+	jfieldID jfd = (*env)->GetFieldID( env, jclazz, id, type );
>+
>+/*
>+	ENTER( "get_java_eis" );
>+*/
>+	if( !jfd ) {
>+		(*env)->ExceptionDescribe( env );
>+		(*env)->ExceptionClear( env );
>+		(*env)->DeleteLocalRef( env, jclazz );
>+		LEAVE( "get_java_eis" );
>+		return result;
>+	}
>+	result = (struct event_info_struct*)((*env)->GetObjectField( env, jobj, jfd ));
>+/* ct7 & gel * Added DeleteLocalRef */
>+	(*env)->DeleteLocalRef( env, jclazz );
>+/*
>+	LEAVE( "get_java_eis" );
>+*/
>+	return result;
>+}
>+
>+/*----------------------------------------------------------
> read_byte_array
> 
>    accept:      int                fd   file descriptor to read from
>@@ -2938,8 +2972,8 @@
> 	fd_set rset;
> 	/* TRENT */
> 	int flag, count = 0;
>-	struct event_info_struct *eis = ( struct event_info_struct * )
>-		get_java_var( env, *jobj,"eis","J" );
>+
>+	struct event_info_struct *eis = get_java_eis( env, *jobj,"eis","J" );
> 	
> 	report_time_start();
> 	flag = eis->eventflags[SPE_DATA_AVAILABLE];

Actions: View

Attachments on bug 147512: 106821