diff options
| -rw-r--r-- | src/H5Dprivate.h | 2 | ||||
| -rw-r--r-- | src/H5FStest.c | 4 | ||||
| -rw-r--r-- | src/H5Gobj.c | 4 | ||||
| -rw-r--r-- | src/H5HFtest.c | 2 | ||||
| -rw-r--r-- | test/links.c | 4 |
5 files changed, 7 insertions, 9 deletions
diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h index 1c6a0d5..ae427d4 100644 --- a/src/H5Dprivate.h +++ b/src/H5Dprivate.h @@ -139,7 +139,7 @@ typedef struct H5D_dcpl_cache_t { H5O_efl_t efl; /* External file list info (H5D_CRT_EXT_FILE_LIST_NAME) */ } H5D_dcpl_cache_t; -/* Callback information for copying dataset */ +/* Callback information for copying datasets */ typedef struct H5D_copy_file_ud_t { struct H5S_extent_t *src_space_extent; /* Copy of dataspace extent for dataset */ H5T_t *src_dtype; /* Copy of datatype for dataset */ diff --git a/src/H5FStest.c b/src/H5FStest.c index 719e553..af9eaec 100644 --- a/src/H5FStest.c +++ b/src/H5FStest.c @@ -69,7 +69,7 @@ /*------------------------------------------------------------------------- - * Function: H5HF_get_cparam_test + * Function: H5FS_get_cparam_test * * Purpose: Retrieve the parameters used to create the free-space manager * @@ -101,7 +101,7 @@ H5FS_get_cparam_test(const H5FS_t *frsp, H5FS_create_t *cparam) } /* H5FS_get_cparam_test() */ /*------------------------------------------------------------------------- - * Function: H5HF_cmp_cparam_test + * Function: H5FS_cmp_cparam_test * * Purpose: Compare the parameters used to create the fractal heap * diff --git a/src/H5Gobj.c b/src/H5Gobj.c index a11dc13..d2dc607 100644 --- a/src/H5Gobj.c +++ b/src/H5Gobj.c @@ -200,11 +200,11 @@ H5G_obj_create(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo, /* Check for format of group to create */ if(use_latest_format) { /* Insert link info message */ - if(H5O_msg_create(oloc, H5O_LINFO_ID, 0, 0, linfo, dxpl_id) < 0) + if(H5O_msg_create(oloc, H5O_LINFO_ID, 0, H5O_UPDATE_TIME, linfo, dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message") /* Insert group info message */ - if(H5O_msg_create(oloc, H5O_GINFO_ID, H5O_MSG_FLAG_CONSTANT, H5O_UPDATE_TIME, ginfo, dxpl_id) < 0) + if(H5O_msg_create(oloc, H5O_GINFO_ID, H5O_MSG_FLAG_CONSTANT, 0, ginfo, dxpl_id) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create message") } /* end if */ else { diff --git a/src/H5HFtest.c b/src/H5HFtest.c index ab42735..76611e9 100644 --- a/src/H5HFtest.c +++ b/src/H5HFtest.c @@ -124,7 +124,7 @@ H5HF_get_cparam_test(const H5HF_t *fh, H5HF_create_t *cparam) int H5HF_cmp_cparam_test(const H5HF_create_t *cparam1, const H5HF_create_t *cparam2) { - int ret_value; /* Return value */ + int ret_value = 0; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_cmp_cparam_test) diff --git a/test/links.c b/test/links.c index 7c32238..3619c27 100644 --- a/test/links.c +++ b/test/links.c @@ -12971,7 +12971,6 @@ main(void) my_fapl = fapl; /* General tests... (on both old & new format groups */ - nerrors += mklinks(my_fapl, new_format) < 0 ? 1 : 0; nerrors += cklinks(my_fapl, new_format) < 0 ? 1 : 0; nerrors += new_links(my_fapl, new_format) < 0 ? 1 : 0; @@ -13025,7 +13024,6 @@ main(void) nerrors += external_set_elink_fapl3(new_format) < 0 ? 1 : 0; nerrors += external_set_elink_acc_flags(my_fapl, new_format) < 0 ? 1 : 0; nerrors += external_set_elink_cb(my_fapl, new_format) < 0 ? 1 : 0; - #ifdef H5_HAVE_WINDOW_PATH nerrors += external_link_win1(my_fapl, new_format) < 0 ? 1 : 0; nerrors += external_link_win2(my_fapl, new_format) < 0 ? 1 : 0; @@ -13037,6 +13035,7 @@ main(void) nerrors += external_link_win8(my_fapl, new_format) < 0 ? 1 : 0; nerrors += external_link_win9(my_fapl, new_format) < 0 ? 1 : 0; #endif + /* These tests assume that external links are a form of UD links, * so assume that everything that passed for external links * above has already been tested for UD links. @@ -13045,7 +13044,6 @@ main(void) nerrors += ud_hard_links(fapl2) < 0 ? 1 : 0; /* requires new format groups */ nerrors += ud_link_reregister(fapl2) < 0 ? 1 : 0; /* requires new format groups */ } /* end if */ - nerrors += ud_callbacks(my_fapl, new_format) < 0 ? 1 : 0; nerrors += ud_link_errors(my_fapl, new_format) < 0 ? 1 : 0; nerrors += lapl_udata(my_fapl, new_format) < 0 ? 1 : 0; |