summaryrefslogtreecommitdiffstats
path: root/src/H5Sall.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-09-27 01:39:06 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-09-27 01:39:06 (GMT)
commit6f1dda474c22ee95b7cc132e703cd6a2ac596704 (patch)
tree84af5241f80a9c0a1e321a80508dc14a2b6ee711 /src/H5Sall.c
parent574ff3980afe62f83660cb2c617154e85ab128fd (diff)
parent8186a5cee10c41e97ba24b6fe1de9f6ce0c3902d (diff)
downloadhdf5-6f1dda474c22ee95b7cc132e703cd6a2ac596704.zip
hdf5-6f1dda474c22ee95b7cc132e703cd6a2ac596704.tar.gz
hdf5-6f1dda474c22ee95b7cc132e703cd6a2ac596704.tar.bz2
[svn-r27887] Description:
Merge changes from trunk to the branch. Tested on: MacOSX/64 10.10.5 (amazon) w/serial & parallel (h5committest not required on this branch)
Diffstat (limited to 'src/H5Sall.c')
-rw-r--r--src/H5Sall.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/H5Sall.c b/src/H5Sall.c
index 79796c3..fb6b45f 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -516,19 +516,25 @@ H5S_all_serial_size (const H5S_t H5_ATTR_UNUSED *space)
REVISION LOG
--------------------------------------------------------------------------*/
static herr_t
-H5S_all_serialize (const H5S_t *space, uint8_t **p)
+H5S_all_serialize(const H5S_t *space, uint8_t **p)
{
+ uint8_t *pp = (*p); /* Local pointer for decoding */
+
FUNC_ENTER_NOAPI_NOINIT_NOERR
+ /* Check args */
HDassert(space);
HDassert(p);
- HDassert(*p);
+ HDassert(pp);
/* Store the preamble information */
- UINT32ENCODE(*p, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */
- UINT32ENCODE(*p, (uint32_t)1); /* Store the version number */
- UINT32ENCODE(*p, (uint32_t)0); /* Store the un-used padding */
- UINT32ENCODE(*p, (uint32_t)0); /* Store the additional information length */
+ UINT32ENCODE(pp, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */
+ UINT32ENCODE(pp, (uint32_t)1); /* Store the version number */
+ UINT32ENCODE(pp, (uint32_t)0); /* Store the un-used padding */
+ UINT32ENCODE(pp, (uint32_t)0); /* Store the additional information length */
+
+ /* Update encoding pointer */
+ *p = pp;
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5S_all_serialize() */