mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-19 16:50:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes FUNC_ENTER warnings in VFDs due to recent init changes (#1178)

Browse Source
This commit is contained in:
Dana Robinson 2021-11-09 20:40:46 -08:00 committed by GitHub
parent 25fe28eb04
commit b488eb4ecc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/H5FDcore.c
View File

@ -461,7 +461,7 @@ H5FD_core_init(void)
char *lock_env_var = NULL; /* Environment variable pointer */
hid_t ret_value = H5I_INVALID_HID; /* Return value */
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
FUNC_ENTER_NOAPI_NOERR
/* Check the use disabled file locks environment variable */
lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING);
@ -478,7 +478,6 @@ H5FD_core_init(void)
/* Set return value */
ret_value = H5FD_CORE_g;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_core_init() */

5
src/H5FDfamily.c
View File

@ -282,9 +282,9 @@ done:
hid_t
H5FD_family_init(void)
{
hid_t ret_value = H5I_INVALID_HID; /* Return value */
hid_t ret_value = H5I_INVALID_HID;
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
FUNC_ENTER_NOAPI_NOERR
if (H5I_VFL != H5I_get_type(H5FD_FAMILY_g))
H5FD_FAMILY_g = H5FD_register(&H5FD_family_g, sizeof(H5FD_class_t), FALSE);
@ -292,7 +292,6 @@ H5FD_family_init(void)
/* Set return value */
ret_value = H5FD_FAMILY_g;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5FD_family_init() */

7
src/H5FDint.c
View File

@ -464,7 +464,7 @@ H5FD_check_plugin_load(const H5FD_class_t *cls, const H5PL_key_t *key, hbool_t *
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
FUNC_ENTER_NOAPI_NOERR
/* Sanity checks */
HDassert(cls);
@ -476,7 +476,7 @@ H5FD_check_plugin_load(const H5FD_class_t *cls, const H5PL_key_t *key, hbool_t *
/* Check if plugin name matches VFD class name */
if (cls->name && !HDstrcmp(cls->name, key->vfd.u.name))
*success = TRUE;
} /* end if */
}
else {
/* Sanity check */
HDassert(key->vfd.kind == H5FD_GET_DRIVER_BY_VALUE);
@ -484,9 +484,8 @@ H5FD_check_plugin_load(const H5FD_class_t *cls, const H5PL_key_t *key, hbool_t *
/* Check if plugin value matches VFD class value */
if (cls->value == key->vfd.u.value)
*success = TRUE;
} /* end else */
}
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_check_plugin_load() */

3
src/H5FDlog.c
View File

@ -243,7 +243,7 @@ H5FD_log_init(void)
char *lock_env_var = NULL; /* Environment variable pointer */
hid_t ret_value = H5I_INVALID_HID; /* Return value */
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
FUNC_ENTER_NOAPI_NOERR
/* Check the use disabled file locks environment variable */
lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING);
@ -260,7 +260,6 @@ H5FD_log_init(void)
/* Set return value */
ret_value = H5FD_LOG_g;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_log_init() */

3
src/H5FDsec2.c
View File

@ -203,7 +203,7 @@ H5FD_sec2_init(void)
char *lock_env_var = NULL; /* Environment variable pointer */
hid_t ret_value = H5I_INVALID_HID; /* Return value */
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
FUNC_ENTER_NOAPI_NOERR
/* Check the use disabled file locks environment variable */
lock_env_var = HDgetenv(HDF5_USE_FILE_LOCKING);
@ -220,7 +220,6 @@ H5FD_sec2_init(void)
/* Set return value */
ret_value = H5FD_SEC2_g;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_sec2_init() */

3
src/H5FDsplitter.c
View File

@ -196,7 +196,7 @@ H5FD_splitter_init(void)
{
hid_t ret_value = H5I_INVALID_HID;
FUNC_ENTER_NOAPI(H5I_INVALID_HID)
FUNC_ENTER_NOAPI_NOERR
H5FD_SPLITTER_LOG_CALL(__func__);
@ -205,7 +205,6 @@ H5FD_splitter_init(void)
ret_value = H5FD_SPLITTER_g;
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_splitter_init() */