From ffceeb598e75af5ea0b1d9bb89d751af1e8bcc38 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Fri, 16 Sep 2022 14:19:10 +0200
Subject: [PATCH] Use existing macros (and fix error code).

---
 src/smpi/bindings/smpi_pmpi_file.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/smpi/bindings/smpi_pmpi_file.cpp b/src/smpi/bindings/smpi_pmpi_file.cpp
index 1981ca571e..e8dfd51da4 100644
--- a/src/smpi/bindings/smpi_pmpi_file.cpp
+++ b/src/smpi/bindings/smpi_pmpi_file.cpp
@@ -264,8 +264,7 @@ int PMPI_File_write_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int
 }
 
 int PMPI_File_delete(const char *filename, MPI_Info info){
-  if (filename == nullptr)
-    return MPI_ERR_FILE;
+  CHECK_NULL(1, MPI_ERR_FILE, filename)
   const SmpiBenchGuard suspend_bench;
   int ret = simgrid::smpi::File::del(filename, info);
   return ret;
@@ -371,9 +370,7 @@ int PMPI_File_set_errhandler(MPI_File file, MPI_Errhandler errhandler){
 }
 
 int PMPI_File_call_errhandler(MPI_File file,int errorcode){
-  if (file == nullptr) {
-    return MPI_ERR_WIN;
-  }
+  CHECK_FILE(1, file)
   MPI_Errhandler err = file->errhandler();
   err->call(file, errorcode);
   simgrid::smpi::Errhandler::unref(err);
-- 
2.20.1