From 81f7e6b1d3d1e1b4ef70c520e8296645b63923ba Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Fri, 31 Oct 2014 13:11:42 -0500 Subject: [svn-r25755] Removed spurious casts in a few HDfree() statements. Discovered when I temporarily #defined HDfree() to a more complicated function while investigating something. Tested on a local linux VM. This is a very minor change. --- hl/src/H5DS.c | 6 +++--- tools/h5copy/h5copy.c | 4 ++-- tools/lib/h5diff.c | 14 +++++++------- tools/lib/h5tools_ref.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index 66684d6..f4b754a 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -1549,7 +1549,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) /* free the ptr that will be replaced by label */ if (buf[idx]) - HDfree((void *)buf[idx]); + HDfree(buf[idx]); /* store the label information in the required index */ buf[idx] = label; @@ -1565,7 +1565,7 @@ herr_t H5DSset_label(hid_t did, unsigned int idx, const char *label) for (i = 0; i < (unsigned int) rank; i++) { if (buf[i]) - HDfree((void *)buf[i]); + HDfree(buf[i]); } /* close */ @@ -1592,7 +1592,7 @@ out: for (i = 0; i < (unsigned int) rank; i++) { if (buf[i]) - HDfree((void *)buf[i]); + HDfree(buf[i]); } HDfree(buf); } diff --git a/tools/h5copy/h5copy.c b/tools/h5copy/h5copy.c index b5965ba..278cd3e 100644 --- a/tools/h5copy/h5copy.c +++ b/tools/h5copy/h5copy.c @@ -475,7 +475,7 @@ main (int argc, const char *argv[]) /* free link info path */ if (linkinfo.trg_path) - HDfree((char*)linkinfo.trg_path); + HDfree(linkinfo.trg_path); /* close propertis */ if(H5Pclose(ocpl_id)<0) @@ -496,7 +496,7 @@ error: /* free link info path */ if (linkinfo.trg_path) - HDfree((char*)linkinfo.trg_path); + HDfree(linkinfo.trg_path); H5E_BEGIN_TRY { H5Pclose(ocpl_id); diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 13cea23..badaf3c 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -549,7 +549,7 @@ static herr_t trav_grp_symlinks(const char *path, const H5L_info_t *linfo, done: if (lnk_info.trg_path) - HDfree((char *)lnk_info.trg_path); + HDfree(lnk_info.trg_path); return 0; } @@ -1064,9 +1064,9 @@ out: /* free link info buffer */ if (trg_linfo1.trg_path) - HDfree((char *)trg_linfo1.trg_path); + HDfree(trg_linfo1.trg_path); if (trg_linfo2.trg_path) - HDfree((char *)trg_linfo2.trg_path); + HDfree(trg_linfo2.trg_path); /* close */ H5E_BEGIN_TRY @@ -1905,9 +1905,9 @@ hsize_t diff(hid_t file1_id, /* free link info buffer */ if (linkinfo1.trg_path) - HDfree((char *)linkinfo1.trg_path); + HDfree(linkinfo1.trg_path); if (linkinfo2.trg_path) - HDfree((char *)linkinfo2.trg_path); + HDfree(linkinfo2.trg_path); return nfound; @@ -1948,9 +1948,9 @@ out2: /* free link info buffer */ if (linkinfo1.trg_path) - HDfree((char *)linkinfo1.trg_path); + HDfree(linkinfo1.trg_path); if (linkinfo2.trg_path) - HDfree((char *)linkinfo2.trg_path); + HDfree(linkinfo2.trg_path); /* close */ /* disable error reporting */ diff --git a/tools/lib/h5tools_ref.c b/tools/lib/h5tools_ref.c index caf71df..52d84f9 100644 --- a/tools/lib/h5tools_ref.c +++ b/tools/lib/h5tools_ref.c @@ -65,7 +65,7 @@ free_ref_path_info(void *item, void UNUSED *key, void UNUSED *operator_data/*in, { ref_path_node_t *node = (ref_path_node_t *)item; - HDfree((void *)node->path); + HDfree(node->path); HDfree(node); return(0); -- cgit v0.12