summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2016-09-30 17:06:12 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2016-09-30 17:06:12 (GMT)
commitcbc260e636e258cc55d9fb8fdafd3bff0877ac23 (patch)
treebaaa000b45158680564df521d95297587d6c8941
parent5088217e4256aa2ba5b7590b7de91aeae415a1ce (diff)
downloadhdf5-cbc260e636e258cc55d9fb8fdafd3bff0877ac23.zip
hdf5-cbc260e636e258cc55d9fb8fdafd3bff0877ac23.tar.gz
hdf5-cbc260e636e258cc55d9fb8fdafd3bff0877ac23.tar.bz2
- Removed BRANCH.txt and MANIFEST entry
- Fixed a missing line in H5Dint.c
-rw-r--r--BRANCH.txt22
-rw-r--r--MANIFEST1
-rw-r--r--src/H5Dint.c1
3 files changed, 1 insertions, 23 deletions
diff --git a/BRANCH.txt b/BRANCH.txt
deleted file mode 100644
index 6c4ee6c..0000000
--- a/BRANCH.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-evict_on_close
-
-This branch is for the development of the "evict on close" feature
-which will cause the library to evict all cached information
-on object close.
-
-Dana Robinson is in charge of the branch, which follows the trunk.
-It will be deleted when the feature is merged to the trunk.
-
-Key changes:
-
-* New H5Pset/get_evict_on_close() functions that enable and disable
- the feature (default: disabled).
-
-* New property: H5F_ACS_EVICT_ON_CLOSE_FLAG
-
-* Added match_global flag to H5AC_evict_tagged_metadata() and
- H5C_evict_tagged_entries() parameter lists.
-
-* H5D_close() updated to evict on close, when the property is set.
-
-* New evict_on_close test to exercise the function.
diff --git a/MANIFEST b/MANIFEST
index 3ed99e7..fb454c5 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -25,7 +25,6 @@
./.autom4te.cfg _DO_NOT_DISTRIBUTE_
./.h5chkright.ini _DO_NOT_DISTRIBUTE_
./ACKNOWLEDGMENTS
-./BRANCH.txt
./COPYING
./MANIFEST
./Makefile.dist
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 7f90f16..59fe3e9 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -2665,6 +2665,7 @@ H5D__vlen_get_buf_size(void H5_ATTR_UNUSED *elem, hid_t type_id, unsigned H5_ATT
/* Read in the point (with the custom VL memory allocator) */
if(H5D__read(vlen_bufsize->dset, type_id, vlen_bufsize->mspace, vlen_bufsize->fspace, vlen_bufsize->xfer_pid, vlen_bufsize->fl_tbuf) < 0)
+ HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read point")
done:
FUNC_LEAVE_NOAPI(ret_value)