X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/84402e8e2ee2a2d0bef25fdceb0a263ed8b471f6..7e34d26dd133ad8707b8322995fe7164d96a406b:/src/bindings/java/jxbt_utilities.cpp

diff --git a/src/bindings/java/jxbt_utilities.cpp b/src/bindings/java/jxbt_utilities.cpp
index 81093129ce..2d61bc3e1f 100644
--- a/src/bindings/java/jxbt_utilities.cpp
+++ b/src/bindings/java/jxbt_utilities.cpp
@@ -1,6 +1,6 @@
 /* Various JNI helper functions                                             */
 
-/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -9,8 +9,6 @@
 #include "xbt/string.hpp"
 #include "xbt/sysdep.h"
 
-#include <cstdlib> /* abort */
-
 jclass jxbt_get_class(JNIEnv * env, const char *name)
 {
   jclass cls = env->FindClass(name);
@@ -28,18 +26,18 @@ jmethodID jxbt_get_jmethod(JNIEnv * env, jclass cls, const char *name, const cha
   jmethodID id;
 
   if (not cls)
-    return 0;
+    return nullptr;
   id = env->GetMethodID(cls, name, signature);
 
   if (not id) {
     jmethodID tostr_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
-    jstring jclassname = (jstring) env->CallObjectMethod(cls, tostr_id, nullptr);
-    const char *classname = env->GetStringUTFChars(jclassname, 0);
+    auto jclassname       = (jstring)env->CallObjectMethod(cls, tostr_id, nullptr);
+    const char* classname = env->GetStringUTFChars(jclassname, nullptr);
 
     env->ReleaseStringUTFChars(jclassname, classname);
 
     jxbt_throw_jni(env, std::string("Cannot find method") + name + "(" + signature + ") in " + classname);
-    return 0;
+    return nullptr;
   }
 
   return id;
@@ -50,18 +48,18 @@ jmethodID jxbt_get_static_jmethod(JNIEnv * env, jclass cls, const char *name, co
   jmethodID id;
 
   if (not cls)
-    return 0;
+    return nullptr;
   id = env->GetStaticMethodID(cls, name, signature);
 
   if (not id) {
     jmethodID tostr_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
-    jstring jclassname = (jstring) env->CallObjectMethod(cls, tostr_id, nullptr);
-    const char *classname = env->GetStringUTFChars(jclassname, 0);
+    auto jclassname       = (jstring)env->CallObjectMethod(cls, tostr_id, nullptr);
+    const char* classname = env->GetStringUTFChars(jclassname, nullptr);
 
     env->ReleaseStringUTFChars(jclassname, classname);
 
     jxbt_throw_jni(env, std::string("Cannot find static method") + name + "(" + signature + ") in " + classname);
-    return 0;
+    return nullptr;
   }
 
   return id;
@@ -74,13 +72,13 @@ jmethodID jxbt_get_static_smethod(JNIEnv * env, const char *classname, const cha
   cls = jxbt_get_class(env, classname);
 
   if (not cls)
-    return 0;
+    return nullptr;
 
   id = env->GetStaticMethodID(cls, name, signature);
 
   if (not id) {
     jxbt_throw_jni(env, std::string("Cannot find static method") + name + "(" + signature + ") in " + classname);
-    return 0;
+    return nullptr;
   }
   return id;
 }
@@ -92,13 +90,13 @@ jmethodID jxbt_get_smethod(JNIEnv * env, const char *classname, const char *name
   cls = jxbt_get_class(env, classname);
 
   if (not cls)
-    return 0;
+    return nullptr;
 
   id = env->GetMethodID(cls, name, signature);
 
   if (not id) {
     jxbt_throw_jni(env, std::string("Cannot find method") + name + "(" + signature + ") in " + classname);
-    return 0;
+    return nullptr;
   }
   return id;
 }
@@ -108,20 +106,20 @@ jfieldID jxbt_get_jfield(JNIEnv * env, jclass cls, const char *name, const char
   jfieldID id;
 
   if (not cls)
-    return 0;
+    return nullptr;
 
   id = env->GetFieldID(cls, name, signature);
 
   if (not id) {
     jmethodID getname_id = env->GetMethodID(cls, "getName", "()Ljava/lang/String;");
-    jstring jclassname = (jstring) env->CallObjectMethod(cls, getname_id, nullptr);
-    const char *classname = env->GetStringUTFChars(jclassname, 0);
+    auto jclassname       = (jstring)env->CallObjectMethod(cls, getname_id, nullptr);
+    const char* classname = env->GetStringUTFChars(jclassname, nullptr);
 
     env->ReleaseStringUTFChars(jclassname, classname);
 
     jxbt_throw_jni(env, std::string("Cannot find field") + signature + " " + name + " in " + classname);
 
-    return 0;
+    return nullptr;
   }
 
   return id;
@@ -133,13 +131,13 @@ jfieldID jxbt_get_sfield(JNIEnv * env, const char *classname, const char *name,
   jfieldID id;
 
   if (not cls)
-    return 0;
+    return nullptr;
 
   id = env->GetFieldID(cls, name, signature);
 
   if (not id) {
     jxbt_throw_jni(env, std::string("Cannot find field") + signature + " " + name + " in " + classname);
-    return 0;
+    return nullptr;
   }
 
   return id;
@@ -180,11 +178,6 @@ void jxbt_throw_host_not_found(JNIEnv* env, const std::string& invalid_name)
   jxbt_throw_by_name(env, "org/simgrid/msg/HostNotFoundException", "No such host: " + invalid_name);
 }
 
-void jxbt_throw_storage_not_found(JNIEnv* env, const std::string& invalid_name)
-{
-  jxbt_throw_by_name(env, "org/simgrid/msg/StorageNotFoundException", "No such storage: " + invalid_name);
-}
-
 void jxbt_throw_process_not_found(JNIEnv* env, const std::string& invalid_name)
 {
   jxbt_throw_by_name(env, "org/simgrid/msg/ProcessNotFoundException", "No such process: " + invalid_name);