diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-12-29 05:17:22 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-12-29 05:17:22 (GMT) |
| commit | 662892e8b18db2dd5c1ebcd923c246adb4fe0fac (patch) | |
| tree | f47c24c36227feb0c3fc2a57f4c2d30194313d43 | |
| parent | b7047b64254183b0ad75e5812737d09ecaa95e68 (diff) | |
| download | hdf5-662892e8b18db2dd5c1ebcd923c246adb4fe0fac.zip hdf5-662892e8b18db2dd5c1ebcd923c246adb4fe0fac.tar.gz hdf5-662892e8b18db2dd5c1ebcd923c246adb4fe0fac.tar.bz2 | |
[svn-r25928] Description:
Minor code cleanups found while reviewing 'avoid_truncate' changes.
Tested on:
MacOSX/64 10.10.1 (amazon) w/serial & parallel
(too minor to require h5committest)
| -rw-r--r-- | src/H5Ofill.c | 4 | ||||
| -rw-r--r-- | testpar/t_pflush2.c | 20 |
2 files changed, 10 insertions, 14 deletions
diff --git a/src/H5Ofill.c b/src/H5Ofill.c index 1e8ccb1..a0fc42e 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -890,7 +890,7 @@ H5O_fill_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_fill, FILE *s else fprintf(stream, "<dataset type>\n"); - FUNC_LEAVE_NOAPI(SUCCEED); + FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5O_fill_debug() */ @@ -993,7 +993,7 @@ done: if(bkg) H5MM_xfree(bkg); - FUNC_LEAVE_NOAPI(ret_value); + FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_fill_convert() */ diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c index a570d4c..743a3d3 100644 --- a/testpar/t_pflush2.c +++ b/testpar/t_pflush2.c @@ -133,9 +133,7 @@ error: int main(int argc, char* argv[]) { - hid_t fapl1, fapl2; H5E_auto2_t func; - char name[1024]; const char *envval = NULL; @@ -147,13 +145,6 @@ main(int argc, char* argv[]) MPI_Comm_size(comm, &mpi_size); MPI_Comm_rank(comm, &mpi_rank); - fapl1 = H5Pcreate(H5P_FILE_ACCESS); - H5Pset_fapl_mpio(fapl1, comm, info); - - fapl2 = H5Pcreate(H5P_FILE_ACCESS); - H5Pset_fapl_mpio(fapl2, comm, info); - - if(mpi_rank == 0) TESTING("H5Fflush (part2 with flush)"); @@ -162,6 +153,14 @@ main(int argc, char* argv[]) if (envval == NULL) envval = "nomatch"; if (HDstrcmp(envval, "core") && HDstrcmp(envval, "split")) { + hid_t fapl1, fapl2; + + fapl1 = H5Pcreate(H5P_FILE_ACCESS); + H5Pset_fapl_mpio(fapl1, comm, info); + + fapl2 = H5Pcreate(H5P_FILE_ACCESS); + H5Pset_fapl_mpio(fapl2, comm, info); + /* Check the case where the file was flushed */ h5_fixname(FILENAME[0], fapl1, name, sizeof name); if(check_file(name, fapl1)) @@ -213,6 +212,3 @@ main(int argc, char* argv[]) return 1; } - - - |