Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2786] trunk/LWJGL/src/native/common
|
From: <ma...@us...> - 2007-04-19 22:39:10
|
Revision: 2786
http://svn.sourceforge.net/java-game-lib/?rev=2786&view=rev
Author: matzon
Date: 2007-04-19 15:39:08 -0700 (Thu, 19 Apr 2007)
Log Message:
-----------
using NewStringNativeWithLength
Modified Paths:
--------------
trunk/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c
trunk/LWJGL/src/native/common/devil/org_lwjgl_devil_ILU.c
trunk/LWJGL/src/native/common/devil/org_lwjgl_devil_ILUT.c
trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c
trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMusic.c
trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c
Modified: trunk/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c
===================================================================
--- trunk/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c 2007-04-19 22:26:19 UTC (rev 2785)
+++ trunk/LWJGL/src/native/common/devil/org_lwjgl_devil_IL.c 2007-04-19 22:39:08 UTC (rev 2786)
@@ -517,7 +517,8 @@
* Signature: (I)Ljava/lang/String;
*/
static jstring JNICALL Java_org_lwjgl_devil_IL_ilGetString(JNIEnv *env, jclass clazz, jint stringName) {
- return NewStringNative(env, ilGetString((ILenum)stringName));
+ char * name = ilGetString((ILenum)stringName);
+ return NewStringNativeWithLength(env, name, strlen(name));
}
/*
Modified: trunk/LWJGL/src/native/common/devil/org_lwjgl_devil_ILU.c
===================================================================
--- trunk/LWJGL/src/native/common/devil/org_lwjgl_devil_ILU.c 2007-04-19 22:26:19 UTC (rev 2785)
+++ trunk/LWJGL/src/native/common/devil/org_lwjgl_devil_ILU.c 2007-04-19 22:39:08 UTC (rev 2786)
@@ -245,7 +245,8 @@
* Signature: (I)Ljava/lang/String;
*/
static jstring JNICALL Java_org_lwjgl_devil_ILU_iluErrorString(JNIEnv *env, jclass clazz, jint error) {
- return NewStringNative(env, iluErrorString((ILenum)error));
+ char * errorstring = iluErrorString((ILenum)error);
+ return NewStringNativeWithLength(env, errorstring, strlen(errorstring));
}
/*
@@ -366,7 +367,8 @@
* Signature: (I)Ljava/lang/String;
*/
static jstring JNICALL Java_org_lwjgl_devil_ILU_iluGetString(JNIEnv *env, jclass clazz, jint stringName) {
- return NewStringNative(env, iluGetString((ILenum)stringName));
+ char * name = iluGetString((ILenum)stringName);
+ return NewStringNativeWithLength(env, name, strlen(name));
}
/*
Modified: trunk/LWJGL/src/native/common/devil/org_lwjgl_devil_ILUT.c
===================================================================
--- trunk/LWJGL/src/native/common/devil/org_lwjgl_devil_ILUT.c 2007-04-19 22:26:19 UTC (rev 2785)
+++ trunk/LWJGL/src/native/common/devil/org_lwjgl_devil_ILUT.c 2007-04-19 22:39:08 UTC (rev 2786)
@@ -120,7 +120,8 @@
* Signature: (I)Ljava/lang/String;
*/
static jstring JNICALL Java_org_lwjgl_devil_ILUT_ilutGetString(JNIEnv *env, jclass clazz, jint stringName){
- return NewStringNative(env, ilutGetString((ILenum)stringName));
+ char * name = ilutGetString((ILenum)stringName);
+ return NewStringNativeWithLength(env, name, strlen(name));
}
/*
Modified: trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c 2007-04-19 22:26:19 UTC (rev 2785)
+++ trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c 2007-04-19 22:39:08 UTC (rev 2786)
@@ -82,5 +82,6 @@
* Signature: (I)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMOD_FMOD_1ErrorString(JNIEnv *env, jclass clazz, jint errorcode) {
- return NewStringNative(env, FMOD_ErrorString(errorcode));
+ char * error = FMOD_ErrorString(errorcode);
+ return NewStringNativeWithLength(env, error, strlen(error));
}
Modified: trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMusic.c
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMusic.c 2007-04-19 22:26:19 UTC (rev 2785)
+++ trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMusic.c 2007-04-19 22:39:08 UTC (rev 2786)
@@ -281,7 +281,7 @@
JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1GetName
(JNIEnv *env, jclass clazz, jlong module) {
const char * name = fmod_instance->FMUSIC_GetName((FMUSIC_MODULE *) module);
- return NewStringNative(env, name);
+ return NewStringNativeWithLength(env, name, strlen(name));
}
/*
Modified: trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c 2007-04-19 22:26:19 UTC (rev 2785)
+++ trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c 2007-04-19 22:39:08 UTC (rev 2786)
@@ -230,7 +230,8 @@
* Signature: (I)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1GetDriverName(JNIEnv * env, jclass clazz, jint id) {
- return NewStringNative(env, (const char *) fmod_instance->FSOUND_GetDriverName(id));
+ char * driver = fmod_instance->FSOUND_GetDriverName(id);
+ return NewStringNativeWithLength(env, driver, strlen(driver));
}
/*
@@ -430,7 +431,8 @@
* Signature: (J)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Sample_1GetName(JNIEnv * env, jclass clazz, jlong sptr) {
- return NewStringNative(env, fmod_instance->FSOUND_Sample_GetName((FSOUND_SAMPLE *) sptr));
+ char * name = fmod_instance->FSOUND_Sample_GetName((FSOUND_SAMPLE *) sptr);
+ return NewStringNativeWithLength(env, name, strlen(name));
}
/*
@@ -1203,7 +1205,7 @@
unsigned int * nPcmOffset = pcmOffsetPosition + (unsigned int *) (*env)->GetDirectBufferAddress(env, pcmOffset);
char * result = fmod_instance->FSOUND_Stream_GetSyncPointInfo(nPoint, nPcmOffset);
if(result != NULL) {
- return NewStringNative(env, result);
+ return NewStringNativeWithLength(env, result, strlen(result));
}
return NULL;
}
@@ -1221,7 +1223,7 @@
if(fmod_instance->FSOUND_Stream_GetTagField((FSOUND_STREAM*) stream, num, &type, &name, &value, &length)) {
// create string instance of name
- jstring nName = NewStringNative(env, name);
+ jstring nName = NewStringNativeWithLength(env, name, strlen(name));
// get set method and call it
jclass cls = (*env)->GetObjectClass(env, tagField);
@@ -1257,7 +1259,8 @@
* Signature: ()Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1Stream_1Net_1GetLastServerStatus(JNIEnv * env, jclass clazz) {
- return NewStringNative(env, fmod_instance->FSOUND_Stream_Net_GetLastServerStatus());
+ char * serverstatus = fmod_instance->FSOUND_Stream_Net_GetLastServerStatus();
+ return NewStringNativeWithLength(env, serverstatus, strlen(serverstatus));
}
/*
@@ -1777,7 +1780,8 @@
* Signature: (I)Ljava/lang/String;
*/
JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1Record_1GetDriverName(JNIEnv * env, jclass clazz, jint driver) {
- return NewStringNative(env, (const char *)fmod_instance->FSOUND_Record_GetDriverName(driver));
+ char * drivername = fmod_instance->FSOUND_Record_GetDriverName(driver);
+ return NewStringNativeWithLength(env, drivername, strlen(drivername));
}
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
