summaryrefslogtreecommitdiffstats
path: root/tools/lib/h5trav.c
diff options
context:
space:
mode:
Diffstat (limited to 'tools/lib/h5trav.c')
-rw-r--r--tools/lib/h5trav.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 4ee2914..060a33b 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -120,7 +120,7 @@ trav_token_add(trav_addr_t *visited, H5O_token_t *token, const char *path)
if (visited->nused == visited->nalloc) {
visited->nalloc = MAX(1, visited->nalloc * 2);
visited->objs =
- (trav_addr_path_t *)HDrealloc(visited->objs, visited->nalloc * sizeof(trav_addr_path_t));
+ (trav_addr_path_t *)realloc(visited->objs, visited->nalloc * sizeof(trav_addr_path_t));
} /* end if */
/* Append it */
@@ -177,7 +177,7 @@ traverse_cb(hid_t loc_id, const char *path, const H5L_info2_t *linfo, void *_uda
size_t new_name_len = base_len + add_slash + HDstrlen(path) + 1 +
3; /* Extra "+3" to quiet GCC warning - 2019/07/05, QAK */
- if (NULL == (new_name = (char *)HDmalloc(new_name_len)))
+ if (NULL == (new_name = (char *)malloc(new_name_len)))
return (H5_ITER_ERROR);
if (add_slash)
HDsnprintf(new_name, new_name_len, "%s/%s", udata->base_grp_name, path);
@@ -195,7 +195,7 @@ traverse_cb(hid_t loc_id, const char *path, const H5L_info2_t *linfo, void *_uda
/* Get information about the object */
if (H5Oget_info_by_name3(loc_id, path, &oinfo, udata->fields, H5P_DEFAULT) < 0) {
if (new_name)
- HDfree(new_name);
+ free(new_name);
return (H5_ITER_ERROR);
} /* end if */
@@ -210,7 +210,7 @@ traverse_cb(hid_t loc_id, const char *path, const H5L_info2_t *linfo, void *_uda
if (udata->visitor->visit_obj)
if ((*udata->visitor->visit_obj)(full_name, &oinfo, already_visited, udata->visitor->udata) < 0) {
if (new_name)
- HDfree(new_name);
+ free(new_name);
return (H5_ITER_ERROR);
} /* end if */
} /* end if */
@@ -219,13 +219,13 @@ traverse_cb(hid_t loc_id, const char *path, const H5L_info2_t *linfo, void *_uda
if (udata->visitor->visit_lnk)
if ((*udata->visitor->visit_lnk)(full_name, linfo, udata->visitor->udata) < 0) {
if (new_name)
- HDfree(new_name);
+ free(new_name);
return (H5_ITER_ERROR);
} /* end if */
} /* end else */
if (new_name)
- HDfree(new_name);
+ free(new_name);
return (H5_ITER_CONT);
} /* end traverse_cb() */
@@ -295,8 +295,8 @@ traverse(hid_t file_id, const char *grp_name, hbool_t visit_start, hbool_t recur
/* Free paths to objects */
for (u = 0; u < seen.nused; u++)
- HDfree(seen.objs[u].path);
- HDfree(seen.objs);
+ free(seen.objs[u].path);
+ free(seen.objs);
} /* end if */
} /* end if */
@@ -321,7 +321,7 @@ trav_info_add(trav_info_t *info, const char *path, h5trav_type_t obj_type)
/* Allocate space if necessary */
if (info->nused == info->nalloc) {
info->nalloc = MAX(1, info->nalloc * 2);
- info->paths = (trav_path_t *)HDrealloc(info->paths, info->nalloc * sizeof(trav_path_t));
+ info->paths = (trav_path_t *)realloc(info->paths, info->nalloc * sizeof(trav_path_t));
} /* end if */
/* Append it */
@@ -474,7 +474,7 @@ h5trav_getindex(const trav_info_t *info, const char *obj)
void
trav_info_init(const char *filename, hid_t fileid, trav_info_t **_info)
{
- trav_info_t *info = (trav_info_t *)HDmalloc(sizeof(trav_info_t));
+ trav_info_t *info = (trav_info_t *)malloc(sizeof(trav_info_t));
/* Init info structure */
info->nused = info->nalloc = 0;
@@ -505,16 +505,16 @@ trav_info_free(trav_info_t *info)
/* Free visited symbolic links path and file (if alloc) */
for (u = 0; u < info->symlink_visited.nused; u++) {
if (info->symlink_visited.objs[u].file)
- HDfree(info->symlink_visited.objs[u].file);
- HDfree(info->symlink_visited.objs[u].path);
+ free(info->symlink_visited.objs[u].file);
+ free(info->symlink_visited.objs[u].path);
}
- HDfree(info->symlink_visited.objs);
+ free(info->symlink_visited.objs);
/* Free path names */
for (u = 0; u < info->nused; u++)
- HDfree(info->paths[u].path);
- HDfree(info->paths);
- HDfree(info);
+ free(info->paths[u].path);
+ free(info->paths);
+ free(info);
} /* end if */
} /* end trav_info_free() */
@@ -653,7 +653,7 @@ trav_table_add(trav_table_t *table, const char *path, const H5O_info2_t *oinfo)
if (table) {
if (table->nobjs == table->size) {
table->size = MAX(1, table->size * 2);
- table->objs = (trav_obj_t *)HDrealloc(table->objs, table->size * sizeof(trav_obj_t));
+ table->objs = (trav_obj_t *)realloc(table->objs, table->size * sizeof(trav_obj_t));
} /* end if */
new_obj = table->nobjs++;
@@ -700,7 +700,7 @@ trav_table_addlink(trav_table_t *table, const H5O_token_t *obj_token, const char
/* allocate space if necessary */
if (table->objs[i].nlinks == (unsigned)table->objs[i].sizelinks) {
table->objs[i].sizelinks = MAX(1, table->objs[i].sizelinks * 2);
- table->objs[i].links = (trav_link_t *)HDrealloc(
+ table->objs[i].links = (trav_link_t *)realloc(
table->objs[i].links, table->objs[i].sizelinks * sizeof(trav_link_t));
} /* end if */
@@ -730,7 +730,7 @@ trav_table_addflags(const unsigned *flags, char *name, h5trav_type_t type, trav_
if (table) {
if (table->nobjs == table->size) {
table->size = MAX(1, table->size * 2);
- table->objs = (trav_obj_t *)HDrealloc(table->objs, table->size * sizeof(trav_obj_t));
+ table->objs = (trav_obj_t *)realloc(table->objs, table->size * sizeof(trav_obj_t));
} /* end if */
new_obj = table->nobjs++;
@@ -760,7 +760,7 @@ trav_table_addflags(const unsigned *flags, char *name, h5trav_type_t type, trav_
void
trav_table_init(hid_t fid, trav_table_t **tbl)
{
- trav_table_t *table = (trav_table_t *)HDmalloc(sizeof(trav_table_t));
+ trav_table_t *table = (trav_table_t *)malloc(sizeof(trav_table_t));
if (table) {
table->fid = fid;
table->size = 0;
@@ -786,19 +786,19 @@ trav_table_free(trav_table_t *table)
unsigned int i;
for (i = 0; i < table->nobjs; i++) {
- HDfree(table->objs[i].name);
+ free(table->objs[i].name);
if (table->objs[i].nlinks) {
unsigned int j;
for (j = 0; j < table->objs[i].nlinks; j++)
- HDfree(table->objs[i].links[j].new_name);
+ free(table->objs[i].links[j].new_name);
- HDfree(table->objs[i].links);
+ free(table->objs[i].links);
} /* end if */
} /* end for */
- HDfree(table->objs);
+ free(table->objs);
} /* end if */
- HDfree(table);
+ free(table);
}
}
@@ -947,14 +947,14 @@ trav_print_visit_lnk(const char *path, const H5L_info2_t *linfo, void *udata)
switch (linfo->type) {
case H5L_TYPE_SOFT:
if (linfo->u.val_size > 0) {
- char *targbuf = (char *)HDmalloc(linfo->u.val_size + 1);
+ char *targbuf = (char *)malloc(linfo->u.val_size + 1);
if (targbuf) {
if (H5Lget_val(print_udata->fid, path, targbuf, linfo->u.val_size + 1, H5P_DEFAULT) < 0)
targbuf[0] = 0;
printf(" %-10s %s -> %s\n", "link", path, targbuf);
- HDfree(targbuf);
+ free(targbuf);
}
- } /* end if */
+ }
else
printf(" %-10s %s ->\n", "link", path);
break;
@@ -965,13 +965,13 @@ trav_print_visit_lnk(const char *path, const H5L_info2_t *linfo, void *udata)
const char *filename = NULL;
const char *objname = NULL;
- targbuf = (char *)HDmalloc(linfo->u.val_size + 1);
+ targbuf = (char *)malloc(linfo->u.val_size + 1);
if (targbuf) {
if (H5Lget_val(print_udata->fid, path, targbuf, linfo->u.val_size + 1, H5P_DEFAULT) < 0)
targbuf[0] = 0;
if (H5Lunpack_elink_val(targbuf, linfo->u.val_size, NULL, &filename, &objname) >= 0)
printf(" %-10s %s -> %s %s\n", "ext link", path, filename, objname);
- HDfree(targbuf);
+ free(targbuf);
}
} /* end if */
else
@@ -1073,7 +1073,7 @@ symlink_visit_add(symlink_trav_t *visited, H5L_type_t type, const char *file, co
void *tmp_ptr;
visited->nalloc = MAX(1, visited->nalloc * 2);
- if (NULL == (tmp_ptr = HDrealloc(visited->objs, visited->nalloc * sizeof(symlink_trav_path_t))))
+ if (NULL == (tmp_ptr = realloc(visited->objs, visited->nalloc * sizeof(symlink_trav_path_t))))
H5TOOLS_GOTO_ERROR(FAIL, "visited data structure realloc failed");
visited->objs = (symlink_trav_path_t *)tmp_ptr;
} /* end if */
@@ -1095,7 +1095,7 @@ symlink_visit_add(symlink_trav_t *visited, H5L_type_t type, const char *file, co
if (NULL == (visited->objs[idx].path = HDstrdup(path))) {
visited->nused--;
if (visited->objs[idx].file)
- HDfree(visited->objs[idx].file);
+ free(visited->objs[idx].file);
H5TOOLS_GOTO_ERROR(FAIL, "visited data structure path allocation failed");
} /* end if */
generated by cgit v0.12 at 2024-07-05 05:37:20 (GMT)