[svn-r24376] Updated all code to use HDmalloc, HDcalloc, and HDfree.

Prep work for adding a memory free function, part of HDFFV-8551.

Tested on:
    32-bit LE linux (jam) 
        * with C++, Fortran
        * with thread safety on

    These are minor changes (almost entirely renaming foo functions
    to HDfoo) that don't change functionality.  This should not
    require a full commit test.

18 files changed, 175 insertions, 175 deletions

diff --git a/test/accum.c b/test/accum.c
index 488b866..e981b38 100644
--- a/test/accum.c
+++ b/test/accum.c
@@ -1661,9 +1661,9 @@ test_random_write(void)
     unsigned u;                 /* Local index variable */
 
     /* Allocate space for the write & read buffers */
-    wbuf = (uint8_t *)malloc(RANDOM_BUF_SIZE);
+    wbuf = (uint8_t *)HDmalloc(RANDOM_BUF_SIZE);
     HDassert(wbuf);
-    rbuf = (uint8_t *)calloc(RANDOM_BUF_SIZE, 1);
+    rbuf = (uint8_t *)HDcalloc(RANDOM_BUF_SIZE, 1);
     HDassert(rbuf);
 
     /* Initialize write buffer */
@@ -1681,9 +1681,9 @@ HDfprintf(stderr, "Random # seed was: %u\n", seed);
     HDsrandom(seed);
 
     /* Allocate space for the segment length buffer */
-    off = (size_t *)malloc(MAX_RANDOM_SEGMENTS * sizeof(size_t));
+    off = (size_t *)HDmalloc(MAX_RANDOM_SEGMENTS * sizeof(size_t));
     HDassert(off);
-    len = (size_t *)malloc(MAX_RANDOM_SEGMENTS * sizeof(size_t));
+    len = (size_t *)HDmalloc(MAX_RANDOM_SEGMENTS * sizeof(size_t));
     HDassert(len);
 
     /* Randomly choose lengths of segments */
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index 433c488..b3d17dc 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -614,7 +614,7 @@ test_compound (char *filename, hid_t fapl)
     if ((s8_m_sid = H5Screate_simple (2, h_size, NULL)) < 0) goto error;
 
     /* Read the dataset */
-    s8 = (s1_t *) calloc ((size_t)(h_size[0]*h_size[1]), sizeof(s1_t));
+    s8 = (s1_t *) HDcalloc ((size_t)(h_size[0]*h_size[1]), sizeof(s1_t));
     assert (s8);
     if (H5Dread (dataset, s1_tid, s8_m_sid, s8_f_sid, H5P_DEFAULT, s8) < 0) {
 	goto error;
@@ -641,7 +641,7 @@ test_compound (char *filename, hid_t fapl)
 	}
     }
 
-    free (s8);
+    HDfree (s8);
     s8 = NULL;
     PASSED();
 
@@ -781,7 +781,7 @@ test_compound (char *filename, hid_t fapl)
     f_offset[1] = NY/3;
     h_size[0] = 2*NX/3 - f_offset[0];
     h_size[1] = 2*NY/3 - f_offset[1];
-    s11 = (s4_t *) malloc ((size_t)h_size[0]*(size_t)h_size[1]*sizeof(s4_t));
+    s11 = (s4_t *) HDmalloc ((size_t)h_size[0]*(size_t)h_size[1]*sizeof(s4_t));
     assert (s11);
 
     /* Initialize */
@@ -793,7 +793,7 @@ test_compound (char *filename, hid_t fapl)
     if (H5Dwrite (dataset, s4_tid, s8_m_sid, s8_f_sid, PRESERVE, s11) < 0) {
 	goto error;
     }
-    free (s11);
+    HDfree (s11);
     s11=NULL;
 
     /* Read the whole thing */
@@ -1380,12 +1380,12 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
 	goto error;
 
     /* Allocate space and initialize data */
-    orig = (unsigned char*)malloc(NX * NY * sizeof(stype1));
+    orig = (unsigned char*)HDmalloc(NX * NY * sizeof(stype1));
     initialize_stype1(orig, (size_t)NX*NY);
 
-    rbuf = (unsigned char*)malloc(NX * NY * sizeof(stype2));
+    rbuf = (unsigned char*)HDmalloc(NX * NY * sizeof(stype2));
 
-    rew_buf = (unsigned char*)malloc(NX * NY * sizeof(stype3));
+    rew_buf = (unsigned char*)HDmalloc(NX * NY * sizeof(stype3));
     initialize_stype3(rew_buf, (size_t)NX*NY);
 
 
@@ -1515,9 +1515,9 @@ test_hdf5_src_subset(char *filename, hid_t fapl)
     if(H5Fclose(file) < 0)
         FAIL_STACK_ERROR
 
-    free(orig);
-    free(rbuf);
-    free(rew_buf);
+    HDfree(orig);
+    HDfree(rbuf);
+    HDfree(rew_buf);
 
     PASSED();
     return 0;
@@ -1585,12 +1585,12 @@ test_hdf5_dst_subset(char *filename, hid_t fapl)
 	goto error;
 
     /* Allocate space and initialize data */
-    orig = (unsigned char*)malloc(NX * NY * sizeof(stype2));
+    orig = (unsigned char*)HDmalloc(NX * NY * sizeof(stype2));
     initialize_stype2(orig, (size_t)NX*NY);
 
-    rbuf = (unsigned char*)malloc(NX * NY * sizeof(stype1));
+    rbuf = (unsigned char*)HDmalloc(NX * NY * sizeof(stype1));
 
-    rew_buf = (unsigned char*)malloc(NX * NY * sizeof(stype4));
+    rew_buf = (unsigned char*)HDmalloc(NX * NY * sizeof(stype4));
     initialize_stype4(rew_buf, (size_t)NX*NY);
 
     /* Create dataset creation property list */
@@ -1719,9 +1719,9 @@ test_hdf5_dst_subset(char *filename, hid_t fapl)
     if(H5Fclose(file) < 0)
         goto error;
 
-    free(orig);
-    free(rbuf);
-    free(rew_buf);
+    HDfree(orig);
+    HDfree(rbuf);
+    HDfree(rew_buf);
 
     PASSED();
     return 0;
diff --git a/test/dsets.c b/test/dsets.c
index cec8f9a..a8163be 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -477,7 +477,7 @@ test_simple_io(const char *env_h5_drvr, hid_t fapl)
 
         HDclose(f);
 
-        free (tconv_buf);
+        HDfree (tconv_buf);
         PASSED();
     } /* end if */
     else {
@@ -1848,13 +1848,13 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
     if(H5Dclose (dataset) < 0) goto error;
     if(H5Sclose (sid) < 0) goto error;
     if(H5Pclose (dxpl) < 0) goto error;
-    free (tconv_buf);
+    HDfree (tconv_buf);
 
     return(0);
 
 error:
     if(tconv_buf)
-        free (tconv_buf);
+        HDfree (tconv_buf);
     return -1;
 }
 
@@ -6533,7 +6533,7 @@ auxread_fdata(hid_t fid, const char *name)
     if(H5Dclose(dset_id) < 0)
         goto error;
     if(buf)
-        free(buf);
+        HDfree(buf);
 
     return 0;
 
@@ -6545,7 +6545,7 @@ error:
         H5Tclose(ftype_id);
         H5Tclose(mtype_id);
         if(buf)
-            free(buf);
+            HDfree(buf);
     } H5E_END_TRY;
     return -1;
 }
diff --git a/test/dt_arith.c b/test/dt_arith.c
index 9f003a6..c3692d0 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -296,8 +296,8 @@ static int without_hardware_g = 0;
     HDmemset(BUF, 0, NELMTS*MAX(SRC_SIZE, DST_SIZE));                                           \
     HDmemset(SAVED, 0, NELMTS*MAX(SRC_SIZE, DST_SIZE));                                         \
                                                                                                 \
-    tmp1 = (unsigned char*)calloc((size_t)1, (size_t)SRC_SIZE);                                                 \
-    tmp2 = (unsigned char*)calloc((size_t)1, (size_t)SRC_SIZE);                                                 \
+    tmp1 = (unsigned char*)HDcalloc((size_t)1, (size_t)SRC_SIZE);                                                 \
+    tmp2 = (unsigned char*)HDcalloc((size_t)1, (size_t)SRC_SIZE);                                                 \
                                                                                                 \
     buf_p = BUF;                                                                                \
     saved_p = SAVED;                                                                            \
@@ -325,8 +325,8 @@ static int without_hardware_g = 0;
         buf_p += SRC_SIZE;                                                                      \
         saved_p += SRC_SIZE;                                                                    \
     }                                                                                           \
-    free(tmp1);                                                                                 \
-    free(tmp2);                                                                                 \
+    HDfree(tmp1);                                                                                 \
+    HDfree(tmp2);                                                                                 \
 }
 
 /* Allocate buffer and initialize it with floating-point special values, +/-0, +/-infinity,
@@ -348,7 +348,7 @@ static int without_hardware_g = 0;
     SAVED = (unsigned char*)aligned_malloc( NELMTS*MAX(SRC_SIZE, DST_SIZE));                    \
     HDmemset(BUF, 0, NELMTS*MAX(SRC_SIZE, DST_SIZE));                                           \
     HDmemset(SAVED, 0, NELMTS*MAX(SRC_SIZE, DST_SIZE));                                         \
-    value = (unsigned char*)calloc(SRC_SIZE, sizeof(unsigned char));                            \
+    value = (unsigned char*)HDcalloc(SRC_SIZE, sizeof(unsigned char));                            \
                                                                                                 \
     buf_p = BUF;                                                                                \
                                                                                                 \
@@ -391,7 +391,7 @@ static int without_hardware_g = 0;
     }                                                                                           \
                                                                                                 \
     HDmemcpy(SAVED, BUF, NELMTS*MAX(SRC_SIZE, DST_SIZE));                                         \
-    free(value);                                                                                \
+    HDfree(value);                                                                                \
 }
 
 void some_dummy_func(float x);
@@ -751,8 +751,8 @@ static int test_particular_fp_integer(void)
     endian = H5Tget_order(H5T_NATIVE_DOUBLE);
     src_size1 = H5Tget_size(H5T_NATIVE_DOUBLE);
     dst_size1 = H5Tget_size(H5T_NATIVE_SCHAR);
-    buf1 = (unsigned char*)calloc((size_t)1, (size_t)MAX(src_size1, dst_size1));
-    saved_buf1 = (unsigned char*)calloc((size_t)1, (size_t)MAX(src_size1, dst_size1));
+    buf1 = (unsigned char*)HDcalloc((size_t)1, (size_t)MAX(src_size1, dst_size1));
+    saved_buf1 = (unsigned char*)HDcalloc((size_t)1, (size_t)MAX(src_size1, dst_size1));
 
     memcpy(buf1, &src_d, src_size1);
     memcpy(saved_buf1, &src_d, src_size1);
@@ -801,8 +801,8 @@ static int test_particular_fp_integer(void)
     /* Test conversion from float (the value is INT_MAX) to int. */
     src_size2 = H5Tget_size(H5T_NATIVE_FLOAT);
     dst_size2 = H5Tget_size(H5T_NATIVE_INT);
-    buf2 = (unsigned char*)calloc((size_t)1, (size_t)MAX(src_size2, dst_size2));
-    saved_buf2 = (unsigned char*)calloc((size_t)1, (size_t)MAX(src_size2, dst_size2));
+    buf2 = (unsigned char*)HDcalloc((size_t)1, (size_t)MAX(src_size2, dst_size2));
+    saved_buf2 = (unsigned char*)HDcalloc((size_t)1, (size_t)MAX(src_size2, dst_size2));
     HDmemcpy(buf2, &src_f, src_size2);
     HDmemcpy(saved_buf2, &src_f, src_size2);
 
@@ -852,13 +852,13 @@ static int test_particular_fp_integer(void)
     }
 
     if(buf1)
-        free(buf1);
+        HDfree(buf1);
     if(buf2)
-        free(buf2);
+        HDfree(buf2);
     if(saved_buf1)
-        free(saved_buf1);
+        HDfree(saved_buf1);
     if(saved_buf2)
-        free(saved_buf2);
+        HDfree(saved_buf2);
 
     PASSED();
     return 0;
@@ -869,13 +869,13 @@ error:
         H5Pclose(dxpl_id);
     } H5E_END_TRY;
     if(buf1)
-        free(buf1);
+        HDfree(buf1);
     if(buf2)
-        free(buf2);
+        HDfree(buf2);
     if(saved_buf1)
-        free(saved_buf1);
+        HDfree(saved_buf1);
     if(saved_buf2)
-        free(saved_buf2);
+        HDfree(saved_buf2);
 
     reset_hdf5(); /*print statistics*/
     return MAX((int)fails_this_test, 1);
@@ -1044,11 +1044,11 @@ test_derived_flt(void)
      */
     src_size = H5Tget_size(H5T_NATIVE_INT);
     endian = H5Tget_order(H5T_NATIVE_INT);
-    buf = (unsigned char*)malloc(nelmts * (MAX(src_size, size)));
-    saved_buf = (unsigned char*)malloc(nelmts * src_size);
+    buf = (unsigned char*)HDmalloc(nelmts * (MAX(src_size, size)));
+    saved_buf = (unsigned char*)HDmalloc(nelmts * src_size);
     HDmemset(buf, 0, nelmts * MAX(src_size, size));
     HDmemset(saved_buf, 0, nelmts * src_size);
-    aligned = (int*)calloc((size_t)1, src_size);
+    aligned = (int*)HDcalloc((size_t)1, src_size);
 
     for(i = 0; i < nelmts * src_size; i++)
         buf[i] = saved_buf[i] = HDrand();
@@ -1105,9 +1105,9 @@ test_derived_flt(void)
     }
 
     fails_this_test = 0;
-    free(buf);
-    free(saved_buf);
-    free(aligned);
+    HDfree(buf);
+    HDfree(saved_buf);
+    HDfree(aligned);
     buf = NULL;
     saved_buf = NULL;
     aligned = NULL;
@@ -1204,8 +1204,8 @@ test_derived_flt(void)
     src_size = H5Tget_size(tid2);
     dst_size = H5Tget_size(tid1);
     endian = H5Tget_order(tid2);
-    buf = (unsigned char*)malloc(nelmts*(MAX(src_size, dst_size)));
-    saved_buf = (unsigned char*)malloc(nelmts*src_size);
+    buf = (unsigned char*)HDmalloc(nelmts*(MAX(src_size, dst_size)));
+    saved_buf = (unsigned char*)HDmalloc(nelmts*src_size);
     HDmemset(buf, 0, nelmts*MAX(src_size, dst_size));
     HDmemset(saved_buf, 0, nelmts*src_size);
 
@@ -1268,8 +1268,8 @@ test_derived_flt(void)
         }
     }
 
-    if (buf) free(buf);
-    if (saved_buf) free(saved_buf);
+    if (buf) HDfree(buf);
+    if (saved_buf) HDfree(saved_buf);
 
     if(H5Tclose(tid1) < 0) {
         H5_FAILED();
@@ -1301,9 +1301,9 @@ test_derived_flt(void)
     return 0;
 
  error:
-    if (buf) free(buf);
-    if (saved_buf) free(saved_buf);
-    if (aligned) free(aligned);
+    if (buf) HDfree(buf);
+    if (saved_buf) HDfree(saved_buf);
+    if (aligned) HDfree(aligned);
     HDfflush(stdout);
     H5E_BEGIN_TRY {
         H5Tclose (tid1);
@@ -1594,8 +1594,8 @@ test_derived_integer(void)
         goto error;
     } /* end if */
 
-    free(buf);
-    free(saved_buf);
+    HDfree(buf);
+    HDfree(saved_buf);
 
     PASSED();
     reset_hdf5();	/*print statistics*/
@@ -1603,8 +1603,8 @@ test_derived_integer(void)
     return 0;
 
  error:
-    if (buf) free(buf);
-    if (saved_buf) free(saved_buf);
+    if (buf) HDfree(buf);
+    if (saved_buf) HDfree(saved_buf);
     HDfflush(stdout);
     H5E_BEGIN_TRY {
         H5Tclose (tid1);
@@ -2781,7 +2781,7 @@ my_isinf(int endian, unsigned char *val, size_t size,
     int retval = 0;
     size_t i;
 
-    bits = (unsigned char*)calloc((size_t)1, size);
+    bits = (unsigned char*)HDcalloc((size_t)1, size);
 
 #ifdef H5_VMS
     if(H5T_ORDER_VAX==endian) {
@@ -2805,7 +2805,7 @@ my_isinf(int endian, unsigned char *val, size_t size,
             H5T__bit_find(bits, epos, esize, H5T_BIT_LSB, 0) < 0)
         retval = 1;
 
-    free(bits);
+    HDfree(bits);
 
     return retval;
 }
diff --git a/test/dtypes.c b/test/dtypes.c
index de64713..e0bc2ae 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -697,9 +697,9 @@ test_compound_2(void)
         FAIL_STACK_ERROR
 
     /* Sizes should be the same, but be careful just in case */
-    buf = (unsigned char*)malloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt)));
-    bkg = (unsigned char*)malloc(nelmts * sizeof(struct dt));
-    orig = (unsigned char*)malloc(nelmts * sizeof(struct st));
+    buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt)));
+    bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt));
+    orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st));
     for (i=0; i<(int)nelmts; i++) {
 	s_ptr = ((struct st*)orig) + i;
 	s_ptr->a    = i*8+0;
@@ -762,9 +762,9 @@ test_compound_2(void)
     }
 
     /* Release resources */
-    free(buf);
-    free(bkg);
-    free(orig);
+    HDfree(buf);
+    HDfree(bkg);
+    HDfree(orig);
     CHECK_NMEMBS(nmembs , st, dt)
 
     PASSED();
@@ -818,9 +818,9 @@ test_compound_3(void)
         FAIL_STACK_ERROR
 
     /* Initialize */
-    buf = (unsigned char*)malloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt)));
-    bkg = (unsigned char*)malloc(nelmts * sizeof(struct dt));
-    orig = (unsigned char*)malloc(nelmts * sizeof(struct st));
+    buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt)));
+    bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt));
+    orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st));
     for (i=0; i<(int)nelmts; i++) {
         s_ptr = ((struct st*)orig) + i;
         s_ptr->a    = i*8+0;
@@ -880,9 +880,9 @@ test_compound_3(void)
     }
 
     /* Release resources */
-    free(buf);
-    free(bkg);
-    free(orig);
+    HDfree(buf);
+    HDfree(bkg);
+    HDfree(orig);
     CHECK_NMEMBS(nmembs, st, dt)
 
     PASSED();
@@ -940,9 +940,9 @@ test_compound_4(void)
         FAIL_STACK_ERROR
 
     /* Sizes should be the same, but be careful just in case */
-    buf = (unsigned char*)malloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt)));
-    bkg = (unsigned char*)malloc(nelmts * sizeof(struct dt));
-    orig = (unsigned char*)malloc(nelmts * sizeof(struct st));
+    buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt)));
+    bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt));
+    orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st));
     for (i=0; i<(int)nelmts; i++) {
         s_ptr = ((struct st*)orig) + i;
         s_ptr->a    = i*8+0;
@@ -1006,9 +1006,9 @@ test_compound_4(void)
     }
 
     /* Release resources */
-    free(buf);
-    free(bkg);
-    free(orig);
+    HDfree(buf);
+    HDfree(bkg);
+    HDfree(orig);
     CHECK_NMEMBS(nmembs, st, dt)
 
     PASSED();
@@ -1175,9 +1175,9 @@ test_compound_6(void)
         FAIL_STACK_ERROR
 
     /* Sizes should be the same, but be careful just in case */
-    buf = (unsigned char*)malloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt)));
-    bkg = (unsigned char*)malloc(nelmts * sizeof(struct dt));
-    orig = (unsigned char*)malloc(nelmts * sizeof(struct st));
+    buf = (unsigned char*)HDmalloc(nelmts * MAX(sizeof(struct st), sizeof(struct dt)));
+    bkg = (unsigned char*)HDmalloc(nelmts * sizeof(struct dt));
+    orig = (unsigned char*)HDmalloc(nelmts * sizeof(struct st));
     for (i=0; i<(int)nelmts; i++) {
         s_ptr = ((struct st*)orig) + i;
         s_ptr->b    = (i*8+1) & 0x7fff;
@@ -1223,9 +1223,9 @@ test_compound_6(void)
     }
 
     /* Release resources */
-    free(buf);
-    free(bkg);
-    free(orig);
+    HDfree(buf);
+    HDfree(bkg);
+    HDfree(orig);
     CHECK_NMEMBS(nmembs, st, dt)
 
     PASSED();
@@ -1790,7 +1790,7 @@ test_compound_9(void)
     } /* end if */
 
     rdata.i1 = rdata.i2 = 0;
-    if(rdata.str) free(rdata.str);
+    if(rdata.str) HDfree(rdata.str);
 
     if(H5Dread(dset_id, dup_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata) < 0) {
         H5_FAILED(); AT();
@@ -1804,7 +1804,7 @@ test_compound_9(void)
         goto error;
     } /* end if */
 
-    if(rdata.str) free(rdata.str);
+    if(rdata.str) HDfree(rdata.str);
 
     if(H5Dclose(dset_id) < 0)
         goto error;
@@ -1983,10 +1983,10 @@ test_compound_10(void)
             goto error;
         }
 
-        free(t1);
-        free(t2);
-        free(wdata[i].str);
-        free(rdata[i].str);
+        HDfree(t1);
+        HDfree(t2);
+        HDfree(wdata[i].str);
+        HDfree(rdata[i].str);
     } /* end for */
 
     if(H5Dclose(dset_id) < 0)
@@ -4547,7 +4547,7 @@ test_conv_enum_2(void)
         H5Tenum_insert(dsttype, mname[i], &i);
 
     /* Source data */
-    data = (int*)malloc(NTESTELEM*sizeof(int));
+    data = (int*)HDmalloc(NTESTELEM*sizeof(int));
     for (i=0; i<NTESTELEM; i++) {
         ((char*)data)[i*3+2] = (char)(i % 8);
         ((char*)data)[i*3+0] = 0;
@@ -4569,7 +4569,7 @@ test_conv_enum_2(void)
     }
 
     /* Cleanup */
-    free(data);
+    HDfree(data);
     H5Tclose(srctype);
     H5Tclose(dsttype);
     H5Tclose(oddsize);
@@ -5387,7 +5387,7 @@ test_encode(void)
         printf("Can't close datatype\n");
         goto error;
     } /* end if */
-    free(cmpd_buf);
+    HDfree(cmpd_buf);
     cmpd_buf_size = 0;
 
     /* Commit enumeration datatype and close it */
@@ -5406,7 +5406,7 @@ test_encode(void)
         printf("Can't close datatype\n");
         goto error;
     } /* end if */
-    free(enum_buf);
+    HDfree(enum_buf);
     enum_buf_size = 0;
 
     /* Commit enumeration datatype and close it */
@@ -5425,7 +5425,7 @@ test_encode(void)
         printf("Can't close datatype\n");
         goto error;
     } /* end if */
-    free(vlstr_buf);
+    HDfree(vlstr_buf);
     vlstr_buf_size = 0;
 
     /* Open the dataytpe for query */
@@ -5543,7 +5543,7 @@ test_encode(void)
         printf("Can't decode VL string type\n");
         goto error;
     } /* end if */
-    free(vlstr_buf);
+    HDfree(vlstr_buf);
 
     /* Verify that the datatype was copied exactly */
     if(H5Tequal(decoded_tid3, tid3)<=0) {
@@ -5656,8 +5656,8 @@ test_encode(void)
         goto error;
     } /* end if */
 
-    free(cmpd_buf);
-    free(enum_buf);
+    HDfree(cmpd_buf);
+    HDfree(enum_buf);
 
     PASSED();
     return 0;
diff --git a/test/h5test.c b/test/h5test.c
index 32d78bd..30a3adf 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -751,7 +751,7 @@ h5_set_info_object(void)
             /* copy key/value pair into temporary buffer */
             len = strcspn(valp, ";");
             next = &valp[len];
-            key_val = (char *)calloc(1, len + 1);
+            key_val = (char *)HDcalloc(1, len + 1);
 
             /* increment the next pointer past the terminating semicolon */
             if (*next == ';')
diff --git a/test/ntypes.c b/test/ntypes.c
index 0af3a3f..c52c08f 100644
--- a/test/ntypes.c
+++ b/test/ntypes.c
@@ -2605,7 +2605,7 @@ test_bitfield_dtype(hid_t file)
 
     if((ntype_size = H5Tget_size(native_type)) == 0) TEST_ERROR;
 
-    rbuf = malloc((size_t)nelmts*ntype_size);
+    rbuf = HDmalloc((size_t)nelmts*ntype_size);
 
     /* Read the data and compare them */
     if(H5Dread(dataset1, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) TEST_ERROR;
@@ -2624,7 +2624,7 @@ test_bitfield_dtype(hid_t file)
     if(H5Tclose(dtype) < 0) TEST_ERROR;
     if(H5Tclose(native_type) < 0) TEST_ERROR;
     if(H5Dclose(dataset1) < 0) TEST_ERROR;
-    if(rbuf) free(rbuf);
+    if(rbuf) HDfree(rbuf);
 
     /* Open dataset2 again to check H5Tget_native_type */
     if((dataset2 = H5Dopen2(file, DSET2_BITFIELD_NAME, H5P_DEFAULT)) < 0) TEST_ERROR;
diff --git a/test/tarray.c b/test/tarray.c
index 299c74e..e3999bb 100644
--- a/test/tarray.c
+++ b/test/tarray.c
@@ -637,7 +637,7 @@ test_array_compound_atomic(void)
     CHECK(mname, NULL, "H5Tget_member_name");
     if(HDstrcmp(mname, "i") != 0)
         TestErrPrintf("Compound field name doesn't match!, mname=%s\n", mname);
-    free(mname);
+    HDfree(mname);
 
     /* Check the 1st field's offset */
     off = H5Tget_member_offset(tid2, 0);
@@ -656,7 +656,7 @@ test_array_compound_atomic(void)
     CHECK(mname, NULL, "H5Tget_member_name");
     if(HDstrcmp(mname, "f") != 0)
         TestErrPrintf("Compound field name doesn't match!, mname=%s\n", mname);
-    free(mname);
+    HDfree(mname);
 
     /* Check the 2nd field's offset */
     off = H5Tget_member_offset(tid2, 1);
@@ -849,7 +849,7 @@ test_array_compound_array(void)
     CHECK(mname, NULL, "H5Tget_member_name");
     if(HDstrcmp(mname,"i")!=0)
         TestErrPrintf("Compound field name doesn't match!, mname=%s\n",mname);
-    free(mname);
+    HDfree(mname);
 
     /* Check the 1st field's offset */
     off=H5Tget_member_offset(tid2,0);
@@ -868,7 +868,7 @@ test_array_compound_array(void)
     CHECK(mname, NULL, "H5Tget_member_name");
     if(HDstrcmp(mname,"f")!=0)
         TestErrPrintf("Compound field name doesn't match!, mname=%s\n",mname);
-    free(mname);
+    HDfree(mname);
 
     /* Check the 2nd field's offset */
     off=H5Tget_member_offset(tid2,1);
@@ -1041,7 +1041,7 @@ test_array_vlen_atomic(void)
     /* Initialize array data to write */
     for(i=0; i<SPACE1_DIM1; i++)
         for(j=0; j<ARRAY1_DIM1; j++) {
-            wdata[i][j].p=malloc((i+j+1)*sizeof(unsigned int));
+            wdata[i][j].p=HDmalloc((i+j+1)*sizeof(unsigned int));
             wdata[i][j].len=i+j+1;
             for(k=0; k<(i+j+1); k++)
                 ((unsigned int *)wdata[i][j].p)[k]=i*100+j*10+k;
@@ -1252,7 +1252,7 @@ test_array_vlen_array(void)
     /* Initialize array data to write */
     for(i=0; i<SPACE1_DIM1; i++)
         for(j=0; j<ARRAY1_DIM1; j++) {
-            wdata[i][j].p=malloc((i+j+1)*(sizeof(unsigned int)*ARRAY1_DIM1));
+            wdata[i][j].p=HDmalloc((i+j+1)*(sizeof(unsigned int)*ARRAY1_DIM1));
             wdata[i][j].len=i+j+1;
             for(k=0; k<(i+j+1); k++)
                 for(l=0; l<ARRAY1_DIM1; l++)
@@ -1633,7 +1633,7 @@ test_array_bkg(void)
     /* Release memory resources */
     /* ------------------------ */
     for (i = 0; i < dtsinfo.nsubfields; i++)
-        free(dtsinfo.name[i]);
+        HDfree(dtsinfo.name[i]);
 
 
     /* Release IDs */
@@ -1848,7 +1848,7 @@ test_compat(void)
         CHECK(mname, NULL, "H5Tget_member_name");
         if(HDstrcmp(mname,"i")!=0)
             TestErrPrintf("Compound field name doesn't match!, mname=%s\n",mname);
-        free(mname);
+        HDfree(mname);
 
         /* Check the 1st field's offset */
         off=H5Tget_member_offset(tid1,0);
@@ -1867,7 +1867,7 @@ test_compat(void)
         CHECK(mname, NULL, "H5Tget_member_name");
         if(HDstrcmp(mname,"f")!=0)
             TestErrPrintf("Compound field name doesn't match!, mname=%s\n",mname);
-        free(mname);
+        HDfree(mname);
 
         /* Check the 2nd field's offset */
         off=H5Tget_member_offset(tid1,1);
@@ -1886,7 +1886,7 @@ test_compat(void)
         CHECK(mname, NULL, "H5Tget_member_name");
         if(HDstrcmp(mname,"l")!=0)
             TestErrPrintf("Compound field name doesn't match!, mname=%s\n",mname);
-        free(mname);
+        HDfree(mname);
 
         /* Check the 3rd field's offset */
         off=H5Tget_member_offset(tid1,2);
@@ -1930,7 +1930,7 @@ test_compat(void)
         CHECK(mname, NULL, "H5Tget_member_name");
         if(mname && HDstrcmp(mname,"i")!=0)
             TestErrPrintf("Compound field name doesn't match!, mname=%s\n",mname);
-        if(mname) free(mname);
+        if(mname) HDfree(mname);
 
         /* Check the 1st field's offset */
         off=H5Tget_member_offset(tid1,0);
@@ -1949,7 +1949,7 @@ test_compat(void)
         CHECK(mname, NULL, "H5Tget_member_name");
         if(mname && HDstrcmp(mname,"f")!=0)
             TestErrPrintf("Compound field name doesn't match!, mname=%s\n",mname);
-        if(mname) free(mname);
+        if(mname) HDfree(mname);
 
         /* Check the 2nd field's offset */
         off=H5Tget_member_offset(tid1,1);
@@ -1994,7 +1994,7 @@ test_compat(void)
         CHECK(mname, NULL, "H5Tget_member_name");
         if(mname && HDstrcmp(mname,"l")!=0)
             TestErrPrintf("Compound field name doesn't match!, mname=%s\n",mname);
-        if(mname) free(mname);
+        if(mname) HDfree(mname);
 
         /* Check the 3rd field's offset */
         off=H5Tget_member_offset(tid1,2);
@@ -2039,7 +2039,7 @@ test_compat(void)
         CHECK(mname, NULL, "H5Tget_member_name");
         if(mname && HDstrcmp(mname,"d")!=0)
             TestErrPrintf("Compound field name doesn't match!, mname=%s\n",mname);
-        if(mname) free(mname);
+        if(mname) HDfree(mname);
 
         /* Check the 4th field's offset */
         off=H5Tget_member_offset(tid1,3);
diff --git a/test/tattr.c b/test/tattr.c
index 1285f0e..a5a61bc 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -829,7 +829,7 @@ test_attr_compound_read(hid_t fapl)
                 HDstrcmp(fieldname, ATTR4_FIELDNAME2) ||
                 HDstrcmp(fieldname, ATTR4_FIELDNAME3)))
             TestErrPrintf("invalid field name for field #%d: %s\n", i, fieldname);
-        free(fieldname);
+        HDfree(fieldname);
       } /* end for */
     offset = H5Tget_member_offset(type, 0);
     VERIFY(offset, attr4_field1_off, "H5Tget_member_offset");
diff --git a/test/tgenprop.c b/test/tgenprop.c
index f304f11..5f8d8f5 100644
--- a/test/tgenprop.c
+++ b/test/tgenprop.c
@@ -88,7 +88,7 @@ test_genprop_basic_class(void)
     CHECK_PTR(name, "H5Pget_class_name");
     if(HDstrcmp(name,CLASS1_NAME)!=0)
         TestErrPrintf("Class names don't match!, name=%s, CLASS1_NAME=%s\n",name,CLASS1_NAME);
-    free(name);
+    HDfree(name);
 
     /* Check class parent */
     cid2 = H5Pget_class_parent(cid1);
@@ -119,7 +119,7 @@ test_genprop_basic_class(void)
     CHECK_PTR(name, "H5Pget_class_name");
     if(HDstrcmp(name,CLASS2_NAME)!=0)
         TestErrPrintf("Class names don't match!, name=%s, CLASS2_NAME=%s\n",name,CLASS2_NAME);
-    free(name);
+    HDfree(name);
 
     /* Check class parent */
     cid2 = H5Pget_class_parent(cid1);
@@ -1818,7 +1818,7 @@ test_genprop_path(void)
     VERIFY(ret, 1, "H5Pequal");
 
     /* Release the path string */
-    free(path);
+    HDfree(path);
 
     /* Close class */
     ret = H5Pclose_class(cid3);
diff --git a/test/tid.c b/test/tid.c
index 87f3d37..4ea45db 100644
--- a/test/tid.c
+++ b/test/tid.c
@@ -81,13 +81,13 @@ static int basic_id_test(void)
 	/* Register an ID and retrieve the object it points to.
 	 * Once the ID has been registered, testObj will be freed when
          * its ID type is destroyed. */
-	testObj = malloc(7 * sizeof(int));
+	testObj = HDmalloc(7 * sizeof(int));
 	arrayID = H5Iregister(myType, testObj);
 
 	CHECK(arrayID, H5I_INVALID_HID, "H5Iregister");
 	if(arrayID == H5I_INVALID_HID)
         {
-		free(testObj);
+		HDfree(testObj);
 		goto out;
         }
 
@@ -175,13 +175,13 @@ static int basic_id_test(void)
 	 * freed when the previous type was destroyed.  Allocate new
 	 * memory for it.
          */
-	testObj = malloc(7 * sizeof(int));
+	testObj = HDmalloc(7 * sizeof(int));
 	arrayID = H5Iregister(myType, testObj);
 
 	CHECK(arrayID, H5I_INVALID_HID, "H5Iregister");
 	if(arrayID == H5I_INVALID_HID)
 	{
-		free(testObj);
+		HDfree(testObj);
 		goto out;
 	}
 
@@ -250,7 +250,7 @@ static int id_predefined_test(void )
 	void * testPtr;
 	herr_t testErr;
 
-	testObj = malloc(sizeof(int));
+	testObj = HDmalloc(sizeof(int));
 
 	/* Try to perform illegal functions on various predefined types */
 	H5E_BEGIN_TRY
@@ -319,14 +319,14 @@ static int id_predefined_test(void )
 
 	/* testObj was never registered as an atom, so it will not be
          * automatically freed. */
-	free(testObj);
+	HDfree(testObj);
 	return 0;
 
 out:
 	if(typeID != H5I_INVALID_HID)
 		H5Tclose(typeID);
         if(testObj != NULL)
-		free(testObj);
+		HDfree(testObj);
 
 	return -1;
 }
diff --git a/test/tmisc.c b/test/tmisc.c
index 6fcf557..512d029 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -1677,7 +1677,7 @@ test_misc8(void)
     /* Free the read & write buffers */
     HDfree(wdata);
 #ifdef VERIFY_DATA
-    free(rdata);
+    HDfree(rdata);
 #endif /* VERIFY_DATA */
 } /* end test_misc8() */
 
diff --git a/test/trefer.c b/test/trefer.c
index 9031fdb..698e95a 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -90,9 +90,9 @@ test_reference_params(void)
     MESSAGE(5, ("Testing Reference Parameters\n"));
 
     /* Allocate write & read buffers */
-    wbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
-    rbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
-    tbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
+    wbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
+    rbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
+    tbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
 
     /* Create file */
     fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -234,9 +234,9 @@ test_reference_params(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free memory buffers */
-    free(wbuf);
-    free(rbuf);
-    free(tbuf);
+    HDfree(wbuf);
+    HDfree(rbuf);
+    HDfree(tbuf);
 }   /* test_reference_obj() */
 
 /****************************************************************
@@ -271,9 +271,9 @@ test_reference_obj(void)
     MESSAGE(5, ("Testing Object Reference Functions\n"));
 
     /* Allocate write & read buffers */
-    wbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
-    rbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
-    tbuf = (hobj_ref_t *)malloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
+    wbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
+    rbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
+    tbuf = (hobj_ref_t *)HDmalloc(MAX(sizeof(unsigned), sizeof(hobj_ref_t)) * SPACE1_DIM1);
 
     /* Create file */
     fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
@@ -482,9 +482,9 @@ test_reference_obj(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free memory buffers */
-    free(wbuf);
-    free(rbuf);
-    free(tbuf);
+    HDfree(wbuf);
+    HDfree(rbuf);
+    HDfree(tbuf);
 }   /* test_reference_obj() */
 
 /****************************************************************
@@ -763,10 +763,10 @@ test_reference_region(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free memory buffers */
-    free(wbuf);
-    free(rbuf);
-    free(dwbuf);
-    free(drbuf);
+    HDfree(wbuf);
+    HDfree(rbuf);
+    HDfree(dwbuf);
+    HDfree(drbuf);
 }   /* test_reference_region() */
 
 /****************************************************************
@@ -1048,10 +1048,10 @@ test_reference_region_1D(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free memory buffers */
-    free(wbuf);
-    free(rbuf);
-    free(dwbuf);
-    free(drbuf);
+    HDfree(wbuf);
+    HDfree(rbuf);
+    HDfree(dwbuf);
+    HDfree(drbuf);
 }   /* test_reference_region_1D() */
 
 /****************************************************************
diff --git a/test/tselect.c b/test/tselect.c
index 1041ab3..8ca3c24 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -354,8 +354,8 @@ test_select_hyper(hid_t xfer_plist)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free memory buffers */
-    free(wbuf);
-    free(rbuf);
+    HDfree(wbuf);
+    HDfree(rbuf);
 }   /* test_select_hyper() */
 
 struct pnt_iter {
@@ -637,8 +637,8 @@ test_select_point(hid_t xfer_plist)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free memory buffers */
-    free(wbuf);
-    free(rbuf);
+    HDfree(wbuf);
+    HDfree(rbuf);
 }   /* test_select_point() */
 
 /****************************************************************
@@ -750,8 +750,8 @@ test_select_all(hid_t xfer_plist)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free memory buffers */
-    free(wbuf);
-    free(rbuf);
+    HDfree(wbuf);
+    HDfree(rbuf);
 }   /* test_select_all() */
 
 /****************************************************************
@@ -890,8 +890,8 @@ test_select_all_hyper(hid_t xfer_plist)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free memory buffers */
-    free(wbuf);
-    free(rbuf);
+    HDfree(wbuf);
+    HDfree(rbuf);
 }   /* test_select_all_hyper() */
 
 /****************************************************************
@@ -5406,8 +5406,8 @@ test_select_hyper_and_2d(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free memory buffers */
-    free(wbuf);
-    free(rbuf);
+    HDfree(wbuf);
+    HDfree(rbuf);
 }   /* test_select_hyper_and_2d() */
 
 /****************************************************************
@@ -5537,8 +5537,8 @@ test_select_hyper_xor_2d(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free memory buffers */
-    free(wbuf);
-    free(rbuf);
+    HDfree(wbuf);
+    HDfree(rbuf);
 }   /* test_select_hyper_xor_2d() */
 
 /****************************************************************
@@ -5667,8 +5667,8 @@ test_select_hyper_notb_2d(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free memory buffers */
-    free(wbuf);
-    free(rbuf);
+    HDfree(wbuf);
+    HDfree(rbuf);
 }   /* test_select_hyper_notb_2d() */
 
 /****************************************************************
@@ -6440,8 +6440,8 @@ test_select_point_chunk(void)
     ret = H5Fclose(file);
     CHECK(ret, FAIL, "H5Fclose");
 
-    free(data);
-    free (data_out);
+    HDfree(data);
+    HDfree (data_out);
 }   /* test_select_point_chunk() */
 
 /****************************************************************
@@ -7620,8 +7620,8 @@ test_select_none(void)
     CHECK(ret, FAIL, "H5Fclose");
 
     /* Free memory buffers */
-    free(wbuf);
-    free(rbuf);
+    HDfree(wbuf);
+    HDfree(rbuf);
 }   /* test_select_none() */
 
 /****************************************************************
diff --git a/test/tsohm.c b/test/tsohm.c
index eb5f7c5..8ebfd52 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -3884,7 +3884,7 @@ test_sohm_external_dtype(void)
     CHECK_I(dset1_tid, "H5Dget_type");
 
     /* Allocate space and initialize data */
-    orig = (s1_t*)malloc(NX * NY * sizeof(s1_t));
+    orig = (s1_t*)HDmalloc(NX * NY * sizeof(s1_t));
     for(i=0; i<NX*NY; i++) {
         s_ptr = (s1_t*)orig + i;
         s_ptr->a = i*3 + 1;
@@ -3963,7 +3963,7 @@ test_sohm_external_dtype(void)
     ret = H5Fclose(file2);
     CHECK_I(ret, "H5Fclose");
 
-    free(orig);
+    HDfree(orig);
 }
 
 
diff --git a/test/ttsafe_acreate.c b/test/ttsafe_acreate.c
index 0efd02c..dec2eee 100644
--- a/test/ttsafe_acreate.c
+++ b/test/ttsafe_acreate.c
@@ -113,7 +113,7 @@ void tts_acreate(void)
      * with the dataset
      */
     for(i = 0; i < NUM_THREADS; i++) {
-        attrib_data = malloc(sizeof(ttsafe_name_data_t));
+        attrib_data = HDmalloc(sizeof(ttsafe_name_data_t));
         attrib_data->dataset = dataset;
         attrib_data->datatype = datatype;
         attrib_data->dataspace = dataspace;
@@ -170,7 +170,7 @@ void *tts_acreate_thread(void *client_data)
                           H5P_DEFAULT, H5P_DEFAULT);
 
     /* Write data to the attribute */
-    attribute_data = malloc(sizeof(int));
+    attribute_data = HDmalloc(sizeof(int));
     *attribute_data = attrib_data->current_index;
     H5Awrite(attribute, H5T_NATIVE_INT, attribute_data);
     H5Aclose(attribute);
diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c
index 8264403..56f431e 100644
--- a/test/ttsafe_cancel.c
+++ b/test/ttsafe_cancel.c
@@ -145,7 +145,7 @@ void *tts_cancel_thread(void UNUSED *arg)
     assert(dataset >= 0);
 
     /* If thread is cancelled, make cleanup call */
-    cleanup_structure = (cancel_cleanup_t*)malloc(sizeof(cancel_cleanup_t));
+    cleanup_structure = (cancel_cleanup_t*)HDmalloc(sizeof(cancel_cleanup_t));
     cleanup_structure->dataset = dataset;
     cleanup_structure->datatype = datatype;
     cleanup_structure->dataspace = dataspace;
@@ -156,7 +156,7 @@ void *tts_cancel_thread(void UNUSED *arg)
     ret=H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &datavalue);
     assert(ret>=0);
 
-    buffer = malloc(sizeof(int));
+    buffer = HDmalloc(sizeof(int));
     ret=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer);
     assert(ret>=0);
     ret=H5Diterate(buffer, H5T_NATIVE_INT, dataspace, tts_cancel_callback, &dataset);
diff --git a/test/tunicode.c b/test/tunicode.c
index 0386352..7dfda16 100644
--- a/test/tunicode.c
+++ b/test/tunicode.c
@@ -605,7 +605,7 @@ void test_compound(hid_t fid, const char * string)
   readbuf = H5Tget_member_name(s1_tid, 0);
   ret = HDstrcmp(readbuf, string);
   VERIFY(ret, 0, "strcmp");
-  free(readbuf);
+  HDfree(readbuf);
 
   /* Add the other fields to the datatype */
   ret = H5Tinsert(s1_tid, "c_name", HOFFSET(s1_t, c), H5T_NATIVE_DOUBLE);
@@ -718,7 +718,7 @@ void test_opaque(hid_t UNUSED fid, const char * string)
   read_buf = H5Tget_tag(type_id);
   ret = strcmp(read_buf, string);
   VERIFY(ret, 0, "H5Tget_tag");
-  free(read_buf);
+  HDfree(read_buf);
 
   ret = H5Tclose(type_id);
   CHECK(ret, FAIL, "H5Tclose");