diff options
| -rw-r--r-- | src/H5FDmpi.c | 10 | ||||
| -rw-r--r-- | src/H5I.c | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/H5FDmpi.c b/src/H5FDmpi.c index 380701d..7472575 100644 --- a/src/H5FDmpi.c +++ b/src/H5FDmpi.c @@ -131,20 +131,20 @@ done: * *------------------------------------------------------------------------- */ -int +MPI_Comm H5FD_mpi_get_comm(const H5FD_t *file) { const H5FD_class_mpi_t *cls=(const H5FD_class_mpi_t *)(file->cls); - int ret_value; + MPI_Comm ret_value; - FUNC_ENTER_NOAPI(H5FD_mpi_get_comm, FAIL) + FUNC_ENTER_NOAPI(H5FD_mpi_get_comm, MPI_COMM_NULL) assert(file && cls); assert(cls->get_comm); /* All MPI drivers must implement this */ /* Dispatch to driver */ - if ((ret_value=(cls->get_comm)(file))<0) - HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "driver get_comm request failed") + if ((ret_value=(cls->get_comm)(file))==MPI_COMM_NULL) + HGOTO_ERROR(H5E_VFL, H5E_CANTGET, MPI_COMM_NULL, "driver get_comm request failed") done: FUNC_LEAVE_NOAPI(ret_value) @@ -1051,7 +1051,7 @@ H5I_dec_ref(hid_t id) /* Check arguments */ grp = H5I_GRP(id); if (grp <= H5I_BADID || grp >= H5I_NGROUPS) - HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "invalid group number"); + HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid group number"); grp_ptr = H5I_id_group_list_g[grp]; if (grp_ptr == NULL || grp_ptr->count <= 0) HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid group number"); @@ -1154,7 +1154,7 @@ H5I_inc_ref(hid_t id) /* Check arguments */ grp = H5I_GRP(id); if (grp <= H5I_BADID || grp >= H5I_NGROUPS) - HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "invalid group number"); + HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid group number"); grp_ptr = H5I_id_group_list_g[grp]; if (!grp_ptr || grp_ptr->count<=0) HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "invalid group"); @@ -1239,7 +1239,7 @@ H5I_get_ref(hid_t id) /* Check arguments */ grp = H5I_GRP(id); if (grp <= H5I_BADID || grp >= H5I_NGROUPS) - HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "invalid group number"); + HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid group number"); grp_ptr = H5I_id_group_list_g[grp]; if (!grp_ptr || grp_ptr->count<=0) HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, FAIL, "invalid group"); @@ -1341,7 +1341,7 @@ H5I_find_id(hid_t id) unsigned hash_loc; /*bucket pointer */ H5I_id_info_t *ret_value = NULL; /*return value */ - FUNC_ENTER_NOAPI_NOINIT(H5I_find_id); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_find_id); /* Check arguments */ grp = H5I_GRP(id); @@ -1372,7 +1372,6 @@ H5I_find_id(hid_t id) /* Set the return value */ ret_value = id_ptr; -done: FUNC_LEAVE_NOAPI(ret_value); } |