mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-01 16:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r1566] Changed C++ "operator" keyword to "op"

Browse Source
This commit is contained in:
Quincey Koziol 1999-08-10 13:54:06 -05:00
parent 03efcfe00f
commit 7d949c9da9
8 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/H5D.c
View File

@ -2609,7 +2609,7 @@ H5D_get_storage_size(H5D_t *dset)
* hid_t type_id; IN: Datatype ID for the elements stored in BUF.
* hid_t space_id; IN: Dataspace ID for BUF, also contains the
* selection to iterate over.
* H5D_operator_t operator; IN: Function pointer to the routine to be
* H5D_operator_t op; IN: Function pointer to the routine to be
* called for each element in BUF iterated over.
* void *operator_data; IN/OUT: Pointer to any user-defined data
* associated with the operation.
@ -2651,17 +2651,17 @@ H5D_get_storage_size(H5D_t *dset)
*-------------------------------------------------------------------------
*/
herr_t
H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t operator,
H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op,
void *operator_data)
{
H5S_t *space = NULL;
herr_t ret_value=FAIL;
FUNC_ENTER(H5Diterate, FAIL);
H5TRACE5("e","xiixx",buf,type_id,space_id,operator,operator_data);
H5TRACE5("e","xiixx",buf,type_id,space_id,op,operator_data);
/* Check args */
if (NULL==operator)
if (NULL==op)
HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid operator");
if (buf==NULL)
HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid buffer");
@ -2671,7 +2671,7 @@ H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t operator,
NULL == (space = H5I_object(space_id)))
HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid dataspace");
ret_value=H5S_select_iterate(buf,type_id,space,operator,operator_data);
ret_value=H5S_select_iterate(buf,type_id,space,op,operator_data);
FUNC_LEAVE(ret_value);
} /* end H5Diterate() */

2
src/H5Dpublic.h
View File

@ -61,7 +61,7 @@ __DLL__ herr_t H5Dwrite (hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
hid_t file_space_id, hid_t plist_id, const void *buf);
__DLL__ herr_t H5Dextend (hid_t dset_id, const hsize_t *size);
__DLL__ herr_t H5Diterate(void *buf, hid_t type_id, hid_t space_id,
H5D_operator_t operator, void *operator_data);
H5D_operator_t op, void *operator_data);
__DLL__ herr_t H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf);
__DLL__ herr_t H5Ddebug(hid_t dset_id, unsigned int flags);

10
src/H5Sall.c
View File

@ -924,11 +924,11 @@ H5S_all_bounds(H5S_t *space, hsize_t *start, hsize_t *end)
Iterate over a "all" selection, calling a user's function for each
element.
USAGE
herr_t H5S_all_select_iterate(buf, type_id, space, operator, operator_data)
herr_t H5S_all_select_iterate(buf, type_id, space, op, operator_data)
void *buf; IN/OUT: Buffer containing elements to iterate over
hid_t type_id; IN: Datatype ID of BUF array.
H5S_t *space; IN: Dataspace object containing selection to iterate over
H5D_operator_t operator; IN: Function pointer to the routine to be
H5D_operator_t op; IN: Function pointer to the routine to be
called for each element in BUF iterated over.
void *operator_data; IN/OUT: Pointer to any user-defined data
associated with the operation.
@ -951,7 +951,7 @@ H5S_all_bounds(H5S_t *space, hsize_t *start, hsize_t *end)
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
H5S_all_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t operator,
H5S_all_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op,
void *operator_data)
{
hsize_t mem_size[H5O_LAYOUT_NDIMS]; /* Dataspace size */
@ -967,7 +967,7 @@ H5S_all_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op
assert(buf);
assert(space);
assert(operator);
assert(op);
assert(H5I_DATATYPE == H5I_get_type(type_id));
/* Get the dataspace extent rank */
@ -989,7 +989,7 @@ H5S_all_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op
offset=H5V_array_offset(rank+1,mem_size,mem_offset);
tmp_buf=((char *)buf+offset);
ret_value=(*operator)(tmp_buf,type_id,rank,mem_offset,operator_data);
ret_value=(*op)(tmp_buf,type_id,rank,mem_offset,operator_data);
/* Decrement the number of elements to iterate through */
nelemts--;

10
src/H5Shyper.c
View File

@ -3088,11 +3088,11 @@ H5S_hyper_select_iterate_mem (intn dim, H5S_hyper_iter_info_t *iter_info)
Iterate over a hyperslab selection, calling a user's function for each
element.
USAGE
herr_t H5S_hyper_select_iterate(buf, type_id, space, operator, operator_data)
herr_t H5S_hyper_select_iterate(buf, type_id, space, op, operator_data)
void *buf; IN/OUT: Buffer containing elements to iterate over
hid_t type_id; IN: Datatype ID of BUF array.
H5S_t *space; IN: Dataspace object containing selection to iterate over
H5D_operator_t operator; IN: Function pointer to the routine to be
H5D_operator_t op; IN: Function pointer to the routine to be
called for each element in BUF iterated over.
void *operator_data; IN/OUT: Pointer to any user-defined data
associated with the operation.
@ -3115,7 +3115,7 @@ H5S_hyper_select_iterate_mem (intn dim, H5S_hyper_iter_info_t *iter_info)
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
H5S_hyper_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t operator,
H5S_hyper_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op,
void *operator_data)
{
H5S_hyper_bound_t **lo_bounds; /* Lower (closest to the origin) bound array for each dimension */
@ -3130,7 +3130,7 @@ H5S_hyper_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t
assert(buf);
assert(space);
assert(operator);
assert(op);
assert(H5I_DATATYPE == H5I_get_type(type_id));
/* Initialize these before any errors can occur */
@ -3170,7 +3170,7 @@ H5S_hyper_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t
iter_info.mem_size[space->extent.u.simple.rank]=iter_info.elem_size;
/* Copy the location of the region in the file */
iter_info.op=operator;
iter_info.op=op;
iter_info.op_data=operator_data;
/* Recursively input the hyperslabs currently defined */

8
src/H5Snone.c
View File

@ -106,11 +106,11 @@ done:
element. (i.e. the user's function is not called because there are
zero elements selected)
USAGE
herr_t H5S_none_select_iterate(buf, type_id, space, operator, operator_data)
herr_t H5S_none_select_iterate(buf, type_id, space, op, operator_data)
void *buf; IN/OUT: Buffer containing elements to iterate over
hid_t type_id; IN: Datatype ID of BUF array.
H5S_t *space; IN: Dataspace object containing selection to iterate over
H5D_operator_t operator; IN: Function pointer to the routine to be
H5D_operator_t op; IN: Function pointer to the routine to be
called for each element in BUF iterated over.
void *operator_data; IN/OUT: Pointer to any user-defined data
associated with the operation.
@ -123,7 +123,7 @@ done:
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
H5S_none_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t operator,
H5S_none_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op,
void UNUSED *operator_data)
{
herr_t ret_value=SUCCEED; /* return value */
@ -132,7 +132,7 @@ H5S_none_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t o
assert(buf);
assert(space);
assert(operator);
assert(op);
assert(H5I_DATATYPE == H5I_get_type(type_id));
FUNC_LEAVE (ret_value);

10
src/H5Spoint.c
View File

@ -1118,11 +1118,11 @@ H5S_point_select_contiguous(const H5S_t *space)
Iterate over a point selection, calling a user's function for each
element.
USAGE
herr_t H5S_point_select_iterate(buf, type_id, space, operator, operator_data)
herr_t H5S_point_select_iterate(buf, type_id, space, op, operator_data)
void *buf; IN/OUT: Buffer containing elements to iterate over
hid_t type_id; IN: Datatype ID of BUF array.
H5S_t *space; IN: Dataspace object containing selection to iterate over
H5D_operator_t operator; IN: Function pointer to the routine to be
H5D_operator_t op; IN: Function pointer to the routine to be
called for each element in BUF iterated over.
void *operator_data; IN/OUT: Pointer to any user-defined data
associated with the operation.
@ -1145,7 +1145,7 @@ H5S_point_select_contiguous(const H5S_t *space)
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
H5S_point_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t operator,
H5S_point_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op,
void *operator_data)
{
hsize_t mem_size[H5O_LAYOUT_NDIMS]; /* Dataspace size */
@ -1160,7 +1160,7 @@ H5S_point_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t
assert(buf);
assert(space);
assert(operator);
assert(op);
assert(H5I_DATATYPE == H5I_get_type(type_id));
/* Get the dataspace extent rank */
@ -1181,7 +1181,7 @@ H5S_point_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t
offset=H5V_array_offset(rank+1,mem_size,mem_offset);
tmp_buf=((char *)buf+offset);
ret_value=(*operator)(tmp_buf,type_id,rank,node->pnt,operator_data);
ret_value=(*op)(tmp_buf,type_id,rank,node->pnt,operator_data);
node=node->next;
} /* end while */

10
src/H5Sprivate.h
View File

@ -343,7 +343,7 @@ __DLL__ herr_t H5S_select_serialize(const H5S_t *space, uint8_t *buf);
__DLL__ herr_t H5S_select_deserialize(H5S_t *space, const uint8_t *buf);
__DLL__ htri_t H5S_select_contiguous(const H5S_t *space);
__DLL__ herr_t H5S_select_iterate(void *buf, hid_t type_id, H5S_t *space,
H5D_operator_t operator, void *operator_data);
H5D_operator_t op, void *operator_data);
/* Point select functions */
__DLL__ herr_t H5S_point_add(H5S_t *space, size_t num_elemn,
@ -358,7 +358,7 @@ __DLL__ herr_t H5S_point_select_deserialize(H5S_t *space, const uint8_t *buf);
__DLL__ herr_t H5S_point_bounds(H5S_t *space, hsize_t *start, hsize_t *end);
__DLL__ htri_t H5S_point_select_contiguous(const H5S_t *space);
__DLL__ herr_t H5S_point_select_iterate(void *buf, hid_t type_id, H5S_t *space,
H5D_operator_t operator, void *operator_data);
H5D_operator_t op, void *operator_data);
/* "All" select functions */
__DLL__ herr_t H5S_all_release(H5S_t *space);
@ -379,7 +379,7 @@ __DLL__ herr_t H5S_all_write(H5F_t *f, const struct H5O_layout_t *layout,
const H5F_xfer_t *xfer_parms, const void *buf,
hbool_t *must_convert/*out*/);
__DLL__ herr_t H5S_all_select_iterate(void *buf, hid_t type_id, H5S_t *space,
H5D_operator_t operator, void *operator_data);
H5D_operator_t op, void *operator_data);
/* Hyperslab selection functions */
__DLL__ herr_t H5S_hyper_add(H5S_t *space, const hssize_t *start,
@ -403,13 +403,13 @@ __DLL__ herr_t H5S_hyper_select_deserialize(H5S_t *space, const uint8_t *buf);
__DLL__ herr_t H5S_hyper_bounds(H5S_t *space, hsize_t *start, hsize_t *end);
__DLL__ htri_t H5S_hyper_select_contiguous(const H5S_t *space);
__DLL__ herr_t H5S_hyper_select_iterate(void *buf, hid_t type_id, H5S_t *space,
H5D_operator_t operator, void *operator_data);
H5D_operator_t op, void *operator_data);
/* "None" selection functions */
__DLL__ herr_t H5S_none_select_serialize(const H5S_t *space, uint8_t *buf);
__DLL__ herr_t H5S_none_select_deserialize(H5S_t *space, const uint8_t *buf);
__DLL__ herr_t H5S_none_select_iterate(void *buf, hid_t type_id, H5S_t *space,
H5D_operator_t operator, void *operator_data);
H5D_operator_t op, void *operator_data);
#ifdef HAVE_PARALLEL
/* MPI-IO function to read directly from app buffer to file rky980813 */

14
src/H5Sselect.c
View File

@ -1695,7 +1695,7 @@ H5S_select_contiguous(const H5S_t *space)
void *buf; IN/OUT: Buffer containing elements to iterate over
hid_t type_id; IN: Datatype ID of BUF array.
H5S_t *space; IN: Dataspace object containing selection to iterate over
H5D_operator_t operator; IN: Function pointer to the routine to be
H5D_operator_t op; IN: Function pointer to the routine to be
called for each element in BUF iterated over.
void *operator_data; IN/OUT: Pointer to any user-defined data
associated with the operation.
@ -1714,7 +1714,7 @@ H5S_select_contiguous(const H5S_t *space)
the selection is not modified.
--------------------------------------------------------------------------*/
herr_t
H5S_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t operator,
H5S_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op,
void *operator_data)
{
herr_t ret_value=FAIL;
@ -1724,24 +1724,24 @@ H5S_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t operat
/* Check args */
assert(buf);
assert(space);
assert(operator);
assert(op);
assert(H5I_DATATYPE == H5I_get_type(type_id));
switch(space->select.type) {
case H5S_SEL_POINTS: /* Sequence of points selected */
ret_value=H5S_point_select_iterate(buf,type_id,space,operator,operator_data);
ret_value=H5S_point_select_iterate(buf,type_id,space,op,operator_data);
break;
case H5S_SEL_HYPERSLABS: /* Hyperslab selection defined */
ret_value=H5S_hyper_select_iterate(buf,type_id,space,operator,operator_data);
ret_value=H5S_hyper_select_iterate(buf,type_id,space,op,operator_data);
break;
case H5S_SEL_ALL: /* Entire extent selected */
ret_value=H5S_all_select_iterate(buf,type_id,space,operator,operator_data);
ret_value=H5S_all_select_iterate(buf,type_id,space,op,operator_data);
break;
case H5S_SEL_NONE: /* Nothing selected */
ret_value=H5S_none_select_iterate(buf,type_id,space,operator,operator_data);
ret_value=H5S_none_select_iterate(buf,type_id,space,op,operator_data);
break;
case H5S_SEL_ERROR: