Removes the STATIC flavor of FUNC_ENTER macros (#1622)

* Removes the STATIC flavor of FUNC_ENTER macros

1 files changed, 22 insertions, 22 deletions

diff --git a/src/H5FAcache.c b/src/H5FAcache.c
index e6e32da..2889626 100644
--- a/src/H5FAcache.c
+++ b/src/H5FAcache.c
@@ -172,7 +172,7 @@ H5FA__cache_hdr_get_initial_load_size(void *_udata, size_t *image_len)
 {
     H5FA_hdr_cache_ud_t *udata = (H5FA_hdr_cache_ud_t *)_udata; /* User data for callback */
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Check arguments */
     HDassert(udata);
@@ -206,7 +206,7 @@ H5FA__cache_hdr_verify_chksum(const void *_image, size_t len, void H5_ATTR_UNUSE
     uint32_t       computed_chksum;                 /* Computed metadata checksum value */
     htri_t         ret_value = TRUE;
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Check arguments */
     HDassert(image);
@@ -244,7 +244,7 @@ H5FA__cache_hdr_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len
     uint32_t             stored_chksum;                   /* Stored metadata checksum value */
     void *               ret_value = NULL;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(udata);
@@ -350,7 +350,7 @@ H5FA__cache_hdr_image_len(const void *_thing, size_t *image_len)
 {
     const H5FA_hdr_t *hdr = (const H5FA_hdr_t *)_thing; /* Pointer to the object */
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Check arguments */
     HDassert(hdr);
@@ -381,7 +381,7 @@ H5FA__cache_hdr_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le
     uint8_t *   image = (uint8_t *)_image;    /* Pointer into raw data buffer */
     uint32_t    metadata_chksum;              /* Computed metadata checksum value */
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Check arguments */
     HDassert(f);
@@ -441,7 +441,7 @@ H5FA__cache_hdr_notify(H5AC_notify_action_t action, void *_thing)
     H5FA_hdr_t *hdr       = (H5FA_hdr_t *)_thing; /* Pointer to the object */
     herr_t      ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(hdr);
@@ -522,7 +522,7 @@ H5FA__cache_hdr_free_icr(void *thing)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(thing);
@@ -554,7 +554,7 @@ H5FA__cache_dblock_get_initial_load_size(void *_udata, size_t *image_len)
     H5FA_dblock_t           dblock;                                   /* Fake data block for computing size */
     size_t                  dblk_page_nelmts;                         /* # of elements per data block page */
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Check arguments */
     HDassert(udata);
@@ -608,7 +608,7 @@ H5FA__cache_dblock_verify_chksum(const void *_image, size_t len, void H5_ATTR_UN
     uint32_t       computed_chksum;                 /* Computed metadata checksum value */
     htri_t         ret_value = TRUE;
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Check arguments */
     HDassert(image);
@@ -646,7 +646,7 @@ H5FA__cache_dblock_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED
     haddr_t                 arr_addr; /* Address of array header in the file */
     void *                  ret_value = NULL;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(udata);
@@ -740,7 +740,7 @@ H5FA__cache_dblock_image_len(const void *_thing, size_t *image_len)
 {
     const H5FA_dblock_t *dblock = (const H5FA_dblock_t *)_thing; /* Pointer to the object */
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Check arguments */
     HDassert(dblock);
@@ -775,7 +775,7 @@ H5FA__cache_dblock_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED
     uint32_t       metadata_chksum;                  /* Computed metadata checksum value */
     herr_t         ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(f);
@@ -847,7 +847,7 @@ H5FA__cache_dblock_notify(H5AC_notify_action_t action, void *_thing)
     H5FA_dblock_t *dblock    = (H5FA_dblock_t *)_thing;
     herr_t         ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(dblock);
@@ -922,7 +922,7 @@ H5FA__cache_dblock_free_icr(void *_thing)
     H5FA_dblock_t *dblock    = (H5FA_dblock_t *)_thing; /* Pointer to the object */
     herr_t         ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(dblock);
@@ -969,7 +969,7 @@ H5FA__cache_dblock_fsf_size(const void *_thing, hsize_t *fsf_size)
 {
     const H5FA_dblock_t *dblock = (const H5FA_dblock_t *)_thing; /* Pointer to the object */
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Check arguments */
     HDassert(dblock);
@@ -999,7 +999,7 @@ H5FA__cache_dblk_page_get_initial_load_size(void *_udata, size_t *image_len)
 {
     H5FA_dblk_page_cache_ud_t *udata = (H5FA_dblk_page_cache_ud_t *)_udata; /* User data */
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Check arguments */
     HDassert(udata);
@@ -1034,7 +1034,7 @@ H5FA__cache_dblk_page_verify_chksum(const void *_image, size_t len, void H5_ATTR
     uint32_t       computed_chksum;                 /* Computed metadata checksum value */
     htri_t         ret_value = TRUE;
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Check arguments */
     HDassert(image);
@@ -1072,7 +1072,7 @@ H5FA__cache_dblk_page_deserialize(const void *_image, size_t len, void *_udata,
     void *         ret_value = NULL;
 
     /* Sanity check */
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     HDassert(udata);
     HDassert(udata->hdr);
@@ -1140,7 +1140,7 @@ H5FA__cache_dblk_page_image_len(const void *_thing, size_t *image_len)
 {
     const H5FA_dblk_page_t *dblk_page = (const H5FA_dblk_page_t *)_thing; /* Pointer to the object */
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Check arguments */
     HDassert(dblk_page);
@@ -1173,7 +1173,7 @@ H5FA__cache_dblk_page_serialize(const H5F_t H5_ATTR_NDEBUG_UNUSED *f, void *_ima
     uint32_t          metadata_chksum;                        /* Computed metadata checksum value */
     herr_t            ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(f);
@@ -1222,7 +1222,7 @@ H5FA__cache_dblk_page_notify(H5AC_notify_action_t action, void *_thing)
     H5FA_dblk_page_t *dblk_page = (H5FA_dblk_page_t *)_thing; /* Pointer to the object */
     herr_t            ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(dblk_page);
@@ -1285,7 +1285,7 @@ H5FA__cache_dblk_page_free_icr(void *thing)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(thing);