diff options
author | James Laird <jlaird@hdfgroup.org> | 2007-01-05 17:59:04 (GMT) |
---|---|---|
committer | James Laird <jlaird@hdfgroup.org> | 2007-01-05 17:59:04 (GMT) |
commit | ec1b0dfda6ac7049f1eeb32fbb93ebd92ccfd342 (patch) | |
tree | c0323be7c0a8d71245456cd674cd657924795db7 /test/objcopy.c | |
parent | 75121771bbd468e333419a65511164a1099668a4 (diff) | |
download | hdf5-ec1b0dfda6ac7049f1eeb32fbb93ebd92ccfd342.zip hdf5-ec1b0dfda6ac7049f1eeb32fbb93ebd92ccfd342.tar.gz hdf5-ec1b0dfda6ac7049f1eeb32fbb93ebd92ccfd342.tar.bz2 |
[svn-r13108] Cleaned up some warnings.
Tested on kagiso; I have another checkin coming, after which I'll run more
extensive tests. Changes are pretty minor.
Diffstat (limited to 'test/objcopy.c')
-rwxr-xr-x | test/objcopy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/objcopy.c b/test/objcopy.c index 767535a..f321a25 100755 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -5448,7 +5448,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_same_file_named_datatype(hid_t fcpl_src, hid_t fcpl_dst, hid_t fapl) +test_copy_same_file_named_datatype(hid_t fcpl_src, hid_t fapl) { hid_t fid = -1; /* File ID */ hid_t tid = -1, tid2 = -1; /* Datatype IDs */ @@ -5463,7 +5463,7 @@ test_copy_same_file_named_datatype(hid_t fcpl_src, hid_t fcpl_dst, hid_t fapl) addr_reset(); /* create source file */ - if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR + if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl_src, fapl)) < 0) TEST_ERROR /* create datatype */ if((tid = H5Tcopy(H5T_NATIVE_INT)) < 0) TEST_ERROR @@ -5521,7 +5521,7 @@ error: *------------------------------------------------------------------------- */ static int -test_copy_old_layout(hid_t fcpl_src, hid_t fcpl_dst, hid_t fapl) +test_copy_old_layout(hid_t fcpl_dst, hid_t fapl) { hid_t fid_src = -1, fid_dst = -1; /* File IDs */ hid_t did = -1, did2 = -1; /* Dataset IDs */ @@ -7196,8 +7196,8 @@ main(void) #endif /* H5_CANNOT_OPEN_TWICE */ nerrors += test_copy_exist(fcpl_src, fcpl_dst, my_fapl); nerrors += test_copy_path(fcpl_src, fcpl_dst, my_fapl); - nerrors += test_copy_same_file_named_datatype(fcpl_src, fcpl_dst, my_fapl); - nerrors += test_copy_old_layout(fcpl_src, fcpl_dst, my_fapl); + nerrors += test_copy_same_file_named_datatype(fcpl_src, my_fapl); + nerrors += test_copy_old_layout(fcpl_dst, my_fapl); nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_WITHOUT_ATTR_FLAG, FALSE, "H5Ocopy(): without attributes"); nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, 0, TRUE, "H5Ocopy(): with missing groups"); nerrors += test_copy_option(fcpl_src, fcpl_dst, my_fapl, H5O_COPY_EXPAND_SOFT_LINK_FLAG, FALSE, "H5Ocopy(): expand soft link"); |