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

1 files changed, 21 insertions, 21 deletions

diff --git a/src/H5Gcache.c b/src/H5Gcache.c
index e088fd8..853c62f 100644
--- a/src/H5Gcache.c
+++ b/src/H5Gcache.c
@@ -112,8 +112,8 @@ H5G__cache_node_get_initial_load_size(void *_udata, size_t *image_len)
 
     FUNC_ENTER_PACKAGE_NOERR
 
-    HDassert(f);
-    HDassert(image_len);
+    assert(f);
+    assert(image_len);
 
     /* Set the image length size */
     *image_len = (size_t)(H5G_NODE_SIZE(f));
@@ -149,10 +149,10 @@ H5G__cache_node_deserialize(const void *_image, size_t len, void *_udata, hbool_
 
     FUNC_ENTER_PACKAGE
 
-    HDassert(image);
-    HDassert(len > 0);
-    HDassert(f);
-    HDassert(dirty);
+    assert(image);
+    assert(len > 0);
+    assert(f);
+    assert(dirty);
 
     /* Allocate symbol table data structures */
     if (NULL == (sym = H5FL_CALLOC(H5G_node_t)))
@@ -164,7 +164,7 @@ H5G__cache_node_deserialize(const void *_image, size_t len, void *_udata, hbool_
     /* Magic */
     if (H5_IS_BUFFER_OVERFLOW(image, H5_SIZEOF_MAGIC, image_end))
         HGOTO_ERROR(H5E_SYM, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding");
-    if (HDmemcmp(image, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0)
+    if (memcmp(image, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0)
         HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, NULL, "bad symbol table node signature")
     image += H5_SIZEOF_MAGIC;
 
@@ -215,10 +215,10 @@ H5G__cache_node_image_len(const void *_thing, size_t *image_len)
 
     FUNC_ENTER_PACKAGE_NOERR
 
-    HDassert(sym);
-    HDassert(sym->cache_info.magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
-    HDassert(sym->cache_info.type == H5AC_SNODE);
-    HDassert(image_len);
+    assert(sym);
+    assert(sym->cache_info.magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
+    assert(sym->cache_info.type == H5AC_SNODE);
+    assert(image_len);
 
     *image_len = sym->node_size;
 
@@ -245,12 +245,12 @@ H5G__cache_node_serialize(const H5F_t *f, void *_image, size_t len, void *_thing
 
     FUNC_ENTER_PACKAGE
 
-    HDassert(f);
-    HDassert(image);
-    HDassert(sym);
-    HDassert(sym->cache_info.magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
-    HDassert(sym->cache_info.type == H5AC_SNODE);
-    HDassert(len == sym->node_size);
+    assert(f);
+    assert(image);
+    assert(sym);
+    assert(sym->cache_info.magic == H5C__H5C_CACHE_ENTRY_T_MAGIC);
+    assert(sym->cache_info.type == H5AC_SNODE);
+    assert(len == sym->node_size);
 
     /* Magic number */
     H5MM_memcpy(image, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC);
@@ -270,7 +270,7 @@ H5G__cache_node_serialize(const H5F_t *f, void *_image, size_t len, void *_thing
         HGOTO_ERROR(H5E_SYM, H5E_CANTENCODE, FAIL, "can't serialize")
 
     /* Clear rest of symbol table node */
-    HDmemset(image, 0, len - (size_t)(image - (uint8_t *)_image));
+    memset(image, 0, len - (size_t)(image - (uint8_t *)_image));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -296,9 +296,9 @@ H5G__cache_node_free_icr(void *_thing)
 
     FUNC_ENTER_PACKAGE
 
-    HDassert(sym);
-    HDassert(sym->cache_info.magic == H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC);
-    HDassert(sym->cache_info.type == H5AC_SNODE);
+    assert(sym);
+    assert(sym->cache_info.magic == H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC);
+    assert(sym->cache_info.type == H5AC_SNODE);
 
     /* Destroy symbol table node */
     if (H5G__node_free(sym) < 0)