mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-30 15:32:37 +08:00
Minor normalization with 1.10
This commit is contained in:
Dana Robinson
parent
58d37c2295
commit
6388a6750f
@ -3147,8 +3147,8 @@ done:
|
||||
/*-------------------------------------------------------------------------
|
||||
* Function: H5D__chunk_hash_val
|
||||
*
|
||||
* Purpose: To calculate an index based on the dataset's scaled
|
||||
* coordinates and sizes of the faster dimensions.
|
||||
* Purpose: To calculate an index based on the dataset's scaled
|
||||
* coordinates and sizes of the faster dimensions.
|
||||
*
|
||||
* Return: Hash value index
|
||||
*
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||
|
||||
/*
|
||||
* Programmer: Quincey Koziol <koziol@ncsa.uiuc.edu>
|
||||
* Programmer: Quincey Koziol
|
||||
* Thursday, June 18, 1998
|
||||
*
|
||||
* Purpose: Hyperslab selection dataspace I/O functions.
|
||||
@ -1756,7 +1756,7 @@ H5S__hyper_iter_get_seq_list_gen(H5S_sel_iter_t *iter, size_t maxseq, size_t max
|
||||
/* Work back up through the dimensions */
|
||||
while(curr_dim >= 0) {
|
||||
/* Reset the current span */
|
||||
curr_span = ispan[curr_dim];
|
||||
curr_span = ispan[curr_dim];
|
||||
|
||||
/* Increment absolute position */
|
||||
abs_arr[curr_dim]++;
|
||||
@ -2110,15 +2110,15 @@ H5S__hyper_iter_get_seq_list_opt(H5S_sel_iter_t *iter, size_t maxseq, size_t max
|
||||
/* Read in data until an entire sequence can't be written out any longer */
|
||||
while(curr_rows > 0) {
|
||||
|
||||
#define DUFF_GUTS \
|
||||
/* Store the sequence information */ \
|
||||
off[curr_seq] = loc; \
|
||||
len[curr_seq] = actual_bytes; \
|
||||
\
|
||||
/* Increment sequence count */ \
|
||||
curr_seq++; \
|
||||
\
|
||||
/* Increment information to reflect block just processed */ \
|
||||
#define DUFF_GUTS \
|
||||
/* Store the sequence information */ \
|
||||
off[curr_seq] = loc; \
|
||||
len[curr_seq] = actual_bytes; \
|
||||
\
|
||||
/* Increment sequence count */ \
|
||||
curr_seq++; \
|
||||
\
|
||||
/* Increment information to reflect block just processed */ \
|
||||
loc += fast_dim_buf_off;
|
||||
|
||||
#ifdef NO_DUFFS_DEVICE
|
||||
@ -2574,7 +2574,6 @@ H5S__hyper_iter_get_seq_list_single(H5S_sel_iter_t *iter, size_t maxseq, size_t
|
||||
USAGE
|
||||
herr_t H5S__hyper_iter_get_seq_list(iter,maxseq,maxelem,nseq,nelem,off,len)
|
||||
H5S_t *space; IN: Dataspace containing selection to use.
|
||||
unsigned flags; IN: Flags for extra information about operation
|
||||
H5S_sel_iter_t *iter; IN/OUT: Selection iterator describing last
|
||||
position of interest in selection.
|
||||
size_t maxseq; IN: Maximum number of sequences to generate
|
||||
@ -2808,7 +2807,7 @@ done:
|
||||
FUNC_LEAVE_NOAPI(ret_value)
|
||||
} /* end H5S__hyper_new_span() */
|
||||
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
NAME
|
||||
H5S__hyper_new_span_info
|
||||
@ -4285,7 +4284,7 @@ H5S__hyper_deserialize(H5S_t **space, const uint8_t **p)
|
||||
/* Check for unknown flags */
|
||||
if(flags & ~H5S_SELECT_FLAG_BITS)
|
||||
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTLOAD, FAIL, "unknown flag for selection")
|
||||
} /* end if */
|
||||
}
|
||||
else {
|
||||
/* Skip over the remainder of the header */
|
||||
pp += 8;
|
||||
@ -4301,7 +4300,7 @@ H5S__hyper_deserialize(H5S_t **space, const uint8_t **p)
|
||||
|
||||
if(!*space) {
|
||||
/* Patch the rank of the allocated dataspace */
|
||||
(void)HDmemset(dims, 0, (size_t)rank * sizeof(dims[0]));
|
||||
HDmemset(dims, 0, (size_t)rank * sizeof(dims[0]));
|
||||
if(H5S_set_extent_simple(tmp_space, rank, dims, NULL) < 0)
|
||||
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't set dimensions")
|
||||
} /* end if */
|
||||
@ -4316,7 +4315,7 @@ H5S__hyper_deserialize(H5S_t **space, const uint8_t **p)
|
||||
|
||||
/* Sanity checks */
|
||||
HDassert(H5S_UNLIMITED == HSIZE_UNDEF);
|
||||
HDassert(version >= 2);
|
||||
HDassert(version >= H5S_HYPER_VERSION_2);
|
||||
|
||||
/* Decode start/stride/block/count */
|
||||
switch(enc_size) {
|
||||
@ -4462,7 +4461,7 @@ done:
|
||||
FUNC_LEAVE_NOAPI(ret_value)
|
||||
} /* end H5S__hyper_deserialize() */
|
||||
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
NAME
|
||||
H5S__hyper_span_blocklist
|
||||
@ -4567,7 +4566,7 @@ done:
|
||||
FUNC_LEAVE_NOAPI(ret_value)
|
||||
} /* end H5S__hyper_span_blocklist() */
|
||||
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
NAME
|
||||
H5S__get_select_hyper_blocklist
|
||||
@ -7061,7 +7060,7 @@ H5S__hyper_adjust_s(H5S_t *space, const hssize_t *offset)
|
||||
* simultaneous operations */
|
||||
H5S__hyper_adjust_s_helper(space->select.sel_info.hslab->span_lst, space->extent.rank, offset, 0, op_gen);
|
||||
} /* end if */
|
||||
} /* end if */
|
||||
}
|
||||
|
||||
done:
|
||||
FUNC_LEAVE_NOAPI(ret_value)
|
||||
@ -12175,7 +12174,7 @@ H5S_hyper_get_first_inc_block(const H5S_t *space, hsize_t clip_size,
|
||||
hbool_t *partial)
|
||||
{
|
||||
H5S_hyper_sel_t *hslab; /* Convenience pointer to hyperslab info */
|
||||
H5S_hyper_dim_t *diminfo; /* Convenience pointer to diminfo.opt in unlimited dimension */
|
||||
H5S_hyper_dim_t *diminfo; /* Convenience pointer to diminfo in unlimited dimension */
|
||||
hsize_t ret_value = 0;
|
||||
|
||||
FUNC_ENTER_NOAPI(0)
|
||||
|
||||
@ -78,7 +78,7 @@ static htri_t H5S__point_shape_same(const H5S_t *space1, const H5S_t *space2);
|
||||
static htri_t H5S__point_intersect_block(const H5S_t *space, const hsize_t *start, const hsize_t *end);
|
||||
static herr_t H5S__point_adjust_u(H5S_t *space, const hsize_t *offset);
|
||||
static herr_t H5S__point_adjust_s(H5S_t *space, const hssize_t *offset);
|
||||
static herr_t H5S__point_project_scalar(const H5S_t *spasce, hsize_t *offset);
|
||||
static herr_t H5S__point_project_scalar(const H5S_t *space, hsize_t *offset);
|
||||
static herr_t H5S__point_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset);
|
||||
static herr_t H5S__point_iter_init(const H5S_t *space, H5S_sel_iter_t *iter);
|
||||
static herr_t H5S__point_get_version_enc_size(const H5S_t *space, uint32_t *version, uint8_t *enc_size);
|
||||
@ -538,7 +538,7 @@ H5S__point_iter_get_seq_list(H5S_sel_iter_t *iter, size_t maxseq, size_t maxelem
|
||||
FUNC_LEAVE_NOAPI(ret_value)
|
||||
} /* end H5S__point_iter_get_seq_list() */
|
||||
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
NAME
|
||||
H5S__point_iter_release
|
||||
@ -873,7 +873,7 @@ done:
|
||||
FUNC_LEAVE_NOAPI(ret_value)
|
||||
} /* end H5S__copy_pnt_list() */
|
||||
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
NAME
|
||||
H5S__free_pnt_list
|
||||
@ -915,7 +915,7 @@ H5S__free_pnt_list(H5S_pnt_list_t *pnt_lst)
|
||||
FUNC_LEAVE_NOAPI_VOID
|
||||
} /* end H5S__free_pnt_list() */
|
||||
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
NAME
|
||||
H5S__point_copy
|
||||
@ -943,7 +943,7 @@ H5S__point_copy(H5S_t *dst, const H5S_t *src, hbool_t H5_ATTR_UNUSED share_selec
|
||||
|
||||
FUNC_ENTER_STATIC
|
||||
|
||||
/* Sanity check */
|
||||
/* Sanity checks */
|
||||
HDassert(src);
|
||||
HDassert(dst);
|
||||
|
||||
@ -1189,7 +1189,7 @@ H5S__point_serial_size(const H5S_t *space)
|
||||
|
||||
/* Determine the version and encoded size for point selection */
|
||||
if(H5S__point_get_version_enc_size(space, &version, &enc_size) < 0)
|
||||
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't determine hyper version")
|
||||
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't determine version and enc_size")
|
||||
|
||||
/* Basic number of bytes required to serialize point selection: */
|
||||
if(version >= H5S_POINT_VERSION_2)
|
||||
@ -1259,7 +1259,7 @@ H5S__point_serialize(const H5S_t *space, uint8_t **p)
|
||||
|
||||
/* Determine the version and encoded size for point selection info */
|
||||
if(H5S__point_get_version_enc_size(space, &version, &enc_size) < 0)
|
||||
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't determine hyper version")
|
||||
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't determine version and enc_size")
|
||||
|
||||
/* Store the preamble information */
|
||||
UINT32ENCODE(pp, (uint32_t)H5S_GET_SELECT_TYPE(space)); /* Store the type of selection */
|
||||
@ -1997,7 +1997,7 @@ done:
|
||||
FUNC_LEAVE_NOAPI(ret_value)
|
||||
} /* end H5S__point_shape_same() */
|
||||
|
||||
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
NAME
|
||||
H5S__point_intersect_block
|
||||
|
||||
@ -1171,7 +1171,7 @@ H5S_select_iter_init(H5S_sel_iter_t *sel_iter, const H5S_t *space,
|
||||
if(sel_iter->rank > 0) {
|
||||
H5MM_memcpy(sel_iter->dims, space->extent.size, sizeof(hsize_t) * space->extent.rank);
|
||||
H5MM_memcpy(sel_iter->sel_off, space->select.offset, sizeof(hsize_t) * space->extent.rank);
|
||||
} /* end if */
|
||||
}
|
||||
|
||||
/* Save the element size */
|
||||
sel_iter->elmt_size = elmt_size;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user