diff options
author | Sean McBride <sean@rogue-research.com> | 2023-08-02 13:39:15 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-02 13:39:15 (GMT) |
commit | 2b0badb90e4e516d0758efbd8ec96449188c7249 (patch) | |
tree | 074e38039b95ca7121a0117069974eff52a04519 /src/H5mpi.c | |
parent | 56451503c55ef6e5f67fc3bb710f9e5b649b1af2 (diff) | |
download | hdf5-2b0badb90e4e516d0758efbd8ec96449188c7249.zip hdf5-2b0badb90e4e516d0758efbd8ec96449188c7249.tar.gz hdf5-2b0badb90e4e516d0758efbd8ec96449188c7249.tar.bz2 |
Made HGOTO_ERROR a do-while loop (#3308)
* Made HGOTO_ERROR a do-while loop
Diffstat (limited to 'src/H5mpi.c')
-rw-r--r-- | src/H5mpi.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/H5mpi.c b/src/H5mpi.c index e1b71f4..8fd7252 100644 --- a/src/H5mpi.c +++ b/src/H5mpi.c @@ -97,7 +97,7 @@ H5_mpi_comm_dup(MPI_Comm comm, MPI_Comm *comm_new) /* Check arguments */ if (!comm_new) - HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "comm_new cannot be NULL") + HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "comm_new cannot be NULL"); /* Handle MPI_COMM_NULL separately */ if (MPI_COMM_NULL == comm) { @@ -156,7 +156,7 @@ H5_mpi_info_dup(MPI_Info info, MPI_Info *info_new) /* Check arguments */ if (!info_new) - HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "info_new cannot be NULL") + HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "info_new cannot be NULL"); /* Duplicate the MPI info */ if (info == MPI_INFO_NULL) { @@ -202,7 +202,7 @@ H5_mpi_comm_free(MPI_Comm *comm) /* Check arguments */ if (!comm) - HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "comm pointer cannot be NULL") + HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "comm pointer cannot be NULL"); /* Free the communicator */ if (MPI_COMM_WORLD != *comm && MPI_COMM_NULL != *comm) @@ -234,7 +234,7 @@ H5_mpi_info_free(MPI_Info *info) /* Check arguments */ if (!info) - HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "info pointer cannot be NULL") + HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "info pointer cannot be NULL"); /* Free the info */ if (MPI_INFO_NULL != *info) @@ -277,7 +277,7 @@ H5_mpi_comm_cmp(MPI_Comm comm1, MPI_Comm comm2, int *result) /* Check arguments */ if (!result) - HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "result cannot be NULL") + HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "result cannot be NULL"); /* Set out parameter to something reasonable in case something goes wrong */ *result = 0; @@ -345,7 +345,7 @@ H5_mpi_info_cmp(MPI_Info info1, MPI_Info info2, int *result) /* Check arguments */ if (!result) - HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "result cannot be NULL") + HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "result cannot be NULL"); /* Check for MPI_INFO_NULL */ if (MPI_INFO_NULL == info1 && MPI_INFO_NULL == info2) { @@ -379,11 +379,11 @@ H5_mpi_info_cmp(MPI_Info info1, MPI_Info info2, int *result) /* Allocate buffers for iteration */ if (NULL == (key = (char *)H5MM_malloc(MPI_MAX_INFO_KEY * sizeof(char)))) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); if (NULL == (value1 = (char *)H5MM_malloc(MPI_MAX_INFO_VAL * sizeof(char)))) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); if (NULL == (value2 = (char *)H5MM_malloc(MPI_MAX_INFO_VAL * sizeof(char)))) - HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed"); /* Iterate over the keys, comparing them */ for (i = 0; i < nkeys_1; i++) { @@ -646,7 +646,7 @@ H5_mpio_gatherv_alloc(void *send_buf, int send_count, MPI_Datatype send_type, co HMPI_GOTO_ERROR(FAIL, "MPI_Type_get_extent(_x) failed", mpi_code) if (type_extent < 0) - HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "MPI recv_type had a negative extent") + HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "MPI recv_type had a negative extent"); /* * Calculate the total size of the buffer being @@ -766,7 +766,7 @@ H5_mpio_gatherv_alloc_simple(void *send_buf, int send_count, MPI_Datatype send_t if (H5_mpio_gatherv_alloc(send_buf, send_count, send_type, recv_counts_disps_array, &recv_counts_disps_array[mpi_size], recv_type, allgather, root, comm, mpi_rank, mpi_size, out_buf, out_buf_num_entries) < 0) - HGOTO_ERROR(H5E_LIB, H5E_CANTGATHER, FAIL, "can't gather data") + HGOTO_ERROR(H5E_LIB, H5E_CANTGATHER, FAIL, "can't gather data"); done: if (recv_counts_disps_array) @@ -806,17 +806,17 @@ H5_mpio_get_file_sync_required(MPI_File fh, hbool_t *file_sync_required) *file_sync_required = FALSE; if (MPI_SUCCESS != MPI_File_get_info(fh, &info_used)) - HGOTO_ERROR(H5E_LIB, H5E_CANTGET, FAIL, "can't get MPI info") + HGOTO_ERROR(H5E_LIB, H5E_CANTGET, FAIL, "can't get MPI info"); if (MPI_SUCCESS != MPI_Info_get(info_used, "romio_visibility_immediate", MPI_MAX_INFO_VAL - 1, value, &flag)) - HGOTO_ERROR(H5E_LIB, H5E_CANTGET, FAIL, "can't get MPI info") + HGOTO_ERROR(H5E_LIB, H5E_CANTGET, FAIL, "can't get MPI info"); if (flag && !HDstrcmp(value, "false")) *file_sync_required = TRUE; if (MPI_SUCCESS != MPI_Info_free(&info_used)) - HGOTO_ERROR(H5E_LIB, H5E_CANTFREE, FAIL, "can't free MPI info") + HGOTO_ERROR(H5E_LIB, H5E_CANTFREE, FAIL, "can't free MPI info"); /* Force setting the flag via env variable (temp solution before the flag is implemented in MPI) */ sync_env_var = HDgetenv("HDF5_DO_MPI_FILE_SYNC"); |