Brings mirror VFD test fixes from develop (#2392)

1 files changed, 36 insertions, 36 deletions

diff --git a/src/H5FDmirror.c b/src/H5FDmirror.c
index f7f79fc..c0efb96 100644
--- a/src/H5FDmirror.c
+++ b/src/H5FDmirror.c
@@ -244,7 +244,7 @@ H5FD_mirror_init(void)
 
     FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     if (H5I_VFL != H5I_get_type(H5FD_MIRROR_g)) {
         H5FD_MIRROR_g = H5FD_register(&H5FD_mirror_g, sizeof(H5FD_class_t), FALSE);
@@ -268,12 +268,12 @@ done:
 static herr_t
 H5FD__mirror_term(void)
 {
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Reset VFL ID */
     H5FD_MIRROR_g = 0;
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD__mirror_term() */
@@ -337,7 +337,7 @@ H5FD__mirror_xmit_decode_uint32(uint32_t *out, const unsigned char *_buf)
 /* ---------------------------------------------------------------------------
  * Function:    is_host_little_endian
  *
- * Purpose:     Determine whether the host machine is is little-endian.
+ * Purpose:     Determine whether the host machine is little-endian.
  *
  *              Store an integer with a known value, re-map the memory to a
  *              character array, and inspect the array's contents.
@@ -1127,9 +1127,9 @@ H5FD__mirror_verify_reply(H5FD_mirror_t *file)
     ssize_t                         read_ret  = 0;
     herr_t                          ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     HDassert(file && file->sock_fd);
 
@@ -1182,9 +1182,9 @@ H5FD__mirror_fapl_get(H5FD_t *_file)
     H5FD_mirror_fapl_t *fa        = NULL;
     void               *ret_value = NULL;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     fa = (H5FD_mirror_fapl_t *)H5MM_calloc(sizeof(H5FD_mirror_fapl_t));
     if (NULL == fa)
@@ -1218,9 +1218,9 @@ H5FD__mirror_fapl_copy(const void *_old_fa)
     H5FD_mirror_fapl_t       *new_fa    = NULL;
     void                     *ret_value = NULL;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     new_fa = (H5FD_mirror_fapl_t *)H5MM_malloc(sizeof(H5FD_mirror_fapl_t));
     if (new_fa == NULL)
@@ -1250,9 +1250,9 @@ H5FD__mirror_fapl_free(void *_fa)
 {
     H5FD_mirror_fapl_t *fa = (H5FD_mirror_fapl_t *)_fa;
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     /* sanity check */
     HDassert(fa != NULL);
@@ -1283,7 +1283,7 @@ H5Pget_fapl_mirror(hid_t fapl_id, H5FD_mirror_fapl_t *fa_dst)
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", fapl_id, fa_dst);
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     if (NULL == fa_dst)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "fa_dst is NULL");
@@ -1324,7 +1324,7 @@ H5Pset_fapl_mirror(hid_t fapl_id, H5FD_mirror_fapl_t *fa)
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "i*x", fapl_id, fa);
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS);
     if (NULL == plist)
@@ -1368,9 +1368,9 @@ H5FD__mirror_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxad
     H5FD_mirror_xmit_open_t *open_xmit = NULL;
     H5FD_t                  *ret_value = NULL;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     /* --------------- */
     /* Check arguments */
@@ -1493,9 +1493,9 @@ H5FD__mirror_close(H5FD_t *_file)
     int            xmit_encoded = 0; /* monitor point of failure */
     herr_t         ret_value    = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     /* Sanity check */
     HDassert(file);
@@ -1565,9 +1565,9 @@ done:
 static herr_t
 H5FD__mirror_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags)
 {
-    FUNC_ENTER_STATIC_NOERR;
+    FUNC_ENTER_PACKAGE_NOERR;
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     /* Notice: the Mirror VFD Writer currently uses only the Sec2 driver as
      * the underlying driver -- as such, the Mirror VFD implementation copies
@@ -1602,9 +1602,9 @@ H5FD__mirror_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
     const H5FD_mirror_t *file = (const H5FD_mirror_t *)_file;
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     HDassert(file);
 
@@ -1629,9 +1629,9 @@ H5FD__mirror_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr)
     H5FD_mirror_t         *file      = (H5FD_mirror_t *)_file;
     herr_t                 ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     HDassert(file);
 
@@ -1684,9 +1684,9 @@ H5FD__mirror_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
     const H5FD_mirror_t *file = (const H5FD_mirror_t *)_file;
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     HDassert(file);
 
@@ -1705,9 +1705,9 @@ static herr_t
 H5FD__mirror_read(H5FD_t H5_ATTR_UNUSED *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED fapl_id,
                   haddr_t H5_ATTR_UNUSED addr, size_t H5_ATTR_UNUSED size, void H5_ATTR_UNUSED *buf)
 {
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     FUNC_LEAVE_NOAPI(FAIL)
 } /* end H5FD__mirror_read() */
@@ -1738,9 +1738,9 @@ H5FD__mirror_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
     H5FD_mirror_t           *file      = (H5FD_mirror_t *)_file;
     herr_t                   ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     HDassert(file);
     HDassert(buf);
@@ -1801,9 +1801,9 @@ H5FD__mirror_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_AT
     H5FD_mirror_t *file      = (H5FD_mirror_t *)_file;
     herr_t         ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     file->xmit.xmit_count = (file->xmit_i)++;
     file->xmit.op         = H5FD_MIRROR_OP_TRUNCATE;
@@ -1849,9 +1849,9 @@ H5FD__mirror_lock(H5FD_t *_file, hbool_t rw)
     H5FD_mirror_t          *file      = (H5FD_mirror_t *)_file;
     herr_t                  ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     file->xmit.xmit_count = (file->xmit_i)++;
     file->xmit.op         = H5FD_MIRROR_OP_LOCK;
@@ -1896,9 +1896,9 @@ H5FD__mirror_unlock(H5FD_t *_file)
     H5FD_mirror_t *file      = (H5FD_mirror_t *)_file;
     herr_t         ret_value = SUCCEED;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
-    LOG_OP_CALL(FUNC);
+    LOG_OP_CALL(__func__);
 
     file->xmit.xmit_count = (file->xmit_i)++;
     file->xmit.op         = H5FD_MIRROR_OP_UNLOCK;