diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-21 02:18:45 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-09-21 02:18:45 (GMT) |
| commit | 0695d6366a670e1dd9b6b0ca463feec12ab659d7 (patch) | |
| tree | baf248c43e42f8a479fb46dd21a916180575ac9b /src/H5Spoint.c | |
| parent | 68659dd411a8ca3b0b2ef86eaaa7d5ba5d5bc449 (diff) | |
| parent | 8fc9a9ba251ea34ac5a943ad8eb7f6cf012b929d (diff) | |
| download | hdf5-0695d6366a670e1dd9b6b0ca463feec12ab659d7.zip hdf5-0695d6366a670e1dd9b6b0ca463feec12ab659d7.tar.gz hdf5-0695d6366a670e1dd9b6b0ca463feec12ab659d7.tar.bz2 | |
[svn-r27835] Description:
Sync w/trunk.
Tested on:
MacOSX/64 10.10.5 (amazon) w/serial & parallel
(h5committest not required on this branch)
Diffstat (limited to 'src/H5Spoint.c')
| -rw-r--r-- | src/H5Spoint.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/H5Spoint.c b/src/H5Spoint.c index 202da85..1a14254 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -20,7 +20,7 @@ * Purpose: Point selection data space I/O functions. */ -#define H5S_PACKAGE /*suppress error about including H5Spkg */ +#include "H5Smodule.h" /* This source code file is part of the H5S module */ #include "H5private.h" /* Generic Functions */ @@ -46,7 +46,7 @@ static herr_t H5S_point_deserialize(H5S_t *space, uint32_t version, uint8_t flag const uint8_t **p); static herr_t H5S_point_bounds(const H5S_t *space, hsize_t *start, hsize_t *end); static herr_t H5S_point_offset(const H5S_t *space, hsize_t *off); -static int H5S_point_unlim_dim(const H5S_t *space); +static int H5S__point_unlim_dim(const H5S_t *space); static htri_t H5S_point_is_contiguous(const H5S_t *space); static htri_t H5S_point_is_single(const H5S_t *space); static htri_t H5S_point_is_regular(const H5S_t *space); @@ -78,7 +78,7 @@ const H5S_select_class_t H5S_sel_point[1] = {{ H5S_point_deserialize, H5S_point_bounds, H5S_point_offset, - H5S_point_unlim_dim, + H5S__point_unlim_dim, NULL, H5S_point_is_contiguous, H5S_point_is_single, @@ -778,7 +778,7 @@ static hssize_t H5S_point_serial_size (const H5S_t *space) { H5S_pnt_node_t *curr; /* Point information nodes */ - hssize_t ret_value; /* return value */ + hssize_t ret_value = -1; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1193,11 +1193,11 @@ done: /*-------------------------------------------------------------------------- NAME - H5S_point_unlim_dim + H5S__point_unlim_dim PURPOSE Return unlimited dimension of selection, or -1 if none USAGE - int H5S_point_unlim_dim(space) + int H5S__point_unlim_dim(space) H5S_t *space; IN: Dataspace pointer to check RETURNS Unlimited dimension of selection, or -1 if none (never fails). @@ -1212,12 +1212,12 @@ done: REVISION LOG --------------------------------------------------------------------------*/ static int -H5S_point_unlim_dim(const H5S_t H5_ATTR_UNUSED *space) +H5S__point_unlim_dim(const H5S_t H5_ATTR_UNUSED *space) { - FUNC_ENTER_NOAPI_NOERR + FUNC_ENTER_STATIC_NOERR FUNC_LEAVE_NOAPI(-1) -} /* end H5S_point_unlim_dim() */ +} /* end H5S__point_unlim_dim() */ /*-------------------------------------------------------------------------- @@ -1244,7 +1244,7 @@ H5S_point_unlim_dim(const H5S_t H5_ATTR_UNUSED *space) static htri_t H5S_point_is_contiguous(const H5S_t *space) { - htri_t ret_value; /* return value */ + htri_t ret_value = FAIL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1281,7 +1281,7 @@ H5S_point_is_contiguous(const H5S_t *space) static htri_t H5S_point_is_single(const H5S_t *space) { - htri_t ret_value; /* return value */ + htri_t ret_value = FAIL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR @@ -1321,7 +1321,7 @@ H5S_point_is_single(const H5S_t *space) static htri_t H5S_point_is_regular(const H5S_t *space) { - htri_t ret_value; /* return value */ + htri_t ret_value = FAIL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOERR |