diff --git a/src/H5T.c b/src/H5T.c index 59af6491df4..2679648572e 100644 --- a/src/H5T.c +++ b/src/H5T.c @@ -348,14 +348,14 @@ static herr_t H5T__set_size(H5T_t *dt, size_t size); static herr_t H5T__close_cb(H5T_t *dt, void **request); static H5T_path_t *H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_conv_func_t *conv); -static bool H5T_patch_match(H5T_path_t *path, H5T_pers_t pers, const char *name, H5T_t *src, - H5T_t *dst, H5VL_object_t *owned_vol_obj, H5T_conv_t func); -static bool H5T__detect_vlen_ref(const H5T_t *dt); -static H5T_t *H5T__initiate_copy(const H5T_t *old_dt); -static H5T_t *H5T__copy_transient(H5T_t *old_dt); -static H5T_t *H5T__copy_all(H5T_t *old_dt); -static herr_t H5T__complete_copy(H5T_t *new_dt, const H5T_t *old_dt, H5T_shared_t *reopened_fo, - bool set_memory_type, H5T_copy_func_t copyfn); +static bool H5T_patch_match(H5T_path_t *path, H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, + H5VL_object_t *owned_vol_obj, H5T_conv_t func); +static bool H5T__detect_vlen_ref(const H5T_t *dt); +static H5T_t *H5T__initiate_copy(const H5T_t *old_dt); +static H5T_t *H5T__copy_transient(H5T_t *old_dt); +static H5T_t *H5T__copy_all(H5T_t *old_dt); +static herr_t H5T__complete_copy(H5T_t *new_dt, const H5T_t *old_dt, H5T_shared_t *reopened_fo, + bool set_memory_type, H5T_copy_func_t copyfn); /*****************************/ /* Library Private Variables */ @@ -5178,8 +5178,8 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co *------------------------------------------------------------------------- */ static bool -H5T_patch_match(H5T_path_t *path, H5T_pers_t pers, const char *name, H5T_t *src, - H5T_t *dst, H5VL_object_t *owned_vol_obj, H5T_conv_t func) +H5T_patch_match(H5T_path_t *path, H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, + H5VL_object_t *owned_vol_obj, H5T_conv_t func) { bool ret_value = true; @@ -5205,11 +5205,10 @@ H5T_patch_match(H5T_path_t *path, H5T_pers_t pers, const char *name, H5T_t *src, * in the conversion path */ (owned_vol_obj && (owned_vol_obj != path->src->shared->owned_vol_obj) && - (owned_vol_obj != path->dst->shared->owned_vol_obj)) || + (owned_vol_obj != path->dst->shared->owned_vol_obj)) || /* Check that the specified conversion function matches */ - (func && func != path->conv.u.app_func) - ) + (func && func != path->conv.u.app_func)) ret_value = false; FUNC_LEAVE_NOAPI(ret_value)