summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-11-15 03:32:00 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-11-15 03:32:00 (GMT)
commit5f6e580533b83a17b4575b9f305d7fd5b54c1923 (patch)
tree61b4d2301d0c8598433789026725f7e0eaeb74d6
parent3bdc5d7aa4e95e54eb8c7d28956fa49401e46296 (diff)
downloadhdf5-5f6e580533b83a17b4575b9f305d7fd5b54c1923.zip
hdf5-5f6e580533b83a17b4575b9f305d7fd5b54c1923.tar.gz
hdf5-5f6e580533b83a17b4575b9f305d7fd5b54c1923.tar.bz2
[svn-r28346] Description:
Bring in cleanups from revise_chunks branch. Tested on: MacOSX/64 10.11.1 (amazon) w/serial & parallel (too minor to require full h5committest)
-rw-r--r--MANIFEST5
-rw-r--r--hl/test/test_file_image.c8
-rw-r--r--src/CMakeLists.txt20
3 files changed, 17 insertions, 16 deletions
diff --git a/MANIFEST b/MANIFEST
index ca7cd33..14c3e4b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -584,12 +584,12 @@
./src/H5FScache.c
./src/H5FSdbg.c
./src/H5FSmodule.h
-./src/H5FStest.c
-./src/H5FSstat.c
./src/H5FSpkg.h
./src/H5FSprivate.h
./src/H5FSpublic.h
./src/H5FSsection.c
+./src/H5FSstat.c
+./src/H5FStest.c
./src/H5G.c
./src/H5Gbtree2.c
./src/H5Gcache.c
@@ -2253,7 +2253,6 @@
./tools/perform/sio_standalone.h
./tools/perform/zip_perf.c
-
# high level libraries
./hl/COPYING
./hl/Makefile.am
diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c
index 831fa23..9b18539 100644
--- a/hl/test/test_file_image.c
+++ b/hl/test/test_file_image.c
@@ -158,7 +158,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
FAIL_PUTS_ERROR("H5Dclose() failed");
/* get size of the file image i */
- if ((buf_size[i] = H5Fget_file_image(file_id[i], NULL, 0)) < 0)
+ if ((buf_size[i] = H5Fget_file_image(file_id[i], NULL, (size_t)0)) < 0)
FAIL_PUTS_ERROR("H5Fget_file_image() failed");
/* allocate buffer for the file image i */
@@ -370,7 +370,9 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
H5Aclose(attr_id);
} H5E_END_TRY;
#endif
- file_id[i] = -1;
+ if (H5Dclose(dset_id[i]) < 0)
+ FAIL_PUTS_ERROR("H5Dclose() failed");
+ dset_id[i] = -1;
} /* end if */
else {
/* write dataset without extending it */
@@ -399,7 +401,7 @@ test_file_image(size_t open_images, size_t nflags, unsigned *flags)
/* read open file images and verify data */
for (i = 0; i < open_images; i++) {
/* if opening the file image failed, continue next iteration */
- if ((file_id[i] < 0) || (!(input_flags[i] & H5LT_FILE_IMAGE_OPEN_RW )))
+ if ((dset_id[i] < 0) || (file_id[i] < 0) || (!(input_flags[i] & H5LT_FILE_IMAGE_OPEN_RW )))
continue;
/* open dataset in file image */
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b7656a1..523ab3a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -165,13 +165,13 @@ IDE_GENERATED_PROPERTIES ("H5EA" "${H5EA_HDRS}" "${H5EA_SRCS}" )
set (H5F_SRCS
${HDF5_SRC_DIR}/H5F.c
- ${HDF5_SRC_DIR}/H5Fint.c
${HDF5_SRC_DIR}/H5Faccum.c
${HDF5_SRC_DIR}/H5Fcwfs.c
${HDF5_SRC_DIR}/H5Fdbg.c
${HDF5_SRC_DIR}/H5Fdeprec.c
${HDF5_SRC_DIR}/H5Fefc.c
${HDF5_SRC_DIR}/H5Ffake.c
+ ${HDF5_SRC_DIR}/H5Fint.c
${HDF5_SRC_DIR}/H5Fio.c
${HDF5_SRC_DIR}/H5Fmount.c
${HDF5_SRC_DIR}/H5Fmpi.c
@@ -193,8 +193,8 @@ set (H5FA_SRCS
${HDF5_SRC_DIR}/H5FA.c
${HDF5_SRC_DIR}/H5FAcache.c
${HDF5_SRC_DIR}/H5FAdbg.c
- ${HDF5_SRC_DIR}/H5FAdblock.c
${HDF5_SRC_DIR}/H5FAdblkpage.c
+ ${HDF5_SRC_DIR}/H5FAdblock.c
${HDF5_SRC_DIR}/H5FAhdr.c
${HDF5_SRC_DIR}/H5FAstat.c
${HDF5_SRC_DIR}/H5FAtest.c
@@ -501,14 +501,6 @@ set (H5R_HDRS
IDE_GENERATED_PROPERTIES ("H5R" "${H5R_HDRS}" "${H5R_SRCS}" )
-set (H5UC_SRCS
- ${HDF5_SRC_DIR}/H5UC.c
-)
-set (H5UC_HDRS
-)
-IDE_GENERATED_PROPERTIES ("H5UC" "${H5UC_HDRS}" "${H5UC_SRCS}" )
-
-
set (H5RS_SRCS
${HDF5_SRC_DIR}/H5RS.c
)
@@ -607,6 +599,14 @@ set (H5TS_HDRS
IDE_GENERATED_PROPERTIES ("H5TS" "${H5TS_HDRS}" "${H5TS_SRCS}" )
+set (H5UC_SRCS
+ ${HDF5_SRC_DIR}/H5UC.c
+)
+set (H5UC_HDRS
+)
+IDE_GENERATED_PROPERTIES ("H5UC" "${H5UC_HDRS}" "${H5UC_SRCS}" )
+
+
set (H5VM_SRCS
${HDF5_SRC_DIR}/H5VM.c
)