diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2007-01-23 14:09:31 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-01-23 14:09:31 (GMT) |
commit | 599d4141fad83b181d11adb17ca645877706308b (patch) | |
tree | a215d6b7d278f546ea6054e038298dd34e53373d /src/H5S.c | |
parent | 0c9bd3d4e27b7188825c6e71fc47931fdfb8ed1c (diff) | |
download | hdf5-599d4141fad83b181d11adb17ca645877706308b.zip hdf5-599d4141fad83b181d11adb17ca645877706308b.tar.gz hdf5-599d4141fad83b181d11adb17ca645877706308b.tar.bz2 |
[svn-r13177] Description:
Final tweaks before the big twist to fix shared message method calling.
Tested on:
Mac OS X/32 10.4.8 (amazon)
FreeBSD/32 6.2 (duty)
Diffstat (limited to 'src/H5S.c')
-rw-r--r-- | src/H5S.c | 44 |
1 files changed, 22 insertions, 22 deletions
@@ -602,20 +602,20 @@ herr_t H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src) { unsigned u; - herr_t ret_value=SUCCEED; /* Return value */ + herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5S_extent_copy, FAIL); + FUNC_ENTER_NOAPI(H5S_extent_copy, FAIL) /* Copy the regular fields */ - dst->type=src->type; - dst->nelem=src->nelem; - dst->rank=src->rank; + dst->type = src->type; + dst->nelem = src->nelem; + dst->rank = src->rank; switch (src->type) { case H5S_NULL: case H5S_SCALAR: - dst->size=NULL; - dst->max=NULL; + dst->size = NULL; + dst->max = NULL; break; case H5S_SIMPLE: @@ -636,17 +636,17 @@ H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src) break; default: - assert("unknown data space type" && 0); + HDassert("unknown data space type" && 0); break; - } + } /* end switch */ /* Copy the shared object info */ if(NULL == H5O_msg_copy(H5O_SHARED_ID, &(src->sh_loc), &(dst->sh_loc))) - HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "can't copy shared information"); + HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "can't copy shared information") done: - FUNC_LEAVE_NOAPI(ret_value); -} + FUNC_LEAVE_NOAPI(ret_value) +} /* end H5S_extent_copy() */ /*------------------------------------------------------------------------- @@ -676,25 +676,25 @@ H5S_copy(const H5S_t *src, hbool_t share_selection) H5S_t *dst = NULL; H5S_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI(H5S_copy, NULL); + FUNC_ENTER_NOAPI(H5S_copy, NULL) - if (NULL==(dst = H5FL_MALLOC(H5S_t))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); + if(NULL == (dst = H5FL_MALLOC(H5S_t))) + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Copy the source dataspace's extent */ - if (H5S_extent_copy(&(dst->extent),&(src->extent))<0) - HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, NULL, "can't copy extent"); + if(H5S_extent_copy(&(dst->extent), &(src->extent)) < 0) + HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, NULL, "can't copy extent") /* Copy the source dataspace's selection */ - if (H5S_select_copy(dst,src,share_selection)<0) - HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, NULL, "can't copy select"); + if(H5S_select_copy(dst, src, share_selection) < 0) + HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, NULL, "can't copy select") /* Set the return value */ - ret_value=dst; + ret_value = dst; done: - FUNC_LEAVE_NOAPI(ret_value); -} + FUNC_LEAVE_NOAPI(ret_value) +} /* end H5S_copy() */ /*------------------------------------------------------------------------- |