diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2007-03-08 16:57:36 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2007-03-08 16:57:36 (GMT) |
commit | 2996c917afa9d8dc27ac0360d6e34cd637a513f6 (patch) | |
tree | 8c0676b2cf0db0b99cb229a411b25a540c8e38c9 /src/H5FD.c | |
parent | 5a4bf8171df9473047d1eda534ed9a6a4d0749d9 (diff) | |
download | hdf5-2996c917afa9d8dc27ac0360d6e34cd637a513f6.zip hdf5-2996c917afa9d8dc27ac0360d6e34cd637a513f6.tar.gz hdf5-2996c917afa9d8dc27ac0360d6e34cd637a513f6.tar.bz2 |
[svn-r13475] There's a configure issue linking szip's shared libraries when running on kagiso.
The static szip libraries are working as intended, but when shared szip
libraries are present and intended for use they cannot be opened. A check
has been implemented to test if shared szip libraries are functional on
current platform. If they are not, and the user is trying to use them,
szip is now disbaled and the user is informed.
This issue occurs on kagiso, and the resolution was tested on kagiso.
Diffstat (limited to 'src/H5FD.c')
-rw-r--r-- | src/H5FD.c | 27 |
1 files changed, 14 insertions, 13 deletions
@@ -250,7 +250,7 @@ H5FDregister(const H5FD_class_t *cls) H5FD_mem_t type; FUNC_ENTER_API(H5FDregister, FAIL) - H5TRACE1("i", "x", cls); + H5TRACE1("i", "*x", cls); /* Check arguments */ if(!cls) @@ -1109,7 +1109,7 @@ H5FDclose(H5FD_t *file) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDclose, FAIL) - H5TRACE1("e", "x", file); + H5TRACE1("e", "*x", file); if(!file || !file->cls) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file pointer") @@ -1277,7 +1277,7 @@ H5FDcmp(const H5FD_t *f1, const H5FD_t *f2) int ret_value; FUNC_ENTER_API(H5FDcmp, -1) /*return value is arbitrary*/ - H5TRACE2("Is", "xx", f1, f2); + H5TRACE2("Is", "*x*x", f1, f2); ret_value = H5FD_cmp(f1, f2); @@ -1358,7 +1358,7 @@ H5FDquery(const H5FD_t *f, unsigned long *flags/*out*/) int ret_value; FUNC_ENTER_API(H5FDquery, FAIL) - H5TRACE2("Is", "xx", f, flags); + H5TRACE2("Is", "*xx", f, flags); assert(f); assert(flags); @@ -1454,7 +1454,7 @@ H5FDalloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size) haddr_t ret_value = HADDR_UNDEF; FUNC_ENTER_API(H5FDalloc, HADDR_UNDEF) - H5TRACE4("a", "xMtih", file, type, dxpl_id, size); + H5TRACE4("a", "*xMtih", file, type, dxpl_id, size); /* Check args */ if(!file || !file->cls) @@ -2206,7 +2206,7 @@ H5FDfree(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t siz herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDfree, FAIL) - H5TRACE5("e", "xMtiah", file, type, dxpl_id, addr, size); + H5TRACE5("e", "*xMtiah", file, type, dxpl_id, addr, size); /* Check args */ if(!file || !file->cls) @@ -2501,7 +2501,7 @@ H5FDrealloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t old_addr, hsiz haddr_t ret_value = HADDR_UNDEF; FUNC_ENTER_API(H5FDrealloc, HADDR_UNDEF) - H5TRACE6("a", "xMtiahh", file, type, dxpl_id, old_addr, old_size, new_size); + H5TRACE6("a", "*xMtiahh", file, type, dxpl_id, old_addr, old_size, new_size); /* Check args */ if(H5P_DEFAULT == dxpl_id) @@ -2854,7 +2854,7 @@ H5FDget_eoa(H5FD_t *file, H5FD_mem_t type) haddr_t ret_value; FUNC_ENTER_API(H5FDget_eoa, HADDR_UNDEF) - H5TRACE2("a", "xMt", file, type); + H5TRACE2("a", "*xMt", file, type); /* Check args */ if(!file || !file->cls) @@ -2943,7 +2943,7 @@ H5FDset_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDset_eoa, FAIL) - H5TRACE3("e", "xMta", file, type, addr); + H5TRACE3("e", "*xMta", file, type, addr); /* Check args */ if(!file || !file->cls) @@ -3033,7 +3033,7 @@ H5FDget_eof(H5FD_t *file) haddr_t ret_value; FUNC_ENTER_API(H5FDget_eof, HADDR_UNDEF) - H5TRACE1("a", "x", file); + H5TRACE1("a", "*x", file); /* Check arguments */ if(!file || !file->cls) @@ -3114,7 +3114,7 @@ H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDread, FAIL) - H5TRACE6("e", "xMtiazx", file, type, dxpl_id, addr, size, buf); + H5TRACE6("e", "*xMtiazx", file, type, dxpl_id, addr, size, buf); /* Check args */ if(!file || !file->cls) @@ -3343,7 +3343,7 @@ H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t siz herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDwrite, FAIL) - H5TRACE6("e", "xMtiazx", file, type, dxpl_id, addr, size, buf); + H5TRACE6("e", "*xMtiaz*x", file, type, dxpl_id, addr, size, buf); /* Check args */ if(!file || !file->cls) @@ -3647,7 +3647,7 @@ H5FDflush(H5FD_t *file, hid_t dxpl_id, unsigned closing) herr_t ret_value=SUCCEED; /* Return value */ FUNC_ENTER_API(H5FDflush, FAIL) - H5TRACE3("e", "xiIu", file, dxpl_id, closing); + H5TRACE3("e", "*xiIu", file, dxpl_id, closing); /* Check args */ if(!file || !file->cls) @@ -3768,6 +3768,7 @@ H5FDget_vfd_handle(H5FD_t *file, hid_t fapl, void **file_handle) herr_t ret_value; FUNC_ENTER_API(H5FDget_vfd_handle, FAIL) + H5TRACE3("e", "*xi**x", file, fapl, file_handle); /* Check arguments */ HDassert(file); |