diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-17 22:38:50 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-17 22:38:50 (GMT) |
commit | 80385ab8dd171a8410bd8e7dfce0e6b679c3fc97 (patch) | |
tree | f3ed5401e74382b5f316a7057c091d6c336ef0a1 /testpar/t_pflush1.c | |
parent | 0db6255d805b625f3fbbbb0b0893032af229d234 (diff) | |
download | hdf5-80385ab8dd171a8410bd8e7dfce0e6b679c3fc97.zip hdf5-80385ab8dd171a8410bd8e7dfce0e6b679c3fc97.tar.gz hdf5-80385ab8dd171a8410bd8e7dfce0e6b679c3fc97.tar.bz2 |
[svn-r18032] Description:
Bring r18031 from trunk to 1.8 branch:
Bring r18030 from merge_metadata_journaling branch to trunk:
Bring "brush clearing" changes (whitespace & style issues, mostly) from
metadata_journaling branch to the "merging" branch, to converge the trunk and
the metadata_journaling branch.
Also, some other minor cleanups along the way.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
(h5committested on trunk)
Diffstat (limited to 'testpar/t_pflush1.c')
-rw-r--r-- | testpar/t_pflush1.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/testpar/t_pflush1.c b/testpar/t_pflush1.c index 0773b93..ebe5c38 100644 --- a/testpar/t_pflush1.c +++ b/testpar/t_pflush1.c @@ -157,12 +157,11 @@ main(int argc, char* argv[]) PASSED(); fflush(stdout); fflush(stderr); - } - else - { + } /* end if */ + else { SKIPPED(); puts(" Test not compatible with current Virtual File Driver"); - } + } /* end else */ /* * Some systems like Linux with mpich, if you just _exit without MPI_Finalize @@ -176,23 +175,23 @@ main(int argc, char* argv[]) */ /* close file1 */ - if(H5Fget_vfd_handle(file1, fapl, (void **)&mpifh_p) < 0){ + if(H5Fget_vfd_handle(file1, fapl, (void **)&mpifh_p) < 0) { printf("H5Fget_vfd_handle for file1 failed\n"); goto error; - } - if(MPI_File_close(mpifh_p)!=MPI_SUCCESS){ + } /* end if */ + if(MPI_File_close(mpifh_p) != MPI_SUCCESS) { printf("MPI_File_close for file1 failed\n"); goto error; - } + } /* end if */ /* close file2 */ - if(H5Fget_vfd_handle(file2, fapl, (void **)&mpifh_p) < 0){ + if(H5Fget_vfd_handle(file2, fapl, (void **)&mpifh_p) < 0) { printf("H5Fget_vfd_handle for file2 failed\n"); goto error; - } - if(MPI_File_close(mpifh_p)!=MPI_SUCCESS){ + } /* end if */ + if(MPI_File_close(mpifh_p) != MPI_SUCCESS) { printf("MPI_File_close for file2 failed\n"); goto error; - } + } /* end if */ fflush(stdout); fflush(stderr); |