summaryrefslogtreecommitdiffstats
path: root/src/H5Sall.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-09-29 18:56:27 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-09-29 18:56:27 (GMT)
commit5c0a8cc86ebe85e1b46e20f253f09c86bdc83169 (patch)
tree1281be3f8a32432ead139af7381426c0a9fe92d5 /src/H5Sall.c
parent6f1dda474c22ee95b7cc132e703cd6a2ac596704 (diff)
downloadhdf5-5c0a8cc86ebe85e1b46e20f253f09c86bdc83169.zip
hdf5-5c0a8cc86ebe85e1b46e20f253f09c86bdc83169.tar.gz
hdf5-5c0a8cc86ebe85e1b46e20f253f09c86bdc83169.tar.bz2
[svn-r27912] Revert of r27887, which caused failures in the vds test. These
changes will be merged more carefully so we can more easily identify any errors that arise. Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) w/ gcc 4.9.2 serial and parallel (w/ MPICH 3.1.4)
Diffstat (limited to 'src/H5Sall.c')
-rw-r--r--src/H5Sall.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/H5Sall.c b/src/H5Sall.c
index fb6b45f..79796c3 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -516,25 +516,19 @@ 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(pp);
+ HDassert(*p);
/* Store the preamble information */
- 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;
+ 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 */
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5S_all_serialize() */