From f24a3a9a0254c54a9f80c2eb268b0217fdd065fd Mon Sep 17 00:00:00 2001 From: Pedro Vicente Nunes Date: Wed, 17 May 2006 14:55:12 -0500 Subject: [svn-r12353] Purpose: new function Description: added H5LTfind_attribute as a public function, a wrapper for the already existing private function H5LT_find_attribute Solution: Platforms tested: linux solaris Misc. update: --- hl/src/H5DSprivate.h | 5 ----- hl/src/H5DSpublic.h | 8 ++++++++ hl/src/H5LT.c | 23 +++++++++++++++++++++++ hl/src/H5LTprivate.h | 5 +++-- hl/src/H5LTpublic.h | 14 ++++++++++++++ 5 files changed, 48 insertions(+), 7 deletions(-) diff --git a/hl/src/H5DSprivate.h b/hl/src/H5DSprivate.h index 7356bcd..e47cf31 100644 --- a/hl/src/H5DSprivate.h +++ b/hl/src/H5DSprivate.h @@ -22,11 +22,6 @@ #include "H5DSpublic.h" -#define DIMENSION_SCALE_CLASS "DIMENSION_SCALE" -#define DIMENSION_LIST "DIMENSION_LIST" -#define REFERENCE_LIST "REFERENCE_LIST" -#define DIMENSION_LABELS "DIMENSION_LABELS" - /* attribute type of a DS dataset */ diff --git a/hl/src/H5DSpublic.h b/hl/src/H5DSpublic.h index 7d2afff..2acce89 100644 --- a/hl/src/H5DSpublic.h +++ b/hl/src/H5DSpublic.h @@ -15,6 +15,14 @@ #ifndef _H5DSpublic_H #define _H5DSpublic_H + + +#define DIMENSION_SCALE_CLASS "DIMENSION_SCALE" +#define DIMENSION_LIST "DIMENSION_LIST" +#define REFERENCE_LIST "REFERENCE_LIST" +#define DIMENSION_LABELS "DIMENSION_LABELS" + + typedef herr_t (*H5DS_iterate_t)(hid_t dset, unsigned dim, hid_t scale, void *visitor_data); diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index c779ef0..acc30b8 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -1754,6 +1754,29 @@ static herr_t find_attr( hid_t loc_id, const char *name, void *op_data) /*------------------------------------------------------------------------- + * Function: H5LTfind_attribute + * + * Purpose: Inquires if an attribute named attr_name exists attached to + * the object loc_id. + * + * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu + * + * Date: May 17, 2006 + * + * Comments: + * Calls the private version of the function + * + *------------------------------------------------------------------------- + */ + +herr_t H5LTfind_attribute( hid_t loc_id, const char* attr_name ) +{ + return H5LT_find_attribute(loc_id,attr_name); +} + + + +/*------------------------------------------------------------------------- * Function: H5LT_find_attribute * * Purpose: Inquires if an attribute named attr_name exists attached to the object loc_id. diff --git a/hl/src/H5LTprivate.h b/hl/src/H5LTprivate.h index 441c00c..426c223 100644 --- a/hl/src/H5LTprivate.h +++ b/hl/src/H5LTprivate.h @@ -35,8 +35,6 @@ H5_HLDLL herr_t H5LT_get_attribute_disk( hid_t obj_id, const char *attr_name, void *data ); -H5_HLDLL herr_t H5LT_find_attribute( hid_t loc_id, const char *name ); - H5_HLDLL herr_t H5LT_set_attribute_numerical( hid_t loc_id, const char *obj_name, const char *attr_name, @@ -48,6 +46,9 @@ H5_HLDLL herr_t H5LT_set_attribute_string( hid_t dset_id, const char *name, const char *buf ); +H5_HLDLL herr_t H5LT_find_attribute( hid_t loc_id, const char *name ); + + H5_HLDLL herr_t H5LT_dtype_to_text(hid_t dtype, char **dt_str, H5LT_lang_t lang, size_t *slen, hbool_t no_user_buf); diff --git a/hl/src/H5LTpublic.h b/hl/src/H5LTpublic.h index 32ae8de..ed078a7 100644 --- a/hl/src/H5LTpublic.h +++ b/hl/src/H5LTpublic.h @@ -346,6 +346,20 @@ H5_HLDLL herr_t H5LTrepack( hsize_t nfields, unsigned char *src_buf, unsigned char *dst_buf ); + + + +/*------------------------------------------------------------------------- + * + * Utility functions + * + *------------------------------------------------------------------------- + */ + +H5_HLDLL herr_t H5LTfind_attribute( hid_t loc_id, const char *name ); + + + #ifdef __cplusplus } #endif -- cgit v0.12