diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-28 19:47:00 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-28 19:47:00 (GMT) |
| commit | a84811bfb889762150014188680fad0ce05877ba (patch) | |
| tree | e2dac8f7d6d8a7c0e306d3706e4433bd31e70f0c /tools/h5repack | |
| parent | 2785c61b8daddefe90c38f7e57d75957d906e8b8 (diff) | |
| download | hdf5-a84811bfb889762150014188680fad0ce05877ba.zip hdf5-a84811bfb889762150014188680fad0ce05877ba.tar.gz hdf5-a84811bfb889762150014188680fad0ce05877ba.tar.bz2 | |
[svn-r14117] Description:
Move H5Glink() into "deprecated routines" section, replacing internal
usage with H5Lcreate_hard/H5Lcreate_soft.
Tested on:
FreeBSD/32 6.2 (duty)
FreeBSD/64 6.2 (liberty)
Solaris/32 5.10 (linew)
Diffstat (limited to 'tools/h5repack')
| -rw-r--r-- | tools/h5repack/h5repack_refs.c | 5 | ||||
| -rw-r--r-- | tools/h5repack/h5repacktst.c | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c index 71e42bb..e8799f8 100644 --- a/tools/h5repack/h5repack_refs.c +++ b/tools/h5repack/h5repack_refs.c @@ -111,8 +111,7 @@ int do_copy_refobjs(hid_t fidin, if(travt->objs[i].nlinks) for(j = 0; j < travt->objs[i].nlinks; j++) - H5Glink(fidout, H5G_LINK_HARD, travt->objs[i].name, travt->objs[i].links[j].new_name); - + H5Lcreate_hard(fidout, travt->objs[i].name, H5L_SAME_LOC, travt->objs[i].links[j].new_name, H5P_DEFAULT, H5P_DEFAULT); break; /*------------------------------------------------------------------------- @@ -343,7 +342,7 @@ int do_copy_refobjs(hid_t fidin, */ if(travt->objs[i].nlinks) for(j = 0; j < travt->objs[i].nlinks; j++) - H5Glink(fidout, H5G_LINK_HARD, travt->objs[i].name, travt->objs[i].links[j].new_name); + H5Lcreate_hard(fidout, travt->objs[i].name, H5L_SAME_LOC, travt->objs[i].links[j].new_name, H5P_DEFAULT, H5P_DEFAULT); if(H5Dclose(dset_out)<0) goto error; diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c index b8c7948..1d0264a 100644 --- a/tools/h5repack/h5repacktst.c +++ b/tools/h5repack/h5repacktst.c @@ -1591,7 +1591,7 @@ int make_all_objects(hid_t loc_id) *------------------------------------------------------------------------- */ - H5Glink(loc_id, H5L_TYPE_SOFT, "dset", "link"); + H5Lcreate_soft("dset", loc_id, "link", H5P_DEFAULT, H5P_DEFAULT); /*------------------------------------------------------------------------- * H5G_UDLINK @@ -1684,13 +1684,13 @@ int make_hlinks(hid_t loc_id) *------------------------------------------------------------------------- */ - if(write_dset(loc_id,2,dims,"dset",H5T_NATIVE_INT,buf)<0) + if(write_dset(loc_id, 2, dims, "dset", H5T_NATIVE_INT, buf) < 0) return -1; - if(H5Glink(loc_id, H5L_TYPE_HARD, "dset", "link1 to dset")<0) + if(H5Lcreate_hard(loc_id, "dset", H5L_SAME_LOC, "link1 to dset", H5P_DEFAULT, H5P_DEFAULT) < 0) return -1; - if(H5Glink(loc_id, H5L_TYPE_HARD, "dset", "link2 to dset")<0) + if(H5Lcreate_hard(loc_id, "dset", H5L_SAME_LOC, "link2 to dset", H5P_DEFAULT, H5P_DEFAULT) < 0) return -1; - if(H5Glink(loc_id, H5L_TYPE_HARD, "dset", "link3 to dset")<0) + if(H5Lcreate_hard(loc_id, "dset", H5L_SAME_LOC, "link3 to dset", H5P_DEFAULT, H5P_DEFAULT) < 0) return -1; @@ -2860,7 +2860,7 @@ void write_dset_in(hid_t loc_id, /* create hard link */ - status = H5Glink(loc_id, H5L_TYPE_HARD, "string", "string_link"); + status = H5Lcreate_hard(loc_id, "string", H5L_SAME_LOC, "string_link", H5P_DEFAULT, H5P_DEFAULT); /*------------------------------------------------------------------------- * H5T_BITFIELD |