From 2fbf60fb900d6bcf7ac1a2bbf539396903b72edd Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 26 Sep 2015 21:47:42 -0500 Subject: [svn-r27888] Description: Fix typo in last checkin. *sigh* Tested on: MacOSX/64 10.10.5 (amazon) w/serial & parallel (h5committest forthcoming) --- src/H5Shyper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 5ed1722..10bcdd6 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -2021,7 +2021,7 @@ H5S_hyper_serialize_helper(const H5S_hyper_span_info_t *spans, /* Recurse down to the next dimension */ *p = pp; - H5S_hyper_serialize_helper(curr->down, start, end, rank = 1, p); + H5S_hyper_serialize_helper(curr->down, start, end, rank + 1, p); } /* end if */ else { /* Encode all the previous dimensions starting & ending points */ -- cgit v0.12 From f45d7b4b7a784997c98c2b0ed0da2ab4575fe340 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 26 Sep 2015 21:55:02 -0500 Subject: [svn-r27889] Description: Advance the decoding pointer for 'all' and 'none' selections properly. Tested on: MacOSX/64 10.10.5 (amazon) w/serial & parallel (h5committest forthcoming) --- src/H5Sall.c | 5 ++++- src/H5Snone.c | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/H5Sall.c b/src/H5Sall.c index b8a39cc..702f765 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 H5_ATTR_UNUSED **p) +H5S_all_deserialize(H5S_t *space, const uint8_t **p) { herr_t ret_value = SUCCEED; /* return value */ @@ -573,6 +573,9 @@ H5S_all_deserialize(H5S_t *space, const uint8_t H5_ATTR_UNUSED **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 19d5eed..fe8829f 100644 --- a/src/H5Snone.c +++ b/src/H5Snone.c @@ -541,6 +541,9 @@ H5S_none_deserialize(H5S_t *space, const uint8_t H5_ATTR_UNUSED **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() */ -- cgit v0.12 From 0704819592498a9bcfffdeb367821a9d18888cf5 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 26 Sep 2015 21:57:02 -0500 Subject: [svn-r27890] Description: Remove 'unused' attribute from decoding pointer flag that I missed in the last checkin. Tested on: MacOSX/64 10.10.5 (amazon) w/serial & parallel (h5committest forthcoming) --- src/H5Snone.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/H5Snone.c b/src/H5Snone.c index fe8829f..77f8af7 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 H5_ATTR_UNUSED **p) +H5S_none_deserialize(H5S_t *space, const uint8_t **p) { herr_t ret_value = SUCCEED; /* return value */ -- cgit v0.12 From fbd659fe6feba18f9fd4f931535a6603ccbf763d Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 26 Sep 2015 23:39:36 -0500 Subject: [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) --- src/H5Sall.c | 5 +---- src/H5Snone.c | 5 +---- 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() */ -- cgit v0.12