Brings over most of the HD prefix removal (#3293)

1 files changed, 13 insertions, 13 deletions

diff --git a/src/H5Ocopy_ref.c b/src/H5Ocopy_ref.c
index 7ba2dc5..100bea5 100644
--- a/src/H5Ocopy_ref.c
+++ b/src/H5Ocopy_ref.c
@@ -99,8 +99,8 @@ H5O__copy_obj_by_ref(H5O_loc_t *src_oloc, H5O_loc_t *dst_oloc, H5G_loc_t *dst_ro
 
     FUNC_ENTER_PACKAGE
 
-    HDassert(src_oloc);
-    HDassert(dst_oloc);
+    assert(src_oloc);
+    assert(dst_oloc);
 
     /* Perform the copy, or look up existing copy */
     if ((ret_value = H5O_copy_header_map(src_oloc, dst_oloc, cpy_info, FALSE, NULL, NULL)) < 0)
@@ -170,8 +170,8 @@ H5O__copy_expand_ref_object1(H5O_loc_t *src_oloc, const void *buf_src, H5O_loc_t
         H5O_token_t          tmp_token = {0};
 
         /* If data is not initialized, copy zeros and skip */
-        if (0 == HDmemcmp(src_buf, zeros, buf_size))
-            HDmemset(dst_buf, 0, buf_size);
+        if (0 == memcmp(src_buf, zeros, buf_size))
+            memset(dst_buf, 0, buf_size);
         else {
             /* Set up for the object copy for the reference */
             if (H5R__decode_token_obj_compat(src_buf, &buf_size, &tmp_token, token_size) < 0)
@@ -233,8 +233,8 @@ H5O__copy_expand_ref_region1(H5O_loc_t *src_oloc, const void *buf_src, H5O_loc_t
         uint8_t             *q;
 
         /* If data is not initialized, copy zeros and skip */
-        if (0 == HDmemcmp(src_buf, zeros, buf_size))
-            HDmemset(dst_buf, 0, buf_size);
+        if (0 == memcmp(src_buf, zeros, buf_size))
+            memset(dst_buf, 0, buf_size);
         else {
             /* Read from heap */
             if (H5R__decode_heap(src_oloc->file, src_buf, &buf_size, &data, &data_size) < 0)
@@ -358,7 +358,7 @@ H5O__copy_expand_ref_object2(H5O_loc_t *src_oloc, hid_t tid_src, const H5T_t *dt
         H5R_ref_priv_t *ref     = (H5R_ref_priv_t *)&ref_ptr[i];
 
         /* Check for null reference - only expand reference if it is not null */
-        if (HDmemcmp(ref, zeros, H5R_REF_BUF_SIZE)) {
+        if (memcmp(ref, zeros, H5R_REF_BUF_SIZE)) {
             H5O_token_t tmp_token = {0};
 
             /* Get src object address */
@@ -441,12 +441,12 @@ H5O_copy_expand_ref(H5F_t *file_src, hid_t tid_src, const H5T_t *dt_src, void *b
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Sanity checks */
-    HDassert(file_src);
-    HDassert(buf_src);
-    HDassert(file_dst);
-    HDassert(buf_dst);
-    HDassert(nbytes_src);
-    HDassert(cpy_info);
+    assert(file_src);
+    assert(buf_src);
+    assert(file_dst);
+    assert(buf_dst);
+    assert(nbytes_src);
+    assert(cpy_info);
 
     /* Initialize object locations */
     H5O_loc_reset(&src_oloc);