diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-12-21 18:55:54 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-12-21 18:55:54 (GMT) |
commit | ea0f5d813bb26ec536f468d47f79bf93fb5a9401 (patch) | |
tree | 9d1f2cec912ce29b877327ada906721b98d5f0c5 /src/H5Pfapl.c | |
parent | 26b328aec8e10b9101c76bc049b6b5045b5f00a5 (diff) | |
parent | 9ceca0f89a0d27a6dfaeb3dd0cab2680281c5b60 (diff) | |
download | hdf5-ea0f5d813bb26ec536f468d47f79bf93fb5a9401.zip hdf5-ea0f5d813bb26ec536f468d47f79bf93fb5a9401.tar.gz hdf5-ea0f5d813bb26ec536f468d47f79bf93fb5a9401.tar.bz2 |
[svn-r28715] - merge from trunk
- fix farray, earray, and btree test to use correct function to retrieve internal file struct.
Diffstat (limited to 'src/H5Pfapl.c')
-rw-r--r-- | src/H5Pfapl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index e32a077..0eb6ef6 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -1266,7 +1266,7 @@ H5Pget_family_offset(hid_t fapl_id, hsize_t *offset) /* Get value */ if(offset) { if(H5P_get(plist, H5F_ACS_FAMILY_OFFSET_NAME, offset) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set offset for family file") + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set offset for family file") } /* end if */ done: @@ -1346,7 +1346,7 @@ H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type) /* Get value */ if(type) { if(H5P_get(plist, H5F_ACS_MULTI_TYPE_NAME, type) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't get type for multi driver") + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get type for multi driver") } /* end if */ done: @@ -3580,7 +3580,7 @@ H5P__facc_cache_config_enc(const void *value, void **_pp, size_t *size) H5_ENCODE_UNSIGNED(*pp, config->close_trace_file); - HDmemcpy(*pp, (const uint8_t *)(config->trace_file_name), H5AC__MAX_TRACE_FILE_NAME_LEN + 1); + HDmemcpy(*pp, (const uint8_t *)(config->trace_file_name), (size_t)(H5AC__MAX_TRACE_FILE_NAME_LEN + 1)); *pp += H5AC__MAX_TRACE_FILE_NAME_LEN + 1; H5_ENCODE_UNSIGNED(*pp, config->evictions_enabled); |