Remove HD from memory allocate/free calls (#3195)

* HDcalloc
* HDfree
* HDmalloc
* HDrealloc

4 files changed, 22 insertions, 22 deletions

diff --git a/utils/mirror_vfd/mirror_remote.c b/utils/mirror_vfd/mirror_remote.c
index 065f2c8..aaa7515 100644
--- a/utils/mirror_vfd/mirror_remote.c
+++ b/utils/mirror_vfd/mirror_remote.c
@@ -150,7 +150,7 @@ mirror_log_init(char *path, const char *prefix, unsigned int verbosity)
 {
     loginfo_t *info = NULL;
 
-    info = (loginfo_t *)HDmalloc(sizeof(loginfo_t));
+    info = (loginfo_t *)malloc(sizeof(loginfo_t));
     if (info != NULL) {
         info->magic     = MIRROR_LOG_INFO_MAGIC;
         info->verbosity = verbosity;
@@ -168,7 +168,7 @@ mirror_log_init(char *path, const char *prefix, unsigned int verbosity)
                 fprintf(MIRROR_LOG_DEFAULT_STREAM, "WARN custom logging path could not be opened: %s\n",
                         path);
                 info->magic += 1;
-                HDfree(info);
+                free(info);
             }
             else {
                 info->stream = f;
@@ -201,7 +201,7 @@ mirror_log_term(loginfo_t *info)
         }
     }
     info->magic += 1;
-    HDfree(info);
+    free(info);
     return SUCCEED;
 } /* end mirror_log_term() */
 
diff --git a/utils/mirror_vfd/mirror_server.c b/utils/mirror_vfd/mirror_server.c
index 83d6f20..5278e7c 100644
--- a/utils/mirror_vfd/mirror_server.c
+++ b/utils/mirror_vfd/mirror_server.c
@@ -291,7 +291,7 @@ init_server_run(int argc, char **argv)
 {
     struct server_run *run;
 
-    run = (struct server_run *)HDmalloc(sizeof(struct server_run));
+    run = (struct server_run *)malloc(sizeof(struct server_run));
     if (run == NULL) {
         mirror_log(NULL, V_ERR, "can't allocate server_run struct");
         return NULL;
@@ -324,7 +324,7 @@ init_server_run(int argc, char **argv)
 
 error:
     if (run != NULL) {
-        HDfree(run);
+        free(run);
     }
     return NULL;
 
@@ -362,7 +362,7 @@ term_server_run(struct server_run *run)
 
     (run->magic)++;
     (run->opts.magic)++;
-    HDfree(run);
+    free(run);
     return 0;
 } /* end term_server_run() */
 
@@ -479,11 +479,11 @@ handle_requests(struct server_run *run)
         return 1;
     }
 
-    if (NULL == (mybuf = HDmalloc(H5FD_MIRROR_XMIT_OPEN_SIZE * sizeof(char)))) {
+    if (NULL == (mybuf = malloc(H5FD_MIRROR_XMIT_OPEN_SIZE * sizeof(char)))) {
         mirror_log(NULL, V_ERR, "out of memory");
         goto error;
     }
-    if (NULL == (xopen = HDmalloc(sizeof(H5FD_mirror_xmit_open_t)))) {
+    if (NULL == (xopen = malloc(sizeof(H5FD_mirror_xmit_open_t)))) {
         mirror_log(NULL, V_ERR, "out of memory");
         goto error;
     }
@@ -591,8 +591,8 @@ done:
         HDclose(connfd);
     }
 
-    HDfree(mybuf);
-    HDfree(xopen);
+    free(mybuf);
+    free(xopen);
 
     return ret_value;
 
@@ -600,8 +600,8 @@ error:
     if (connfd >= 0) {
         HDclose(connfd);
     }
-    HDfree(mybuf);
-    HDfree(xopen);
+    free(mybuf);
+    free(xopen);
     return -1;
 } /* end handle_requests() */
 
diff --git a/utils/mirror_vfd/mirror_writer.c b/utils/mirror_vfd/mirror_writer.c
index 4dbda3b..644fc77 100644
--- a/utils/mirror_vfd/mirror_writer.c
+++ b/utils/mirror_vfd/mirror_writer.c
@@ -178,7 +178,7 @@ session_init(struct mirror_writer_opts *opts)
         goto error;
     }
 
-    session = (struct mirror_session *)HDmalloc(sizeof(struct mirror_session));
+    session = (struct mirror_session *)malloc(sizeof(struct mirror_session));
     if (session == NULL) {
         mirror_log(NULL, V_ERR, "can't allocate session structure");
         goto error;
@@ -204,7 +204,7 @@ session_init(struct mirror_writer_opts *opts)
 
 error:
     if (session) {
-        HDfree(session);
+        free(session);
     }
     return NULL;
 } /* end session_init() */
@@ -247,7 +247,7 @@ session_stop(struct mirror_session *session)
 
     /* Invalidate and release structure */
     session->magic++;
-    HDfree(session);
+    free(session);
 
     return ret_value;
 } /* end session_stop() */
@@ -730,7 +730,7 @@ do_write(struct mirror_session *session, const unsigned char *xmit_buf)
 
     /* Allocate the buffer once -- re-use between loops.
      */
-    buf = (char *)HDmalloc(sizeof(char) * H5FD_MIRROR_DATA_BUFFER_MAX);
+    buf = (char *)malloc(sizeof(char) * H5FD_MIRROR_DATA_BUFFER_MAX);
     if (NULL == buf) {
         mirror_log(session->loginfo, V_ERR, "can't allocate databuffer");
         reply_error(session, "can't allocate buffer for receiving data");
@@ -782,7 +782,7 @@ do_write(struct mirror_session *session, const unsigned char *xmit_buf)
 
     } while (sum_bytes_written < xmit_write.size); /* end while ingesting */
 
-    HDfree(buf);
+    free(buf);
 
     /* signal that we're done here and a-ok */
     if (reply_ok(session) < 0) {
@@ -906,7 +906,7 @@ process_instructions(struct mirror_session *session)
 
     buf_size = H5FD_MIRROR_XMIT_BUFFER_MAX * sizeof(char);
 
-    if (NULL == (xmit_buf = HDmalloc(buf_size))) {
+    if (NULL == (xmit_buf = malloc(buf_size))) {
         mirror_log(session->loginfo, V_ERR, "out of memory");
         goto error;
     }
@@ -975,11 +975,11 @@ process_instructions(struct mirror_session *session)
 done:
     comm.magic      = 0; /* invalidate structure, on principle */
     xmit_recd.magic = 0; /* invalidate structure, on principle */
-    HDfree(xmit_buf);
+    free(xmit_buf);
     return 0;
 
 error:
-    HDfree(xmit_buf);
+    free(xmit_buf);
     return -1;
 } /* end process_instructions() */
 
diff --git a/utils/tools/h5dwalk/h5dwalk.c b/utils/tools/h5dwalk/h5dwalk.c
index ba7374d..5f0cf79 100644
--- a/utils/tools/h5dwalk/h5dwalk.c
+++ b/utils/tools/h5dwalk/h5dwalk.c
@@ -1311,7 +1311,7 @@ process_input_file(char *inputname, int myrank, int size)
             index++;
         }
         linebuf[0] = 0;
-        HDfree(cmdline);
+        free(cmdline);
     }
 
     if (output_log_file) {
@@ -1568,7 +1568,7 @@ main(int argc, char *argv[])
 
     if (tool_selected && (args_byte_length > 0)) {
         pred_head = mfu_pred_new();
-        args_buf  = (char *)HDmalloc((size_t)(args_byte_length + pathlen_total));
+        args_buf  = (char *)malloc((size_t)(args_byte_length + pathlen_total));
     }
 
     /* filter files to only include hdf5 files */