X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/src/smpi/bindings/smpi_pmpi_info.cpp

diff --git a/src/smpi/bindings/smpi_pmpi_info.cpp b/src/smpi/bindings/smpi_pmpi_info.cpp
index f9fb0c2e9e..fe4ae456b1 100644
--- a/src/smpi/bindings/smpi_pmpi_info.cpp
+++ b/src/smpi/bindings/smpi_pmpi_info.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. 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. */
@@ -11,72 +11,81 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi);
 /* PMPI User level calls */
 
 int PMPI_Info_create( MPI_Info *info){
-  if (info == nullptr)
-    return MPI_ERR_ARG;
+  CHECK_NULL(1, MPI_ERR_ARG, info)
   *info = new simgrid::smpi::Info();
   return MPI_SUCCESS;
 }
 
-int PMPI_Info_set( MPI_Info info, char *key, char *value){
-  if (info == nullptr || key == nullptr || value == nullptr)
-    return MPI_ERR_ARG;
+int PMPI_Info_set( MPI_Info info, const char *key, const char *value){
+  CHECK_INFO(1, info)
+  CHECK_NULL(2, MPI_ERR_INFO_KEY, key)
+  CHECK_NULL(3, MPI_ERR_INFO_VALUE, value)
   info->set(key, value);
   return MPI_SUCCESS;
 }
 
 int PMPI_Info_free( MPI_Info *info){
-  if (info == nullptr || *info==nullptr)
-    return MPI_ERR_ARG;
+  CHECK_NULL(1, MPI_ERR_ARG, info)
+  CHECK_INFO(1, *info)
   simgrid::smpi::Info::unref(*info);
   *info=MPI_INFO_NULL;
   return MPI_SUCCESS;
 }
 
-int PMPI_Info_get(MPI_Info info,char *key,int valuelen, char *value, int *flag){
-  *flag=false;
-  if (info == nullptr || key == nullptr || valuelen <0)
+int PMPI_Info_get(MPI_Info info, const char *key,int valuelen, char *value, int *flag){
+  CHECK_INFO(1, info)
+  if (valuelen <0)
     return MPI_ERR_ARG;
-  if (value == nullptr)
-    return MPI_ERR_INFO_VALUE;
+  CHECK_NULL(2, MPI_ERR_INFO_KEY, key)
+  CHECK_NULL(3, MPI_ERR_INFO_VALUE, value)
+  CHECK_NULL(4, MPI_ERR_ARG, flag)
+  *flag=false;
   return info->get(key, valuelen, value, flag);
 }
 
 int PMPI_Info_dup(MPI_Info info, MPI_Info *newinfo){
-  if (info == nullptr || newinfo==nullptr)
-    return MPI_ERR_ARG;
+  CHECK_INFO(1, info)
+  CHECK_NULL(2, MPI_ERR_ARG, newinfo)
   *newinfo = new simgrid::smpi::Info(info);
   return MPI_SUCCESS;
 }
 
-int PMPI_Info_delete(MPI_Info info, char *key){
-  if (info == nullptr || key==nullptr)
-    return MPI_ERR_ARG;
+int PMPI_Info_delete(MPI_Info info, const char *key){
+  CHECK_INFO(1, info)
+  CHECK_NULL(2, MPI_ERR_INFO_KEY, key)
   return info->remove(key);
 }
 
 int PMPI_Info_get_nkeys( MPI_Info info, int *nkeys){
-  if (info == nullptr || nkeys==nullptr)
-    return MPI_ERR_ARG;
+  CHECK_INFO(1, info)
+  CHECK_NULL(2, MPI_ERR_ARG, nkeys)
   return info->get_nkeys(nkeys);
 }
 
 int PMPI_Info_get_nthkey( MPI_Info info, int n, char *key){
-  if (info == nullptr || key==nullptr || n<0 || n> MPI_MAX_INFO_KEY)
+  CHECK_INFO(1, info)
+  CHECK_NULL(2, MPI_ERR_INFO_KEY, key)
+  if (n<0 || n> MPI_MAX_INFO_KEY)
     return MPI_ERR_ARG;
   return info->get_nthkey(n, key);
 }
 
-int PMPI_Info_get_valuelen( MPI_Info info, char *key, int *valuelen, int *flag){
+int PMPI_Info_get_valuelen( MPI_Info info, const char *key, int *valuelen, int *flag){
   *flag=false;
-  if (info == nullptr || key == nullptr || valuelen==nullptr)
-    return MPI_ERR_ARG;
+  CHECK_INFO(1, info)
+  CHECK_NULL(2, MPI_ERR_INFO_KEY, key)
+  CHECK_NULL(2, MPI_ERR_INFO_VALUE, valuelen)
   return info->get_valuelen(key, valuelen, flag);
 }
 
 MPI_Info PMPI_Info_f2c(MPI_Fint info){
-  return static_cast<MPI_Info>(simgrid::smpi::Info::f2c(info));
+  if(info==-1)
+    return MPI_INFO_NULL;
+  return simgrid::smpi::Info::f2c(info);
 }
 
 MPI_Fint PMPI_Info_c2f(MPI_Info info){
+  if(info==MPI_INFO_NULL)
+    return -1;
   return info->c2f();
 }