summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-09-27 04:39:36 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-09-27 04:39:36 (GMT)
commitfbd659fe6feba18f9fd4f931535a6603ccbf763d (patch)
tree1ae3206878460119a5a3d7d26dad4c86786c8fae /src
parent0704819592498a9bcfffdeb367821a9d18888cf5 (diff)
downloadhdf5-fbd659fe6feba18f9fd4f931535a6603ccbf763d.zip
hdf5-fbd659fe6feba18f9fd4f931535a6603ccbf763d.tar.gz
hdf5-fbd659fe6feba18f9fd4f931535a6603ccbf763d.tar.bz2
[svn-r27891] Description:
Revert changes to 'all' and 'none' selections: the serialized header info is handled in the general H5S_select_deserialize() routine. Tested on: MacOSX/64 10.10.5 (amazon) w/serial & parallel (h5committest forthcoming)
Diffstat (limited to 'src')
-rw-r--r--src/H5Sall.c5
-rw-r--r--src/H5Snone.c5
2 files changed, 2 insertions, 8 deletions
diff --git a/src/H5Sall.c b/src/H5Sall.c
index 702f765..b8a39cc 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -559,7 +559,7 @@ H5S_all_serialize(const H5S_t *space, uint8_t **p)
REVISION LOG
--------------------------------------------------------------------------*/
static herr_t
-H5S_all_deserialize(H5S_t *space, const uint8_t **p)
+H5S_all_deserialize(H5S_t *space, const uint8_t H5_ATTR_UNUSED **p)
{
herr_t ret_value = SUCCEED; /* return value */
@@ -573,9 +573,6 @@ H5S_all_deserialize(H5S_t *space, const uint8_t **p)
if(H5S_select_all(space, TRUE) < 0)
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection")
- /* Advance decoding pointer */
- (*p) += 16;
-
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5S_all_deserialize() */
diff --git a/src/H5Snone.c b/src/H5Snone.c
index 77f8af7..19d5eed 100644
--- a/src/H5Snone.c
+++ b/src/H5Snone.c
@@ -527,7 +527,7 @@ H5S_none_serialize(const H5S_t *space, uint8_t **p)
REVISION LOG
--------------------------------------------------------------------------*/
static herr_t
-H5S_none_deserialize(H5S_t *space, const uint8_t **p)
+H5S_none_deserialize(H5S_t *space, const uint8_t H5_ATTR_UNUSED **p)
{
herr_t ret_value = SUCCEED; /* return value */
@@ -541,9 +541,6 @@ H5S_none_deserialize(H5S_t *space, const uint8_t **p)
if(H5S_select_none(space) < 0)
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection")
- /* Advance decoding pointer */
- (*p) += 16;
-
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5S_none_deserialize() */