mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-27 02:10:55 +08:00
[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)
This commit is contained in:
parent
b7047b6425
commit
662892e8b1
@ -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() */
|
||||
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user