Remove HD/hbool_t from high-level lib (#3183)

5 files changed, 113 insertions, 113 deletions

diff --git a/hl/fortran/src/H5DSfc.c b/hl/fortran/src/H5DSfc.c
index 9ebd322..8029d34 100644
--- a/hl/fortran/src/H5DSfc.c
+++ b/hl/fortran/src/H5DSfc.c
@@ -54,7 +54,7 @@ h5dsset_scale_c(hid_t_f *dsid, _fcd dimname, size_t_f *dimnamelen)
 
 done:
     if (c_dimname)
-        HDfree(c_dimname);
+        free(c_dimname);
 
     return ret_value;
 
@@ -231,7 +231,7 @@ h5dsset_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *labellen)
 
 done:
     if (c_label)
-        HDfree(c_label);
+        free(c_label);
 
     return ret_value;
 
@@ -262,7 +262,7 @@ h5dsget_label_c(hid_t_f *did, int_f *idx, _fcd label, size_t_f *size)
     /*
      * Allocate buffer to hold label
      */
-    if ((c_label = (char *)HDmalloc((size_t)*size + 1)) == NULL)
+    if ((c_label = (char *)malloc((size_t)*size + 1)) == NULL)
         HGOTO_DONE(FAIL);
 
     /*
@@ -282,7 +282,7 @@ done:
     *size = (size_t_f)size_c; /* Don't subtract '1'  because H5DSget_label doesn't include the
                                * trailing NULL in the length calculation, Ref. HDFFV-7596 */
     if (c_label)
-        HDfree(c_label);
+        free(c_label);
     return ret_value;
 
 } /* end h5dsget_label_c() */
@@ -312,7 +312,7 @@ h5dsget_scale_name_c(hid_t_f *did, _fcd name, size_t_f *size)
     /*
      * Allocate buffer to hold name
      */
-    if ((c_scale_name = (char *)HDmalloc((size_t)*size + 1)) == NULL)
+    if ((c_scale_name = (char *)malloc((size_t)*size + 1)) == NULL)
         HGOTO_DONE(FAIL);
 
     /*
@@ -330,7 +330,7 @@ h5dsget_scale_name_c(hid_t_f *did, _fcd name, size_t_f *size)
 
 done:
     if (c_scale_name)
-        HDfree(c_scale_name);
+        free(c_scale_name);
     return ret_value;
 
 } /* end h5dsget_scale_name_c() */
diff --git a/hl/fortran/src/H5IMcc.c b/hl/fortran/src/H5IMcc.c
index 2084826..53c1f69 100644
--- a/hl/fortran/src/H5IMcc.c
+++ b/hl/fortran/src/H5IMcc.c
@@ -469,7 +469,7 @@ H5IM_get_palette(hid_t loc_id, const char *image_name, int pal_number, hid_t tid
 
             dim_ref = (size_t)n_refs;
 
-            refbuf = (hobj_ref_t *)HDmalloc(sizeof(hobj_ref_t) * dim_ref);
+            refbuf = (hobj_ref_t *)malloc(sizeof(hobj_ref_t) * dim_ref);
 
             if (H5Aread(attr_id, attr_type, refbuf) < 0)
                 goto out;
@@ -489,7 +489,7 @@ H5IM_get_palette(hid_t loc_id, const char *image_name, int pal_number, hid_t tid
             if (H5Dclose(pal_id) < 0)
                 goto out;
 
-            HDfree(refbuf);
+            free(refbuf);
 
         } /* H5T_REFERENCE */
 
diff --git a/hl/fortran/src/H5IMfc.c b/hl/fortran/src/H5IMfc.c
index cead871..1e060ad 100644
--- a/hl/fortran/src/H5IMfc.c
+++ b/hl/fortran/src/H5IMfc.c
@@ -63,7 +63,7 @@ h5immake_image_8bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -110,7 +110,7 @@ h5imread_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *buf)
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -168,9 +168,9 @@ h5immake_image_24bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
     if (c_il != NULL)
-        HDfree(c_il);
+        free(c_il);
 
     return ret_value;
 }
@@ -215,7 +215,7 @@ h5imget_image_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *w
     /*
      * allocate buffer to hold name of an attribute
      */
-    if ((c_buf = (char *)HDmalloc((size_t)*ilen + 1)) == NULL)
+    if ((c_buf = (char *)malloc((size_t)*ilen + 1)) == NULL)
         goto done;
 
     /*
@@ -242,9 +242,9 @@ h5imget_image_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *w
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
     if (c_buf != NULL)
-        HDfree(c_buf);
+        free(c_buf);
 
     return ret_value;
 }
@@ -287,7 +287,7 @@ h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
     ret = H5IMis_image(c_loc_id, c_name);
 
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
 
     return ret;
 }
@@ -334,7 +334,7 @@ h5immake_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dim
 
 done:
     if (c_name)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -389,9 +389,9 @@ h5imlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
     if (c_namepal != NULL)
-        HDfree(c_namepal);
+        free(c_namepal);
 
     return ret_value;
 }
@@ -446,9 +446,9 @@ h5imunlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *il
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
     if (c_namepal != NULL)
-        HDfree(c_namepal);
+        free(c_namepal);
 
     return ret_value;
 }
@@ -501,7 +501,7 @@ h5imget_npalettes_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *np
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -557,7 +557,7 @@ h5imget_palette_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -607,7 +607,7 @@ h5imget_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_numb
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -650,7 +650,7 @@ h5imis_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
     ret = H5IMis_palette(c_loc_id, c_name);
 
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
 
     return ret;
 }
diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c
index c888eec..e6d7b3a 100644
--- a/hl/fortran/src/H5LTfc.c
+++ b/hl/fortran/src/H5LTfc.c
@@ -49,7 +49,7 @@ h5ltmake_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank, h
     if (c_name == NULL)
         goto done;
 
-    c_dims = (hsize_t *)HDmalloc(sizeof(hsize_t) * ((size_t)*rank));
+    c_dims = (hsize_t *)malloc(sizeof(hsize_t) * ((size_t)*rank));
     if (c_dims == NULL)
         goto done;
     /*
@@ -71,9 +71,9 @@ h5ltmake_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *rank, h
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
     if (c_dims != NULL)
-        HDfree(c_dims);
+        free(c_dims);
     return ret_value;
 }
 
@@ -124,7 +124,7 @@ h5ltread_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hid_t_f *type_
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -179,9 +179,9 @@ h5ltmake_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
     if (c_buf != NULL)
-        HDfree(c_buf);
+        free(c_buf);
 
     return ret_value;
 }
@@ -231,7 +231,7 @@ h5ltread_dataset_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, char *b
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -281,7 +281,7 @@ h5ltset_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f
     c_loc_id = (hid_t)*loc_id;
     c_size   = (size_t)*size;
 
-    if (HDstrncmp(dtype, "I", 1) == 0) {
+    if (strncmp(dtype, "I", 1) == 0) {
         if ((size_t)*sizeof_val == sizeof(int))
             ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_INT,
                                                (const int *)buf);
@@ -296,7 +296,7 @@ h5ltset_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f
         else
             goto done;
     }
-    else if (HDstrncmp(dtype, "R", 1) == 0) {
+    else if (strncmp(dtype, "R", 1) == 0) {
         if ((size_t)*sizeof_val == sizeof(float))
             ret = H5LT_set_attribute_numerical(c_loc_id, c_name, c_attrname, c_size, H5T_NATIVE_FLOAT,
                                                (const float *)buf);
@@ -309,7 +309,7 @@ h5ltset_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f
         else
             goto done;
     }
-    else if (HDstrncmp(dtype, "C", 1) == 0) {
+    else if (strncmp(dtype, "C", 1) == 0) {
 
         c_buf = (char *)HD5f2cstring((_fcd)buf, c_size);
         if (c_buf == NULL)
@@ -324,11 +324,11 @@ h5ltset_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
     if (c_attrname != NULL)
-        HDfree(c_attrname);
+        free(c_attrname);
     if (c_buf != NULL)
-        HDfree(c_buf);
+        free(c_buf);
 
     return ret_value;
 }
@@ -375,7 +375,7 @@ h5ltget_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f
      */
     c_loc_id = (hid_t)*loc_id;
 
-    if (HDstrncmp(dtype, "I", 1) == 0) {
+    if (strncmp(dtype, "I", 1) == 0) {
         if ((size_t)*sizeof_val == sizeof(int))
             ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_INT, buf);
         else if ((size_t)*sizeof_val == sizeof(long))
@@ -387,7 +387,7 @@ h5ltget_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f
         else
             goto done;
     }
-    else if (HDstrncmp(dtype, "R", 1) == 0) {
+    else if (strncmp(dtype, "R", 1) == 0) {
         if ((size_t)*sizeof_val == sizeof(float))
             ret = H5LTget_attribute(c_loc_id, c_name, c_attrname, H5T_NATIVE_FLOAT, buf);
         else if ((size_t)*sizeof_val == sizeof(double))
@@ -405,9 +405,9 @@ h5ltget_attribute_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, size_t_f
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
     if (c_attrname != NULL)
-        HDfree(c_attrname);
+        free(c_attrname);
 
     return ret_value;
 }
@@ -451,7 +451,7 @@ h5ltget_attribute_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, si
     /*
      * Allocate buffer to hold C attribute string
      */
-    if ((c_buf = (char *)HDmalloc((size_t)*buf_size + 1)) == NULL)
+    if ((c_buf = (char *)malloc((size_t)*buf_size + 1)) == NULL)
         goto done;
 
     /*
@@ -470,11 +470,11 @@ h5ltget_attribute_string_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, si
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
     if (c_attrname != NULL)
-        HDfree(c_attrname);
+        free(c_attrname);
     if (c_buf != NULL)
-        HDfree(c_buf);
+        free(c_buf);
 
     return ret_value;
 }
@@ -526,7 +526,7 @@ h5ltget_dataset_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *ra
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -569,7 +569,7 @@ h5ltfind_dataset_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
     ret = H5LTfind_dataset(c_loc_id, c_name);
 
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
 
     return ret;
 }
@@ -639,7 +639,7 @@ h5ltget_dataset_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -697,9 +697,9 @@ h5ltget_attribute_ndims_c(hid_t_f *loc_id, size_t_f *namelen, _fcd dsetname, siz
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
     if (c_attrname != NULL)
-        HDfree(c_attrname);
+        free(c_attrname);
 
     return ret_value;
 }
@@ -774,9 +774,9 @@ h5ltget_attribute_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f
 
 done:
     if (c_name != NULL)
-        HDfree(c_name);
+        free(c_name);
     if (c_attrname != NULL)
-        HDfree(c_attrname);
+        free(c_attrname);
 
     return ret_value;
 }
@@ -800,9 +800,9 @@ done:
 int_f
 h5ltpath_valid_c(hid_t_f *loc_id, _fcd path, size_t_f *pathlen, int_f *check_object_valid_c)
 {
-    htri_t  ret    = -1;
-    char   *c_path = NULL;
-    hbool_t check_object_valid;
+    htri_t ret    = -1;
+    char  *c_path = NULL;
+    bool   check_object_valid;
 
     /*
      * convert FORTRAN name to C name
@@ -810,9 +810,9 @@ h5ltpath_valid_c(hid_t_f *loc_id, _fcd path, size_t_f *pathlen, int_f *check_obj
     if (NULL == (c_path = (char *)HD5f2cstring(path, (size_t)*pathlen)))
         goto done;
 
-    check_object_valid = FALSE;
+    check_object_valid = false;
     if (*check_object_valid_c == 1)
-        check_object_valid = TRUE;
+        check_object_valid = true;
 
     /*
      * call H5LTpath_valid function.
@@ -821,7 +821,7 @@ h5ltpath_valid_c(hid_t_f *loc_id, _fcd path, size_t_f *pathlen, int_f *check_obj
 
 done:
     if (c_path != NULL)
-        HDfree(c_path);
+        free(c_path);
 
     return (int_f)ret;
 }
diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c
index 588638c..5d4212d 100644
--- a/hl/fortran/src/H5TBfc.c
+++ b/hl/fortran/src/H5TBfc.c
@@ -61,9 +61,9 @@ h5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *name
         HGOTO_DONE(FAIL)
     if (NULL == (c_name1 = (char *)HD5f2cstring(name1, (size_t)*namelen1)))
         HGOTO_DONE(FAIL)
-    if (NULL == (c_field_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_offset = (size_t *)malloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if (NULL == (c_field_types = (hid_t *)HDmalloc(sizeof(hid_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_types = (hid_t *)malloc(sizeof(hid_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
 
     for (i = 0; i < num_elem; i++) {
@@ -74,7 +74,7 @@ h5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *name
     /*
      * allocate array of character pointers
      */
-    if (NULL == (c_field_names = (char **)HDcalloc((size_t)num_elem, sizeof(char *))))
+    if (NULL == (c_field_names = (char **)calloc((size_t)num_elem, sizeof(char *))))
         HGOTO_DONE(FAIL)
 
     /* copy data to long C string */
@@ -86,9 +86,9 @@ h5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *name
      */
     tmp_p = tmp;
     for (i = 0; i < num_elem; i++) {
-        if (NULL == (c_field_names[i] = (char *)HDmalloc((size_t)char_len_field_names[i] + 1)))
+        if (NULL == (c_field_names[i] = (char *)malloc((size_t)char_len_field_names[i] + 1)))
             HGOTO_DONE(FAIL)
-        HDmemcpy(c_field_names[i], tmp_p, (size_t)char_len_field_names[i]);
+        memcpy(c_field_names[i], tmp_p, (size_t)char_len_field_names[i]);
         c_field_names[i][char_len_field_names[i]] = '\0';
         tmp_p                                     = tmp_p + *max_char_size_field_names;
     } /* end for */
@@ -103,22 +103,22 @@ h5tbmake_table_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *name
 
 done:
     if (c_name)
-        HDfree(c_name);
+        free(c_name);
     if (c_name1)
-        HDfree(c_name1);
+        free(c_name1);
     if (c_field_names) {
         for (i = 0; i < num_elem; i++) {
             if (c_field_names[i])
-                HDfree(c_field_names[i]);
+                free(c_field_names[i]);
         } /* end for */
-        HDfree(c_field_names);
+        free(c_field_names);
     } /* end if */
     if (tmp)
-        HDfree(tmp);
+        free(tmp);
     if (c_field_offset)
-        HDfree(c_field_offset);
+        free(c_field_offset);
     if (c_field_types)
-        HDfree(c_field_types);
+        free(c_field_types);
 
     return ret_value;
 } /* end h5tbmake_table_c() */
@@ -166,9 +166,9 @@ h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *
         HGOTO_DONE(FAIL)
     if (NULL == (c_name1 = (char *)HD5f2cstring(name1, (size_t)*namelen1)))
         HGOTO_DONE(FAIL)
-    if (NULL == (c_field_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_offset = (size_t *)malloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if (NULL == (c_field_types = (hid_t *)HDmalloc(sizeof(hid_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_types = (hid_t *)malloc(sizeof(hid_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
 
     for (i = 0; i < num_elem; i++) {
@@ -179,7 +179,7 @@ h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *
     /*
      * allocate array of character pointers
      */
-    if (NULL == (c_field_names = (char **)HDcalloc((size_t)num_elem, sizeof(char *))))
+    if (NULL == (c_field_names = (char **)calloc((size_t)num_elem, sizeof(char *))))
         HGOTO_DONE(FAIL)
 
     /* copy data to long C string */
@@ -191,9 +191,9 @@ h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *
      */
     tmp_p = tmp;
     for (i = 0; i < num_elem; i++) {
-        if (NULL == (c_field_names[i] = (char *)HDmalloc((size_t)char_len_field_names[i] + 1)))
+        if (NULL == (c_field_names[i] = (char *)malloc((size_t)char_len_field_names[i] + 1)))
             HGOTO_DONE(FAIL)
-        HDmemcpy(c_field_names[i], tmp_p, (size_t)char_len_field_names[i]);
+        memcpy(c_field_names[i], tmp_p, (size_t)char_len_field_names[i]);
         c_field_names[i][char_len_field_names[i]] = '\0';
         tmp_p                                     = tmp_p + *max_char_size_field_names;
     } /* end for */
@@ -208,22 +208,22 @@ h5tbmake_table_ptr_c(size_t_f *namelen1, _fcd name1, hid_t_f *loc_id, size_t_f *
 
 done:
     if (c_name)
-        HDfree(c_name);
+        free(c_name);
     if (c_name1)
-        HDfree(c_name1);
+        free(c_name1);
     if (c_field_names) {
         for (i = 0; i < num_elem; i++) {
             if (c_field_names[i])
-                HDfree(c_field_names[i]);
+                free(c_field_names[i]);
         } /* end for */
-        HDfree(c_field_names);
+        free(c_field_names);
     } /* end if */
     if (tmp)
-        HDfree(tmp);
+        free(tmp);
     if (c_field_offset)
-        HDfree(c_field_offset);
+        free(c_field_offset);
     if (c_field_types)
-        HDfree(c_field_types);
+        free(c_field_types);
 
     return ret_value;
 } /* end h5tbmake_table_c() */
@@ -260,9 +260,9 @@ h5tbread_table_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hsize_t_f *nfiel
     if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
 
-    if (NULL == (c_dst_offset = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_dst_offset = (size_t *)malloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if (NULL == (c_dst_sizes = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_dst_sizes = (size_t *)malloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
 
     for (i = 0; i < c_nfields; i++) {
@@ -278,12 +278,12 @@ h5tbread_table_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hsize_t_f *nfiel
 
 done:
     if (c_name)
-        HDfree(c_name);
+        free(c_name);
 
     if (c_dst_offset)
-        HDfree(c_dst_offset);
+        free(c_dst_offset);
     if (c_dst_sizes)
-        HDfree(c_dst_sizes);
+        free(c_dst_sizes);
 
     return ret_value;
 } /* end h5tbmake_table_c() */
@@ -329,9 +329,9 @@ h5tbwrite_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *
 
 done:
     if (c_name)
-        HDfree(c_name);
+        free(c_name);
     if (c_name1)
-        HDfree(c_name1);
+        free(c_name1);
 
     return ret_value;
 }
@@ -377,9 +377,9 @@ h5tbread_field_name_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *n
 
 done:
     if (c_name)
-        HDfree(c_name);
+        free(c_name);
     if (c_name1)
-        HDfree(c_name1);
+        free(c_name1);
 
     return ret_value;
 }
@@ -423,7 +423,7 @@ h5tbwrite_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *fi
 
 done:
     if (c_name)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -467,7 +467,7 @@ h5tbread_field_index_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *fie
 
 done:
     if (c_name)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -512,9 +512,9 @@ h5tbinsert_field_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *name
 
 done:
     if (c_name)
-        HDfree(c_name);
+        free(c_name);
     if (c_name1)
-        HDfree(c_name1);
+        free(c_name1);
 
     return ret_value;
 }
@@ -557,9 +557,9 @@ h5tbdelete_field_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *name
 
 done:
     if (c_name)
-        HDfree(c_name);
+        free(c_name);
     if (c_name1)
-        HDfree(c_name1);
+        free(c_name1);
 
     return ret_value;
 }
@@ -604,7 +604,7 @@ h5tbget_table_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *n
 
 done:
     if (c_name)
-        HDfree(c_name);
+        free(c_name);
 
     return ret_value;
 }
@@ -655,15 +655,15 @@ h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *n
      */
     if (NULL == (c_name = (char *)HD5f2cstring(name, (size_t)*namelen)))
         HGOTO_DONE(FAIL)
-    if (NULL == (c_field_offsets = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_offsets = (size_t *)malloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if (NULL == (c_field_sizes = (size_t *)HDmalloc(sizeof(size_t) * (size_t)c_nfields)))
+    if (NULL == (c_field_sizes = (size_t *)malloc(sizeof(size_t) * (size_t)c_nfields)))
         HGOTO_DONE(FAIL)
-    if (NULL == (c_field_names = (char **)HDcalloc((size_t)c_nfields, sizeof(char *))))
+    if (NULL == (c_field_names = (char **)calloc((size_t)c_nfields, sizeof(char *))))
         HGOTO_DONE(FAIL)
 
     for (i = 0; i < c_nfields; i++)
-        if (NULL == (c_field_names[i] = (char *)HDmalloc(sizeof(char) * HLTB_MAX_FIELD_LEN)))
+        if (NULL == (c_field_names[i] = (char *)malloc(sizeof(char) * HLTB_MAX_FIELD_LEN)))
             HGOTO_DONE(FAIL)
 
     /*
@@ -676,15 +676,15 @@ h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *n
     /* return values */
 
     /* names array */
-    if (NULL == (tmp = (char *)HDmalloc((c_lenmax * (size_t)c_nfields) + 1)))
+    if (NULL == (tmp = (char *)malloc((c_lenmax * (size_t)c_nfields) + 1)))
         HGOTO_DONE(FAIL)
     tmp_p = tmp;
-    HDmemset(tmp, ' ', c_lenmax * (size_t)c_nfields);
+    memset(tmp, ' ', c_lenmax * (size_t)c_nfields);
     tmp[c_lenmax * c_nfields] = '\0';
     for (i = 0; i < c_nfields; i++) {
-        size_t field_name_len = HDstrlen(c_field_names[i]);
+        size_t field_name_len = strlen(c_field_names[i]);
 
-        HDmemcpy(tmp_p, c_field_names[i], field_name_len);
+        memcpy(tmp_p, c_field_names[i], field_name_len);
         namelen2[i] = (size_t_f)field_name_len;
         length      = MAX(length, strlen((c_field_names[i])));
         tmp_p       = tmp_p + c_lenmax;
@@ -702,19 +702,19 @@ h5tbget_field_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *n
 
 done:
     if (c_name)
-        HDfree(c_name);
+        free(c_name);
     if (c_field_names) {
         for (i = 0; i < num_elem; i++)
             if (c_field_names[i])
-                HDfree(c_field_names[i]);
-        HDfree(c_field_names);
+                free(c_field_names[i]);
+        free(c_field_names);
     } /* end if */
     if (tmp)
-        HDfree(tmp);
+        free(tmp);
     if (c_field_offsets)
-        HDfree(c_field_offsets);
+        free(c_field_offsets);
     if (c_field_sizes)
-        HDfree(c_field_sizes);
+        free(c_field_sizes);
 
     return ret_value;
 }