diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-12-13 05:42:36 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-12-13 05:42:36 (GMT) |
| commit | e78db67c621a2ce04d95c1c6b2b4b3c23682abfb (patch) | |
| tree | 56a0b2364c3416c82e2fdcdb0c245b9c07d9c149 /src/H5Pfapl.c | |
| parent | aa4fc58ac985ba354525056428d79f918f95d119 (diff) | |
| download | hdf5-e78db67c621a2ce04d95c1c6b2b4b3c23682abfb.zip hdf5-e78db67c621a2ce04d95c1c6b2b4b3c23682abfb.tar.gz hdf5-e78db67c621a2ce04d95c1c6b2b4b3c23682abfb.tar.bz2 | |
[svn-r28606] Description:
Revisions to normalize revise chunks vs. trunk, plus push dataset metadata
changes into the cache immediately (instead of holding them within the dataset
data structures).
Tested on:
MacOSX/64 10.11.2 (amazon) w/serial & parallel
(h5committest not required on this branch)
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 319dc77..14e1c91 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -1230,7 +1230,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: @@ -1310,7 +1310,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: @@ -3016,7 +3016,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); |