From 0ba0b5da8a4948ab678226c4456f97b9b85a71c6 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Mon, 7 Aug 2017 15:43:47 +0200 Subject: [PATCH] jxbt_throw_null needs a string. no need to bprintf --- src/bindings/java/jmsg_comm.cpp | 8 +++++--- src/bindings/java/jmsg_host.cpp | 2 +- src/bindings/java/jmsg_storage.cpp | 2 +- src/bindings/java/jmsg_vm.cpp | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bindings/java/jmsg_comm.cpp b/src/bindings/java/jmsg_comm.cpp index 8d52bfedf2..47f14d60a6 100644 --- a/src/bindings/java/jmsg_comm.cpp +++ b/src/bindings/java/jmsg_comm.cpp @@ -10,6 +10,8 @@ #include "jmsg.h" #include +#include + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(java); SG_BEGIN_DECL() @@ -79,7 +81,7 @@ JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject j } if (not comm) { - jxbt_throw_null(env, bprintf("comm is null")); + jxbt_throw_null(env, "comm is null"); return JNI_FALSE; } @@ -99,7 +101,7 @@ JNIEXPORT jboolean JNICALL Java_org_simgrid_msg_Comm_test(JNIEnv *env, jobject j JNIEXPORT void JNICALL Java_org_simgrid_msg_Comm_waitCompletion(JNIEnv *env, jobject jcomm, jdouble timeout) { msg_comm_t comm = (msg_comm_t) (uintptr_t) env->GetLongField(jcomm, jcomm_field_Comm_bind); if (not comm) { - jxbt_throw_null(env, bprintf("comm is null")); + jxbt_throw_null(env, "comm is null"); return; } @@ -130,7 +132,7 @@ static msg_comm_t* jarray_to_commArray(JNIEnv *env, jobjectArray jcomms, /* OUT comms[i] = (msg_comm_t) (uintptr_t) env->GetLongField(jcomm, jcomm_field_Comm_bind); if (not comms[i]) { - jxbt_throw_null(env, bprintf("comm at rank %d is null", i)); + jxbt_throw_null(env, std::string("comm at rank ") + std::to_string(i) + " is null"); return nullptr; } diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp index db414b99d8..28804e76e9 100644 --- a/src/bindings/java/jmsg_host.cpp +++ b/src/bindings/java/jmsg_host.cpp @@ -56,7 +56,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_getByName(JNIEnv * env, jcla /* get the C string from the java string */ if (jname == nullptr) { - jxbt_throw_null(env,bprintf("No host can have a null name")); + jxbt_throw_null(env, "No host can have a null name"); return nullptr; } const char *name = env->GetStringUTFChars(jname, 0); diff --git a/src/bindings/java/jmsg_storage.cpp b/src/bindings/java/jmsg_storage.cpp index 2d3a02931c..7b5003f6c1 100644 --- a/src/bindings/java/jmsg_storage.cpp +++ b/src/bindings/java/jmsg_storage.cpp @@ -56,7 +56,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Storage_getByName(JNIEnv * env, j /* get the C string from the java string */ if (jname == nullptr) { - jxbt_throw_null(env,bprintf("No host can have a null name")); + jxbt_throw_null(env, "No host can have a null name"); return nullptr; } const char *name = env->GetStringUTFChars(jname, 0); diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp index d7e9ea12b6..b570d72103 100644 --- a/src/bindings/java/jmsg_vm.cpp +++ b/src/bindings/java/jmsg_vm.cpp @@ -174,7 +174,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_VM_getVMByName(JNIEnv* env, jclas /* get the C string from the java string */ if (jname == nullptr) { - jxbt_throw_null(env, bprintf("No VM can have a null name")); + jxbt_throw_null(env, "No VM can have a null name"); return nullptr; } const char* name = env->GetStringUTFChars(jname, 0); -- 2.20.1