summaryrefslogtreecommitdiffstats
path: root/src/H5Sselect.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2019-01-11 05:08:51 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2019-01-11 05:08:51 (GMT)
commit4729d04d9123e8cd6b2bba071695ace7ddd2a7b5 (patch)
tree42848d0a2f27cb5547ae1690e08e90ed0a96ddb8 /src/H5Sselect.c
parentb9c8ddbfcc3be04e81718a351067f57e7e444ca1 (diff)
downloadhdf5-4729d04d9123e8cd6b2bba071695ace7ddd2a7b5.zip
hdf5-4729d04d9123e8cd6b2bba071695ace7ddd2a7b5.tar.gz
hdf5-4729d04d9123e8cd6b2bba071695ace7ddd2a7b5.tar.bz2
Delta reduction against hyperslab_updates branch.
Diffstat (limited to 'src/H5Sselect.c')
-rw-r--r--src/H5Sselect.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index ea10517..dd656b1 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -1515,14 +1515,20 @@ H5S_select_iterate(void *buf, const H5T_t *type, const H5S_t *space,
/* Make the application callback */
user_ret = (op->u.app_op.op)(loc, op->u.app_op.type_id, ndims, coords, op_data);
break;
+
case H5S_SEL_ITER_OP_LIB:
/* Call the library's callback */
user_ret = (op->u.lib_op)(loc, type, ndims, coords, op_data);
break;
+
default:
HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "unsupported op type")
} /* end switch */
+ /* Check for error return from iterator */
+ if(user_ret < 0)
+ HERROR(H5E_DATASPACE, H5E_CANTNEXT, "iteration operator failed");
+
/* Increment offset in dataspace */
curr_off += elmt_size;
@@ -1709,10 +1715,6 @@ H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2)
HDassert(space_a_rank >= space_b_rank);
HDassert(space_b_rank > 0);
- /* Check for different number of elements selected */
- if(H5S_GET_SELECT_NPOINTS(space_a) != H5S_GET_SELECT_NPOINTS(space_b))
- HGOTO_DONE(FALSE)
-
/* Check for "easy" cases before getting into generalized block iteration code */
if((H5S_GET_SELECT_TYPE(space_a) == H5S_SEL_ALL) && (H5S_GET_SELECT_TYPE(space_b) == H5S_SEL_ALL)) {
hsize_t dims1[H5O_LAYOUT_NDIMS]; /* End point of selection block in dataspace #1 */