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/H5IM.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/H5IM.c')
| -rw-r--r-- | hl/src/H5IM.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c index fa5f87d..ac90cf2 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -597,7 +597,7 @@ herr_t H5IMlink_palette( hid_t loc_id, goto out; /* The attribute must be deleted, in order to the new one can reflect the changes*/ - if(H5Adelete2(image_id, ".", "PALETTE", H5P_DEFAULT) < 0) + if(H5Adelete(image_id, "PALETTE") < 0) goto out; /* Create a new reference for this palette. */ @@ -719,24 +719,23 @@ herr_t H5IMunlink_palette( hid_t loc_id, /* Check if it is really a reference */ if(attr_class == H5T_REFERENCE) { - /* Delete the attribute */ - if(H5Adelete2(image_id, ".", "PALETTE", H5P_DEFAULT) < 0) + if(H5Adelete(image_id, "PALETTE") < 0) goto out; } /* H5T_REFERENCE */ - if ( H5Tclose( attr_type ) < 0) + if(H5Tclose(attr_type) < 0) goto out; /* Close the attribute. */ - if ( H5Aclose( attr_id ) < 0) + if(H5Aclose(attr_id) < 0) goto out; } /* ok_pal */ /* Close the image dataset. */ - if ( H5Dclose( image_id ) < 0) + if(H5Dclose(image_id) < 0) return -1; return 0; |