From bd00f39ff9167fb35a72ed0811f976159f3cf571 Mon Sep 17 00:00:00 2001 From: Brian Matzon Date: Thu, 19 Apr 2007 22:39:08 +0000 Subject: [PATCH] using NewStringNativeWithLength --- src/native/common/devil/org_lwjgl_devil_IL.c | 3 ++- src/native/common/devil/org_lwjgl_devil_ILU.c | 6 ++++-- src/native/common/devil/org_lwjgl_devil_ILUT.c | 3 ++- src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c | 3 ++- src/native/common/fmod3/org_lwjgl_fmod3_FMusic.c | 2 +- src/native/common/fmod3/org_lwjgl_fmod3_FSound.c | 16 ++++++++++------ 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/native/common/devil/org_lwjgl_devil_IL.c b/src/native/common/devil/org_lwjgl_devil_IL.c index 271d4aa0..2f9e27de 100644 --- a/src/native/common/devil/org_lwjgl_devil_IL.c +++ b/src/native/common/devil/org_lwjgl_devil_IL.c @@ -517,7 +517,8 @@ static jobject JNICALL Java_org_lwjgl_devil_IL_ilGetPalette(JNIEnv *env, jclass * 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)); } /* diff --git a/src/native/common/devil/org_lwjgl_devil_ILU.c b/src/native/common/devil/org_lwjgl_devil_ILU.c index aaca173c..2b610049 100644 --- a/src/native/common/devil/org_lwjgl_devil_ILU.c +++ b/src/native/common/devil/org_lwjgl_devil_ILU.c @@ -245,7 +245,8 @@ static jboolean JNICALL Java_org_lwjgl_devil_ILU_iluEqualize(JNIEnv *env, jclass * 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 @@ static void JNICALL Java_org_lwjgl_devil_ILU_niluGetIntegerv(JNIEnv *env, jclass * 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)); } /* diff --git a/src/native/common/devil/org_lwjgl_devil_ILUT.c b/src/native/common/devil/org_lwjgl_devil_ILUT.c index 50e1a7b2..6ce98091 100644 --- a/src/native/common/devil/org_lwjgl_devil_ILUT.c +++ b/src/native/common/devil/org_lwjgl_devil_ILUT.c @@ -120,7 +120,8 @@ static void JNICALL Java_org_lwjgl_devil_ILUT_ilutGetIntegerv(JNIEnv *env, jclas * 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)); } /* diff --git a/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c b/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c index b29489a3..1571ad36 100644 --- a/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c +++ b/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c @@ -82,5 +82,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_fmod3_FMOD_nDestroy(JNIEnv *env, jclass cl * 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)); } diff --git a/src/native/common/fmod3/org_lwjgl_fmod3_FMusic.c b/src/native/common/fmod3/org_lwjgl_fmod3_FMusic.c index 293c106b..3dd97fe9 100644 --- a/src/native/common/fmod3/org_lwjgl_fmod3_FMusic.c +++ b/src/native/common/fmod3/org_lwjgl_fmod3_FMusic.c @@ -281,7 +281,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FMusic_nFMUSIC_1SetPanSeperation 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)); } /* diff --git a/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c b/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c index 2951f9df..92180506 100644 --- a/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c +++ b/src/native/common/fmod3/org_lwjgl_fmod3_FSound.c @@ -230,7 +230,8 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1GetDriverCaps(JN * 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 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Sample_1GetMode(JNIE * 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 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Stream_1GetSyncPo 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 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Stream_1GetTagFi 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 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_fmod3_FSound_nFSOUND_1Stream_1Net_1Get * 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 @@ JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FSound_FSOUND_1Record_1GetDriver(JNI * 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)); } /*