diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-30 16:07:20 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-30 16:07:20 (GMT) |
commit | dbff4af21c57cfd14f7f35a6799faad5087c0867 (patch) | |
tree | ce015ab8b594886613d43fd5bc5b4b6a5017fdc3 /hl | |
parent | aaddd739b4a3ebaf7d61a2c60dd4c3d9a08e0654 (diff) | |
download | hdf5-dbff4af21c57cfd14f7f35a6799faad5087c0867.zip hdf5-dbff4af21c57cfd14f7f35a6799faad5087c0867.tar.gz hdf5-dbff4af21c57cfd14f7f35a6799faad5087c0867.tar.bz2 |
[svn-r14217] Description:
Change H5Aopen -> H5Aopen_by_name, in order to be more consistent with
other new API routines.
Re-add H5Aopen as a simpler routine, to open attributes on a particular
object. (Much like the old H5Aopen_name routine).
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')
-rw-r--r-- | hl/fortran/src/H5IMcc.c | 2 | ||||
-rw-r--r-- | hl/src/H5DS.c | 26 | ||||
-rw-r--r-- | hl/src/H5IM.c | 18 | ||||
-rw-r--r-- | hl/src/H5LT.c | 8 |
4 files changed, 27 insertions, 27 deletions
diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c index 651c60b..e33edb1 100644 --- a/hl/fortran/src/H5IMcc.c +++ b/hl/fortran/src/H5IMcc.c @@ -485,7 +485,7 @@ herr_t H5IM_get_palette(hid_t loc_id, if(has_pal == 1) { - if((attr_id = H5Aopen(image_id, ".", "PALETTE", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0) goto out; if((attr_type = H5Aget_type(attr_id)) < 0) diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index 070ab23..f8527fd 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -297,7 +297,7 @@ herr_t H5DSattach_scale(hid_t did, else if ( has_dimlist == 1 ) { - if((aid = H5Aopen(did, ".", DIMENSION_LIST, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0) goto out; if((tid = H5Aget_type(aid)) < 0) @@ -450,7 +450,7 @@ herr_t H5DSattach_scale(hid_t did, else if(has_reflist == 1) { - if((aid = H5Aopen(dsid, ".", REFERENCE_LIST, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0) goto out; if((tid = H5Aget_type(aid)) < 0) @@ -674,7 +674,7 @@ herr_t H5DSdetach_scale(hid_t did, *------------------------------------------------------------------------- */ - if((aid = H5Aopen(did, ".", DIMENSION_LIST, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0) return FAIL; if((tid = H5Aget_type(aid)) < 0) @@ -758,7 +758,7 @@ herr_t H5DSdetach_scale(hid_t did, *------------------------------------------------------------------------- */ - if((aid = H5Aopen(dsid, ".", REFERENCE_LIST, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0) goto out; if((tid = H5Aget_type(aid)) < 0) @@ -1019,7 +1019,7 @@ htri_t H5DSis_attached(hid_t did, if(has_dimlist == 1) { - if((aid = H5Aopen(did, ".", DIMENSION_LIST, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0) goto out; if((tid = H5Aget_type(aid)) < 0) @@ -1096,7 +1096,7 @@ htri_t H5DSis_attached(hid_t did, if(has_reflist == 1) { - if((aid = H5Aopen(dsid, ".", REFERENCE_LIST, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(dsid, REFERENCE_LIST, H5P_DEFAULT)) < 0) goto out; if((tid = H5Aget_type(aid)) < 0) @@ -1278,7 +1278,7 @@ herr_t H5DSiterate_scales(hid_t did, else if(has_dimlist == 1) { - if((aid = H5Aopen(did, ".", DIMENSION_LIST, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0) goto out; if((tid = H5Aget_type(aid)) < 0) goto out; @@ -1488,7 +1488,7 @@ herr_t H5DSset_label(hid_t did, else { - if((aid = H5Aopen(did, ".", DIMENSION_LABELS, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(did, DIMENSION_LABELS, H5P_DEFAULT)) < 0) goto out; if((tid = H5Aget_type(aid)) < 0) @@ -1614,7 +1614,7 @@ ssize_t H5DSget_label(hid_t did, */ assert (has_labels == 1); - if((aid = H5Aopen(did, ".", DIMENSION_LABELS, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(did, DIMENSION_LABELS, H5P_DEFAULT)) < 0) goto out; if((tid = H5Aget_type(aid)) < 0) @@ -1730,7 +1730,7 @@ ssize_t H5DSget_scale_name(hid_t did, *------------------------------------------------------------------------- */ - if((aid = H5Aopen(did, ".", "NAME", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(did, "NAME", H5P_DEFAULT)) < 0) return FAIL; /* get space */ @@ -1839,7 +1839,7 @@ htri_t H5DSis_scale(hid_t did) else { - if((aid = H5Aopen(did, ".", "CLASS", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0) goto out; if((tid = H5Aget_type(aid)) < 0) @@ -1950,7 +1950,7 @@ int H5DSget_num_scales(hid_t did, else { - if((aid = H5Aopen(did, ".", DIMENSION_LIST, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(did, DIMENSION_LIST, H5P_DEFAULT)) < 0) goto out; if((tid = H5Aget_type(aid)) < 0) goto out; @@ -2029,7 +2029,7 @@ herr_t H5DS_is_reserved(hid_t did) return 0; assert(has_class == 1); - if((aid = H5Aopen(did, ".", "CLASS", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0) goto out; if((tid = H5Aget_type(aid)) < 0) diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c index 1405f8d..cf2ea80 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -263,7 +263,7 @@ herr_t H5IMget_image_info( hid_t loc_id, if(has_attr == 1) { - if((attr_id = H5Aopen(did, ".", "INTERLACE_MODE", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(did, "INTERLACE_MODE", H5P_DEFAULT)) < 0) goto out; if((attr_type = H5Aget_type(attr_id)) < 0) @@ -332,7 +332,7 @@ herr_t H5IMget_image_info( hid_t loc_id, if(has_pal == 1) { - if((attr_id = H5Aopen(did, ".", "PALETTE", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(did, "PALETTE", H5P_DEFAULT)) < 0) goto out; if((attr_type = H5Aget_type(attr_id)) < 0) @@ -574,7 +574,7 @@ herr_t H5IMlink_palette( hid_t loc_id, */ else if(ok_pal == 1) { - if((attr_id = H5Aopen(image_id, ".", "PALETTE", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0) goto out; if((attr_type = H5Aget_type(attr_id)) < 0) @@ -707,7 +707,7 @@ herr_t H5IMunlink_palette( hid_t loc_id, /* The attribute exists, open it */ else if(ok_pal == 1) { - if((attr_id = H5Aopen(image_id, ".", "PALETTE", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0) goto out; if((attr_type = H5Aget_type(attr_id)) < 0) @@ -789,7 +789,7 @@ herr_t H5IMget_npalettes( hid_t loc_id, if(has_pal == 1 ) { - if((attr_id = H5Aopen(image_id, ".", "PALETTE", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0) goto out; if((attr_type = H5Aget_type(attr_id)) < 0) @@ -881,7 +881,7 @@ herr_t H5IMget_palette_info( hid_t loc_id, if(has_pal == 1) { - if((attr_id = H5Aopen(image_id, ".", "PALETTE", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0) goto out; if((attr_type = H5Aget_type(attr_id)) < 0) @@ -993,7 +993,7 @@ herr_t H5IMget_palette( hid_t loc_id, if(has_pal == 1 ) { - if((attr_id = H5Aopen(image_id, ".", "PALETTE", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(image_id, "PALETTE", H5P_DEFAULT)) < 0) goto out; if((attr_type = H5Aget_type(attr_id)) < 0) @@ -1098,7 +1098,7 @@ herr_t H5IMis_image( hid_t loc_id, else if(has_class == 1) { - if((attr_id = H5Aopen(did, ".", "CLASS", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0) goto out; if((attr_type = H5Aget_type(attr_id)) < 0) @@ -1183,7 +1183,7 @@ herr_t H5IMis_palette( hid_t loc_id, else if(has_class == 1) { - if((attr_id = H5Aopen(did, ".", "CLASS", H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(did, "CLASS", H5P_DEFAULT)) < 0) goto out; if((attr_type = H5Aget_type(attr_id)) < 0) diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index ca56d69..9b58b46 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -1456,7 +1456,7 @@ herr_t H5LTget_attribute_ndims( hid_t loc_id, return -1; /* Open the attribute. */ - if((attr_id = H5Aopen(obj_id, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(obj_id, attr_name, H5P_DEFAULT)) < 0) { H5Oclose(obj_id); return -1; @@ -1523,7 +1523,7 @@ herr_t H5LTget_attribute_info( hid_t loc_id, return -1; /* Open the attribute. */ - if((attr_id = H5Aopen(obj_id, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(obj_id, attr_name, H5P_DEFAULT)) < 0) { H5Oclose(obj_id); return -1; @@ -2733,7 +2733,7 @@ static herr_t H5LT_get_attribute_mem(hid_t loc_id, if((obj_id = H5Oopen(loc_id, obj_name, H5P_DEFAULT)) < 0) goto out; - if((attr_id = H5Aopen(obj_id, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Aopen(obj_id, attr_name, H5P_DEFAULT)) < 0) goto out; if(H5Aread(attr_id, mem_type_id, data) < 0) @@ -2782,7 +2782,7 @@ herr_t H5LT_get_attribute_disk( hid_t loc_id, hid_t attr_id; hid_t attr_type; - if(( attr_id = H5Aopen(loc_id, ".", attr_name, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if(( attr_id = H5Aopen(loc_id, attr_name, H5P_DEFAULT)) < 0) return -1; if((attr_type = H5Aget_type(attr_id)) < 0) |