From: Arnaud Giersch Date: Mon, 23 Dec 2019 23:02:38 +0000 (+0100) Subject: [sonar] Constify pointer and reference local variables in src/bindings/. X-Git-Tag: v3.25~218 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c8f375f14b9e04a4dd1767cb70c70b6dfc173f9c [sonar] Constify pointer and reference local variables in src/bindings/. --- diff --git a/src/bindings/java/jmsg.cpp b/src/bindings/java/jmsg.cpp index ddbac3b289..15f74c1f0b 100644 --- a/src/bindings/java/jmsg.cpp +++ b/src/bindings/java/jmsg.cpp @@ -52,7 +52,7 @@ JavaVM *__java_vm = nullptr; JNIEnv *get_current_thread_env() { using simgrid::kernel::context::JavaContext; - JavaContext* ctx = static_cast(simgrid::kernel::context::Context::self()); + const JavaContext* ctx = static_cast(simgrid::kernel::context::Context::self()); if (ctx) return ctx->jenv_; else @@ -92,7 +92,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_Msg_init(JNIEnv * env, jclass cls, j env->GetJavaVM(&__java_vm); simgrid::kernel::context::factory_initializer = &simgrid::kernel::context::java_factory; - jthrowable exc = env->ExceptionOccurred(); + const _jthrowable* exc = env->ExceptionOccurred(); if (exc) { env->ExceptionClear(); } @@ -144,7 +144,7 @@ JNIEXPORT void JNICALL JNICALL Java_org_simgrid_msg_Msg_run(JNIEnv * env, jclass /* Cleanup java hosts */ xbt_dynar_t hosts = MSG_hosts_as_dynar(); for (unsigned long index = 0; index < xbt_dynar_length(hosts) - 1; index++) { - msg_host_t msg_host = xbt_dynar_get_as(hosts,index,msg_host_t); + auto const* msg_host = xbt_dynar_get_as(hosts, index, msg_host_t); jobject jhost = (jobject) msg_host->extension(JAVA_HOST_LEVEL); if (jhost) jhost_unref(env, jhost); diff --git a/src/bindings/java/jmsg_as.cpp b/src/bindings/java/jmsg_as.cpp index 5d9b460b58..628bffcdb4 100644 --- a/src/bindings/java/jmsg_as.cpp +++ b/src/bindings/java/jmsg_as.cpp @@ -55,7 +55,7 @@ JNIEXPORT void JNICALL Java_org_simgrid_msg_As_nativeInit(JNIEnv* env, jclass cl } JNIEXPORT jobject JNICALL Java_org_simgrid_msg_As_getName(JNIEnv * env, jobject jas) { - simgrid::s4u::NetZone* as = jnetzone_get_native(env, jas); + const simgrid::s4u::NetZone* as = jnetzone_get_native(env, jas); return env->NewStringUTF(as->get_cname()); } diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp index b21688065e..b895ed03e6 100644 --- a/src/bindings/java/jmsg_host.cpp +++ b/src/bindings/java/jmsg_host.cpp @@ -207,7 +207,7 @@ Java_org_simgrid_msg_Host_setProperty(JNIEnv *env, jobject jhost, jobject jname, } const char *name = env->GetStringUTFChars((jstring) jname, 0); const char *value_java = env->GetStringUTFChars((jstring) jvalue, 0); - char *value = xbt_strdup(value_java); + const char* value = xbt_strdup(value_java); MSG_host_set_property_value(host, name, value); @@ -312,7 +312,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Host_all(JNIEnv * env, jclas } for (int index = 0; index < count; index++) { - msg_host_t host = xbt_dynar_get_as(table, index, msg_host_t); + auto const* host = xbt_dynar_get_as(table, index, msg_host_t); jobject jhost = static_cast(host->extension(JAVA_HOST_LEVEL)); if (not jhost) { diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp index 3d941176ae..d5fc013cad 100644 --- a/src/bindings/java/jmsg_process.cpp +++ b/src/bindings/java/jmsg_process.cpp @@ -24,7 +24,7 @@ jfieldID jprocess_field_Process_ppid; jobject jprocess_from_native(msg_process_t process) { - simgrid::kernel::context::JavaContext* context = + const simgrid::kernel::context::JavaContext* context = static_cast(process->get_impl()->context_.get()); return context->jprocess_; } diff --git a/src/bindings/java/jmsg_task.cpp b/src/bindings/java/jmsg_task.cpp index 448ae993b7..657d3a0f92 100644 --- a/src/bindings/java/jmsg_task.cpp +++ b/src/bindings/java/jmsg_task.cpp @@ -180,7 +180,6 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSender(JNIEnv * env, jobj JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource(JNIEnv * env, jobject jtask) { - msg_host_t host; msg_task_t task = jtask_to_native(jtask, env); if (not task) { @@ -188,7 +187,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Task_getSource(JNIEnv * env, jobj return nullptr; } - host = MSG_task_get_source(task); + auto const* host = MSG_task_get_source(task); if (host == nullptr) { return nullptr; } diff --git a/src/bindings/java/jmsg_vm.cpp b/src/bindings/java/jmsg_vm.cpp index 07f20e3d4a..39d1e967d9 100644 --- a/src/bindings/java/jmsg_vm.cpp +++ b/src/bindings/java/jmsg_vm.cpp @@ -178,7 +178,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_VM_getVMByName(JNIEnv* env, jclas } const char* name = env->GetStringUTFChars(jname, 0); /* get the VM by name (VMs are just special hosts, unfortunately) */ - msg_host_t host = MSG_host_by_name(name); + auto const* host = MSG_host_by_name(name); if (not host) { /* invalid name */ jxbt_throw_host_not_found(env, name); diff --git a/src/bindings/lua/lua_host.cpp b/src/bindings/lua/lua_host.cpp index a6334223ff..93bb626b54 100644 --- a/src/bindings/lua/lua_host.cpp +++ b/src/bindings/lua/lua_host.cpp @@ -72,7 +72,7 @@ static int l_host_get_by_name(lua_State * L) */ static int l_host_get_name(lua_State * L) { - sg_host_t ht = sglua_check_host(L, 1); + auto const* ht = sglua_check_host(L, 1); lua_pushstring(L, ht->get_cname()); return 1; } diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp index de65d4a83d..533d61f465 100644 --- a/src/bindings/python/simgrid_python.cpp +++ b/src/bindings/python/simgrid_python.cpp @@ -100,7 +100,7 @@ PYBIND11_MODULE(simgrid, m) simgrid::s4u::this_actor::on_exit([act, fun](bool /*failed*/) { try { fun(); - } catch (py::error_already_set& e) { + } catch (const py::error_already_set& e) { xbt_die("Error while executing the on_exit lambda: %s", e.what()); } }); @@ -141,7 +141,7 @@ PYBIND11_MODULE(simgrid, m) /* If I was passed a class, I just built an instance, so I need to call it now */ if (py::isinstance(res)) res(); - } catch (py::error_already_set& ex) { + } catch (const py::error_already_set& ex) { if (ex.matches(pyForcefulKillEx)) { XBT_VERB("Actor killed"); /* Stop here that ForcefulKill exception which was meant to free the RAII stuff on the stack */ @@ -238,7 +238,7 @@ PYBIND11_MODULE(simgrid, m) return simgrid::s4u::Actor::create(name, host.cast(), [fun, args]() { try { fun(*args); - } catch (py::error_already_set& ex) { + } catch (const py::error_already_set& ex) { if (ex.matches(pyForcefulKillEx)) { XBT_VERB("Actor killed"); /* Stop here that ForcefulKill exception which was meant to free the RAII stuff on the stack */