diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-29 23:37:41 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-29 23:37:41 (GMT) |
| commit | 71d6bffdd745c865e988b29fac8d0173d7fa0131 (patch) | |
| tree | 30e3ef0aece889d65fac25b0b038f6b7cc965497 /test/unlink.c | |
| parent | db3c155bf296fa06ab0df56bb7307f2ba19613e5 (diff) | |
| download | hdf5-71d6bffdd745c865e988b29fac8d0173d7fa0131.zip hdf5-71d6bffdd745c865e988b29fac8d0173d7fa0131.tar.gz hdf5-71d6bffdd745c865e988b29fac8d0173d7fa0131.tar.bz2 | |
[svn-r14127] Description:
Move H5Gget_linkval to deprecated symbol section and replace with
H5Lget_val for internal calls.
Tested on:
FreeBSD/32 6.2 (duty)
FreeBSD/64 6.2 (liberty)
Linux/32 2.6 (kagiso)
Linux/64 2.6 (smirom)
Solaris/32 5.10 (linew)
Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'test/unlink.c')
| -rw-r--r-- | test/unlink.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/unlink.c b/test/unlink.c index 106da0d..170c87d 100644 --- a/test/unlink.c +++ b/test/unlink.c @@ -447,32 +447,32 @@ check_new_move(hid_t fapl) /* Open file */ h5_fixname(FILENAME[1], fapl, filename, sizeof filename); - if((file=H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) TEST_ERROR + if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) FAIL_STACK_ERROR /* Get hard link info */ - if(H5Gget_objinfo(file, "/group2/group_new_name", TRUE, &sb_hard1) < 0) TEST_ERROR - if(H5Gget_objinfo(file, "/group1/hard", TRUE, &sb_hard2) < 0) TEST_ERROR + if(H5Gget_objinfo(file, "/group2/group_new_name", TRUE, &sb_hard1) < 0) FAIL_STACK_ERROR + if(H5Gget_objinfo(file, "/group1/hard", TRUE, &sb_hard2) < 0) FAIL_STACK_ERROR /* Check hard links */ - if(H5G_GROUP!=sb_hard1.type || H5G_GROUP!=sb_hard2.type) + if(H5G_GROUP != sb_hard1.type || H5G_GROUP != sb_hard2.type) FAIL_PUTS_ERROR(" Unexpected object type, should have been a group") if(HDmemcmp(&sb_hard1.objno, &sb_hard2.objno, sizeof(sb_hard1.objno))) FAIL_PUTS_ERROR(" Hard link test failed. Link seems not to point to the expected file location.") /* Check soft links */ - if(H5Gget_linkval(file, "group2/soft", sizeof linkval, linkval) < 0) TEST_ERROR + if(H5Lget_val(file, "group2/soft", linkval, sizeof linkval, H5P_DEFAULT) < 0) FAIL_STACK_ERROR if(HDstrcmp(linkval, "/group1/group_move")) FAIL_PUTS_ERROR(" Soft link test failed. Wrong link value") /* Cleanup */ - if(H5Fclose(file) < 0) TEST_ERROR + if(H5Fclose(file) < 0) FAIL_STACK_ERROR PASSED(); return 0; - error: +error: return 1; -} +} /* end check_new_move() */ /*------------------------------------------------------------------------- |