diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-04 15:06:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-04 15:06:28 (GMT) |
| commit | 59b51a2ea72ff98586372a454adfd8c790a62734 (patch) | |
| tree | 74173cf2dab79097c9dc8f116a22ad0138d310a2 /src/H5Adeprec.c | |
| parent | 302830e60108513d9ff2e710444dc0d0188c92ee (diff) | |
| download | hdf5-59b51a2ea72ff98586372a454adfd8c790a62734.zip hdf5-59b51a2ea72ff98586372a454adfd8c790a62734.tar.gz hdf5-59b51a2ea72ff98586372a454adfd8c790a62734.tar.bz2 | |
[svn-r14180] Description:
Make H5Aiterate() versioned and change all internal use to H5Aiterate2()
Leave some regression tests that exercise H5Aiterate1()
Fix attribute display in h5dump & h5ls to be "by name" by default
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'src/H5Adeprec.c')
| -rw-r--r-- | src/H5Adeprec.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c index 75f5191..9ca3d5a 100644 --- a/src/H5Adeprec.c +++ b/src/H5Adeprec.c @@ -377,19 +377,18 @@ H5Arename1(hid_t loc_id, const char *old_name, const char *new_name) done: FUNC_LEAVE_API(ret_value) } /* H5Arename1() */ -#endif /* H5_NO_DEPRECATED_SYMBOLS */ /*-------------------------------------------------------------------------- NAME - H5Aiterate + H5Aiterate1 PURPOSE Calls a user's function for each attribute on an object USAGE - herr_t H5Aiterate (loc_id, attr_num, op, data) + herr_t H5Aiterate1(loc_id, attr_num, op, data) hid_t loc_id; IN: Object (dataset or group) to be iterated over unsigned *attr_num; IN/OUT: Starting (IN) & Ending (OUT) attribute number - H5A_operator_t op; IN: User's function to pass each attribute to + H5A_operator1_t op; IN: User's function to pass each attribute to void *op_data; IN/OUT: User's data to pass through to iterator operator function RETURNS Returns a negative value if something is wrong, the return value of the @@ -414,16 +413,18 @@ done: C. Negative causes the iterator to immediately return that value, indicating failure. The iterator can be restarted at the next attribute. + NOTE + Deprecated in favor of H5Aiterate2 --------------------------------------------------------------------------*/ herr_t -H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, void *op_data) +H5Aiterate1(hid_t loc_id, unsigned *attr_num, H5A_operator1_t op, void *op_data) { H5A_attr_iter_op_t attr_op; /* Attribute operator */ hsize_t start_idx; /* Index of attribute to start iterating at */ hsize_t last_attr; /* Index of last attribute examined */ herr_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Aiterate, FAIL) + FUNC_ENTER_API(H5Aiterate1, FAIL) H5TRACE4("e", "i*Iux*x", loc_id, attr_num, op, op_data); /* check arguments */ @@ -445,9 +446,8 @@ H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, void *op_data) done: FUNC_LEAVE_API(ret_value) -} /* H5Aiterate() */ +} /* H5Aiterate1() */ -#ifndef H5_NO_DEPRECATED_SYMBOLS /*-------------------------------------------------------------------------- NAME |