diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-30 18:13:48 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-30 18:13:48 (GMT) |
commit | 0e06a92d0e1e129c46f27115f2b15ca2995ac59e (patch) | |
tree | d1d035c68ed9725b7c74b5dcb5c1b3b9625258dd /hl | |
parent | dbff4af21c57cfd14f7f35a6799faad5087c0867 (diff) | |
download | hdf5-0e06a92d0e1e129c46f27115f2b15ca2995ac59e.zip hdf5-0e06a92d0e1e129c46f27115f2b15ca2995ac59e.tar.gz hdf5-0e06a92d0e1e129c46f27115f2b15ca2995ac59e.tar.bz2 |
[svn-r14218] Description:
Changed H5Acreate2 -> H5Acreate_by_name, to be more consistent with
other new API routines.
Re-added simpler form of H5Acreate2, which creates attributes directly
on an object.
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/src/H5DS.c | 10 | ||||
-rw-r--r-- | hl/src/H5IM.c | 4 | ||||
-rw-r--r-- | hl/src/H5LT.c | 6 | ||||
-rw-r--r-- | hl/src/H5TB.c | 10 |
4 files changed, 15 insertions, 15 deletions
diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index f8527fd..7b59c18 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -249,7 +249,7 @@ herr_t H5DSattach_scale(hid_t did, goto out; /* create the attribute */ - if((aid = H5Acreate2(did, ".", DIMENSION_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Acreate2(did, DIMENSION_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; /* allocate and initialize the VL */ @@ -421,7 +421,7 @@ herr_t H5DSattach_scale(hid_t did, goto out; /* create the attribute */ - if((aid = H5Acreate2(dsid, ".", REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; /* store the IDX information */ @@ -505,7 +505,7 @@ herr_t H5DSattach_scale(hid_t did, free(dims); /* create the attribute again with the changes of space */ - if((aid = H5Acreate2(dsid, ".", REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; /* write the attribute with the new references */ @@ -859,7 +859,7 @@ herr_t H5DSdetach_scale(hid_t did, goto out; /* create the attribute again with the changes of space */ - if((aid = H5Acreate2(dsid, ".", REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Acreate2(dsid, REFERENCE_LIST, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; /* write the new attribute with the new references */ @@ -1451,7 +1451,7 @@ herr_t H5DSset_label(hid_t did, goto out; /* create the attribute */ - if((aid = H5Acreate2(did, ".", DIMENSION_LABELS, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Acreate2(did, DIMENSION_LABELS, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; /* allocate and initialize */ diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c index cf2ea80..0cc79e4 100644 --- a/hl/src/H5IM.c +++ b/hl/src/H5IM.c @@ -547,7 +547,7 @@ herr_t H5IMlink_palette( hid_t loc_id, goto out; /* Create the attribute "PALETTE" to be attached to the image*/ - if((attr_id = H5Acreate2(image_id, ".", "PALETTE", attr_type, attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Acreate2(image_id, "PALETTE", attr_type, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; /* Create a reference. The reference is created on the local id. */ @@ -617,7 +617,7 @@ herr_t H5IMlink_palette( hid_t loc_id, if(H5Aclose(attr_id) < 0) goto out; - if((attr_id = H5Acreate2(image_id, ".", "PALETTE", attr_type, attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Acreate2(image_id, "PALETTE", attr_type, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; /* Write the attribute with the new references */ diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index 9b58b46..84b0cea 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -888,7 +888,7 @@ herr_t H5LTset_attribute_string( hid_t loc_id, /* Create and write the attribute */ - if((attr_id = H5Acreate2(obj_id, ".", attr_name, attr_type, attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Acreate2(obj_id, attr_name, attr_type, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; if(H5Awrite(attr_id, attr_type, attr_data) < 0) @@ -965,7 +965,7 @@ herr_t H5LT_set_attribute_numerical( hid_t loc_id, goto out; /* Create the attribute. */ - if((attr_id = H5Acreate2(obj_id, ".", attr_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Acreate2(obj_id, attr_name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; /* Write the attribute data. */ @@ -2866,7 +2866,7 @@ herr_t H5LT_set_attribute_string(hid_t dset_id, * create and write the attribute *------------------------------------------------------------------------- */ - if((aid = H5Acreate2(dset_id, ".", name, tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((aid = H5Acreate2(dset_id, name, tid, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; if(H5Awrite(aid, tid, buf) < 0) diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c index 2471466..3502b3a 100644 --- a/hl/src/H5TB.c +++ b/hl/src/H5TB.c @@ -220,7 +220,7 @@ herr_t H5TBmake_table( const char *table_title, sprintf(aux, "%s", "_FILL"); strcat(attr_name, aux); - if((attr_id = H5Acreate2(did, ".", attr_name, field_types[i], sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Acreate2(did, attr_name, field_types[i], sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; if(H5Awrite(attr_id, field_types[i], tmp_buf+field_offset[i]) < 0) @@ -1977,7 +1977,7 @@ herr_t H5TBcombine_tables( hid_t loc_id1, sprintf(aux, "%s", "_FILL"); strcat(attr_name, aux); - if((attr_id = H5Acreate2(dataset_id3, ".", attr_name, member_type_id, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Acreate2(dataset_id3, attr_name, member_type_id, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; if(H5Awrite(attr_id, member_type_id, tmp_fill_buf+member_offset) < 0) @@ -2550,7 +2550,7 @@ herr_t H5TBinsert_field( hid_t loc_id, sprintf(aux, "%s", "_FILL"); strcat(attr_name, aux); - if((attr_id = H5Acreate2(dataset_id1, ".", attr_name, member_type_id, space_id1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Acreate2(dataset_id1, attr_name, member_type_id, space_id1, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; if(H5Awrite(attr_id, member_type_id, tmp_fill_buf+member_offset) < 0) @@ -2581,7 +2581,7 @@ herr_t H5TBinsert_field( hid_t loc_id, if((member_type_id = H5Tget_member_type(type_id1, (unsigned)nfields - 1)) < 0) goto out; - if((attr_id = H5Acreate2(dataset_id1, ".", attr_name, member_type_id, space_id1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Acreate2(dataset_id1, attr_name, member_type_id, space_id1, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; if(H5Awrite(attr_id, member_type_id, fill_data) < 0) @@ -3035,7 +3035,7 @@ herr_t H5TBdelete_field( hid_t loc_id, sprintf(aux, "%s", "_FILL"); strcat(attr_name, aux); - if((attr_id = H5Acreate2(dataset_id1, ".", attr_name, member_type_id, space_id1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) + if((attr_id = H5Acreate2(dataset_id1, attr_name, member_type_id, space_id1, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto out; if(H5Awrite(attr_id, member_type_id, tmp_fill_buf+member_offset) < 0) |