[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.

1 files changed, 37 insertions, 37 deletions

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;
 }