summaryrefslogtreecommitdiffstats
path: root/src/H5Fmount.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2018-09-18 21:10:14 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2018-09-18 21:10:14 (GMT)
commit680cf4d946fd10d50e0f7acdc5bc93f91037fb4f (patch)
tree263471c227cce53ce2803e3f91de63c7ec70168c /src/H5Fmount.c
parentfbf837eac31d510ecc8eaa65ea489ae180cde15f (diff)
downloadhdf5-680cf4d946fd10d50e0f7acdc5bc93f91037fb4f.zip
hdf5-680cf4d946fd10d50e0f7acdc5bc93f91037fb4f.tar.gz
hdf5-680cf4d946fd10d50e0f7acdc5bc93f91037fb4f.tar.bz2
Removed 'VOL' versions of FUNC_ENTER macros as well as empty functions
orginally intended to support the full SWMR feature.
Diffstat (limited to 'src/H5Fmount.c')
-rw-r--r--src/H5Fmount.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Fmount.c b/src/H5Fmount.c
index 4cd1edf..b04bd3a 100644
--- a/src/H5Fmount.c
+++ b/src/H5Fmount.c
@@ -112,7 +112,7 @@ H5F__mount(H5G_loc_t *loc, const char *name, H5F_t *child, hid_t H5_ATTR_UNUSED
H5G_loc_t root_loc; /* Group location of root of file to mount */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_PACKAGE_VOL
+ FUNC_ENTER_PACKAGE
HDassert(loc);
HDassert(name && *name);
@@ -240,7 +240,7 @@ done:
}
}
- FUNC_LEAVE_NOAPI_VOL(ret_value)
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__mount() */
@@ -277,7 +277,7 @@ H5F__unmount(H5G_loc_t *loc, const char *name)
int child_idx; /* Index of child in parent's mtab */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_PACKAGE_VOL
+ FUNC_ENTER_PACKAGE
HDassert(loc);
HDassert(name && *name);
@@ -390,7 +390,7 @@ done:
if(mp_loc_setup)
H5G_loc_free(&mp_loc);
- FUNC_LEAVE_NOAPI_VOL(ret_value)
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F__unmount() */
@@ -651,7 +651,7 @@ H5F_flush_mounts_recurse(H5F_t *f)
nerrors++;
/* Call the "real" flush routine, for this file */
- if(H5F__flush_real(f) < 0)
+ if(H5F__flush(f) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush file's cached information")
/* Check flush errors for children - errors are already on the stack */