diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2018-04-06 16:12:06 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2018-04-06 16:12:06 (GMT) |
commit | 051c5fa9b3541dce7c8d90e7fbab95c9e51bc709 (patch) | |
tree | 51f991973543d26428282abf46f7038d66e4ba7a /src | |
parent | 048ae59d2970dd21810577c999f756c028b6faaf (diff) | |
parent | 02039e0a91cf1baae46d52a77c521fc6357b7c90 (diff) | |
download | hdf5-051c5fa9b3541dce7c8d90e7fbab95c9e51bc709.zip hdf5-051c5fa9b3541dce7c8d90e7fbab95c9e51bc709.tar.gz hdf5-051c5fa9b3541dce7c8d90e7fbab95c9e51bc709.tar.bz2 |
Merge pull request #1018 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '02039e0a91cf1baae46d52a77c521fc6357b7c90':
Minor warning cleanup while working on VOL issues.
Diffstat (limited to 'src')
-rw-r--r-- | src/H5B2dbg.c | 4 | ||||
-rw-r--r-- | src/H5F.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c index dc079f1..c4f56e5 100644 --- a/src/H5B2dbg.c +++ b/src/H5B2dbg.c @@ -218,7 +218,7 @@ H5B2__int_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, */ H5_CHECK_OVERFLOW(depth, unsigned, uint16_t); node_ptr.addr = addr; - H5_CHECKED_ASSIGN(node_ptr.node_nrec, unsigned, nrec, uint16_t) + H5_CHECKED_ASSIGN(node_ptr.node_nrec, uint16_t, nrec, unsigned) if(NULL == (internal = H5B2__protect_internal(hdr, NULL, &node_ptr, (uint16_t)depth, FALSE, H5AC__READ_ONLY_FLAG))) HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node") @@ -330,7 +330,7 @@ H5B2__leaf_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, */ H5_CHECK_OVERFLOW(nrec, unsigned, uint16_t); node_ptr.addr = addr; - H5_CHECKED_ASSIGN(node_ptr.node_nrec, unsigned, nrec, uint16_t) + H5_CHECKED_ASSIGN(node_ptr.node_nrec, uint16_t, nrec, unsigned) if(NULL == (leaf = H5B2__protect_leaf(hdr, NULL, &node_ptr, FALSE, H5AC__READ_ONLY_FLAG))) HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree leaf node") @@ -1344,7 +1344,7 @@ H5Fstart_swmr_write(hid_t file_id) /* Call the internal routine */ if(H5F__start_swmr_write(file) < 0) - HGOTO_ERROR(H5E_FILE, H5E_CANTCONVERT, FAIL, "unable to convert file format") + HGOTO_ERROR(H5E_FILE, H5E_CANTCONVERT, FAIL, "unable to convert file format") done: FUNC_LEAVE_API(ret_value) |