diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-30 20:37:39 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-30 20:37:39 (GMT) |
| commit | f85474466864d1a8b675387b623bebd89bbdc57e (patch) | |
| tree | adff43d26b9d543d2921f09409ba81193566a247 /hl/src/H5LT.c | |
| parent | 1aa608c06bab83e16dfa677f0c528f2447ce6d65 (diff) | |
| download | hdf5-f85474466864d1a8b675387b623bebd89bbdc57e.zip hdf5-f85474466864d1a8b675387b623bebd89bbdc57e.tar.gz hdf5-f85474466864d1a8b675387b623bebd89bbdc57e.tar.bz2 | |
[svn-r14222] Description:
Change H5Adelete2 -> H5Adelete_by_name and un-deprecate H5Adelete1 back
to H5Adelete, for better consistency with new other API routiens.
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-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, 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 'hl/src/H5LT.c')
| -rw-r--r-- | hl/src/H5LT.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index d794912..d47fad1 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -883,7 +883,7 @@ herr_t H5LTset_attribute_string( hid_t loc_id, /* The attribute already exists, delete it */ if(has_attr == 1) - if(H5Adelete2(obj_id, ".", attr_name, H5P_DEFAULT) < 0) + if(H5Adelete(obj_id, attr_name) < 0) goto out; /* Create and write the attribute */ @@ -961,7 +961,7 @@ herr_t H5LT_set_attribute_numerical( hid_t loc_id, /* The attribute already exists, delete it */ if(has_attr == 1) - if(H5Adelete2(obj_id, ".", attr_name, H5P_DEFAULT) < 0) + if(H5Adelete(obj_id, attr_name) < 0) goto out; /* Create the attribute. */ @@ -2837,22 +2837,20 @@ herr_t H5LT_set_attribute_string(hid_t dset_id, has_attr = H5LT_find_attribute(dset_id,name); /* the attribute already exists, delete it */ - if ( has_attr == 1 ) - { - if(H5Adelete2(dset_id, ".", name, H5P_DEFAULT) < 0) + if(has_attr == 1) + if(H5Adelete(dset_id, name) < 0) return FAIL; - } /*------------------------------------------------------------------------- * create the attribute type *------------------------------------------------------------------------- */ - if ((tid = H5Tcopy(H5T_C_S1)) < 0) + if((tid = H5Tcopy(H5T_C_S1)) < 0) return FAIL; size = strlen(buf) + 1; /* extra null term */ - if (H5Tset_size(tid,(size_t)size) < 0) + if(H5Tset_size(tid,(size_t)size) < 0) goto out; if(H5Tset_strpad(tid, H5T_STR_NULLTERM) < 0) |