summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-08-28 21:49:12 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-08-28 21:49:12 (GMT)
commit518e0ede771cbe1064fb8b42388450fd20fa3a62 (patch)
treeee674a9bdf08a39430a8498f3b43ed11099b82df
parent74ceb182bd741925909195abfbc07052c24f88d5 (diff)
downloadhdf5-518e0ede771cbe1064fb8b42388450fd20fa3a62.zip
hdf5-518e0ede771cbe1064fb8b42388450fd20fa3a62.tar.gz
hdf5-518e0ede771cbe1064fb8b42388450fd20fa3a62.tar.bz2
[svn-r14121] Description:
Correct a couple of swapped parameters for creating soft links. Tested on: FreeBSD/64 6.2 (liberty)
-rw-r--r--fortran/src/H5Gf.c2
-rw-r--r--test/unlink.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/fortran/src/H5Gf.c b/fortran/src/H5Gf.c
index b51329c..0a037de 100644
--- a/fortran/src/H5Gf.c
+++ b/fortran/src/H5Gf.c
@@ -366,7 +366,7 @@ nh5glink2_c(hid_t_f *cur_loc_id, _fcd cur_name, int_f *cur_namelen,
break;
case H5L_TYPE_SOFT:
- if(H5Lcreate_soft(c_cur_name, (hid_t)*cur_loc_id, c_new_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
+ if(H5Lcreate_soft(c_cur_name, (hid_t)*new_loc_id, c_new_name, H5P_DEFAULT, H5P_DEFAULT) < 0)
goto DONE;
break;
diff --git a/test/unlink.c b/test/unlink.c
index 6a81e20..01ddaf0 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -373,8 +373,8 @@ test_new_move(hid_t fapl)
if((grp_move = H5Gcreate2(grp_1, "group_move", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
/* Create hard and soft links. */
- if(H5Lcreate_hard(grp_1, "group_move", H5G_SAME_LOC, "hard", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
- if(H5Lcreate_soft("/group1/group_move", grp_1, "soft", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+ if(H5Lcreate_hard(grp_1, "group_move", H5L_SAME_LOC, "hard", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+ if(H5Lcreate_soft("/group1/group_move", grp_2, "soft", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
/* Move a group within the file. Both of source and destination use
* H5G_SAME_LOC. Should fail. */
@@ -2151,7 +2151,7 @@ test_full_group_compact(hid_t fapl)
if(H5Lcreate_external("foo.h5", "/dst", gid, "external", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
/* Create soft link (doesn't matter if it dangles) */
- if(H5Lcreate_soft("/foo", file_id, "soft", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+ if(H5Lcreate_soft("/foo", gid, "soft", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
/* Create hard links to objects in group to keep */
for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
@@ -2297,7 +2297,7 @@ test_full_group_dense(hid_t fapl)
if(H5Lcreate_external("foo.h5", "/dst", gid, "external", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
/* Create soft link (doesn't matter if it dangles) */
- if(H5Lcreate_soft("/foo", file_id, "soft", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+ if(H5Lcreate_soft("/foo", gid, "soft", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
/* Create hard links to objects in group to keep */
for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) {