diff options
Diffstat (limited to 'src/H5Glink.c')
| -rw-r--r-- | src/H5Glink.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/H5Glink.c b/src/H5Glink.c index 75a3e83..488c05b 100644 --- a/src/H5Glink.c +++ b/src/H5Glink.c @@ -41,6 +41,7 @@ #include "H5Iprivate.h" /* IDs */ #include "H5Lprivate.h" /* Links */ #include "H5MMprivate.h" /* Memory management */ +#include "H5Ppublic.h" /* Property Lists */ /****************/ @@ -240,7 +241,7 @@ H5G_ent_to_link(H5F_t *f, H5O_link_t *lnk, const H5HL_t *heap, if(ent->type == H5G_CACHED_SLINK) { const char *s; /* Pointer to link value */ - s = H5HL_offset_into(f, heap, ent->cache.slink.lval_offset); + s = (const char *)H5HL_offset_into(f, heap, ent->cache.slink.lval_offset); HDassert(s); /* Copy the link value */ @@ -295,7 +296,7 @@ H5G_ent_to_info(H5F_t *f, H5L_info_t *info, const H5HL_t *heap, if(ent->type == H5G_CACHED_SLINK) { const char *s; /* Pointer to link value */ - s = H5HL_offset_into(f, heap, ent->cache.slink.lval_offset); + s = (const char *)H5HL_offset_into(f, heap, ent->cache.slink.lval_offset); HDassert(s); /* Get the link value size */ @@ -319,7 +320,7 @@ H5G_ent_to_info(H5F_t *f, H5L_info_t *info, const H5HL_t *heap, /*------------------------------------------------------------------------- * Function: H5G_link_to_info * - * Purpose: Retrieve information from a link object + * Purpose: Retrieve information from a link object * * Return: Non-negative on success/Negative on failure * @@ -376,7 +377,7 @@ H5G_link_to_info(const H5O_link_t *lnk, H5L_info_t *info) if((cb_ret = (link_class->query_func)(lnk->name, lnk->u.ud.udata, lnk->u.ud.size, NULL, (size_t)0)) < 0) HGOTO_ERROR(H5E_LINK, H5E_CALLBACK, FAIL, "query buffer size callback returned failure") - info->u.val_size = cb_ret; + info->u.val_size = (size_t)cb_ret; } /* end if */ else info->u.val_size = 0; @@ -392,7 +393,7 @@ done: /*------------------------------------------------------------------------- * Function: H5G_link_to_loc * - * Purpose: Build group location from group and link object + * Purpose: Build group location from group and link object * * Return: Non-negative on success/Negative on failure * @@ -486,7 +487,7 @@ H5G_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk, /* Check if the object pointed by the soft link exists in the source file */ if(H5G_loc_info(&grp_loc, tmp_src_lnk.u.soft.name, FALSE, &oinfo, H5P_DEFAULT, dxpl_id) >= 0) { /* Convert soft link to hard link */ - tmp_src_lnk.u.soft.name = H5MM_xfree(tmp_src_lnk.u.soft.name); + tmp_src_lnk.u.soft.name = (char *)H5MM_xfree(tmp_src_lnk.u.soft.name); tmp_src_lnk.type = H5L_TYPE_HARD; tmp_src_lnk.u.hard.addr = oinfo.addr; src_lnk = &tmp_src_lnk; @@ -608,7 +609,7 @@ H5G_link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip, size_t u; /* Local index variable */ herr_t ret_value = H5_ITER_CONT; /* Return value */ - FUNC_ENTER_NOAPI(H5G_link_iterate_table, FAIL) + FUNC_ENTER_NOAPI_NOERR(H5G_link_iterate_table, -) /* Sanity check */ HDassert(ltable); |