diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-08-11 19:13:45 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-08-11 19:13:45 (GMT) |
| commit | 88fb6b1374e748b06826e17ca65c15087ae5b5ac (patch) | |
| tree | 7c550af01bb506aa5d5bb9208abad6687f7b0f3a /tools | |
| parent | 2a5454616a653b9830c103be7381af28ba397a3d (diff) | |
| download | hdf5-88fb6b1374e748b06826e17ca65c15087ae5b5ac.zip hdf5-88fb6b1374e748b06826e17ca65c15087ae5b5ac.tar.gz hdf5-88fb6b1374e748b06826e17ca65c15087ae5b5ac.tar.bz2 | |
[svn-r25531] remove use of C99 PRI that failed on windows in dtypes.c
fix bugs where hid_t were assumed to be 32 bit ints or herr_t.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5repack/h5repack.c | 2 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_copy.c | 2 | ||||
| -rw-r--r-- | tools/lib/h5tools_dump.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c index 742bb06..c1e63f1 100644 --- a/tools/h5repack/h5repack.c +++ b/tools/h5repack/h5repack.c @@ -337,7 +337,7 @@ done: */ int named_datatype_free(named_dt_t **named_dt_head_p, int ignore_err) { named_dt_t *dt = *named_dt_head_p; - hid_t ret_value = -1; + int ret_value = -1; while (dt) { /* Pop the datatype off the stack and free it */ diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index 44bea47..b5f6861 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -68,7 +68,7 @@ static herr_t walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void /* get the major number from the error stack. */ static herr_t walk_error_callback(UNUSED unsigned n, const H5E_error2_t *err_desc, void *udata) { if (err_desc) - *((int *) udata) = err_desc->maj_num; + *((hid_t *) udata) = err_desc->maj_num; return 0; } diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c index 8918a97..ba1af19 100644 --- a/tools/lib/h5tools_dump.c +++ b/tools/lib/h5tools_dump.c @@ -1248,7 +1248,7 @@ h5tools_print_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_c H5Dvlen_reclaim(p_type, sm_space, H5P_DEFAULT, sm_buf); if(H5Sclose(sm_space) < 0) - H5E_THROW(H5E_tools_g, H5E_tools_min_id_g, "H5Sclose failed"); + H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Sclose failed"); if(sm_buf) HDfree(sm_buf); sm_buf = NULL; @@ -1475,7 +1475,7 @@ h5tools_dump_simple_subset(FILE *stream, const h5tool_format_t *info, h5tools_co CATCH if(f_space >= 0 && H5Sclose(f_space) < 0) - H5E_THROW(H5E_tools_g, H5E_tools_min_id_g, "H5Sclose failed"); + H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Sclose failed"); return ret_value; } @@ -1655,9 +1655,9 @@ CATCH done: if(sm_space >= 0 && H5Sclose(sm_space) < 0) - H5E_THROW(H5E_tools_g, H5E_tools_min_id_g, "H5Sclose failed"); + H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Sclose failed"); if(f_space >= 0 && H5Sclose(f_space) < 0) - H5E_THROW(H5E_tools_g, H5E_tools_min_id_g, "H5Sclose failed"); + H5E_THROW(FAIL, H5E_tools_min_id_g, "H5Sclose failed"); return ret_value; } |