diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-05-18 15:03:27 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-05-18 15:03:27 (GMT) |
| commit | bcea2068905e02e4d209f105dac7d61ea56b6b35 (patch) | |
| tree | 30d03c845dbdd1d0744394f2dd0997215323fa43 /src/H5HFhdr.c | |
| parent | 1f85a96f3eadda5ab08ef24008947e6f63c0baa8 (diff) | |
| download | hdf5-bcea2068905e02e4d209f105dac7d61ea56b6b35.zip hdf5-bcea2068905e02e4d209f105dac7d61ea56b6b35.tar.gz hdf5-bcea2068905e02e4d209f105dac7d61ea56b6b35.tar.bz2 | |
[svn-r27099] Merge of r27045 from trunk
Renamed H5_ASSIGN_OVERFLOW() to H5_CHECKED_ASSIGN() and re-ordered
the arguments to be in a more logical order.
Fixes HDFFV-9322
Tested on: h5committest
Diffstat (limited to 'src/H5HFhdr.c')
| -rw-r--r-- | src/H5HFhdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c index d3c4473..cf8da23 100644 --- a/src/H5HFhdr.c +++ b/src/H5HFhdr.c @@ -262,7 +262,7 @@ H5HF_hdr_finish_init_phase2(H5HF_hdr_t *hdr) if(u < hdr->man_dtable.max_direct_rows) { hdr->man_dtable.row_tot_dblock_free[u] = hdr->man_dtable.row_block_size[u] - H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr); - H5_ASSIGN_OVERFLOW(/* To: */ hdr->man_dtable.row_max_dblock_free[u], /* From: */ hdr->man_dtable.row_tot_dblock_free[u], /* From: */ hsize_t, /* To: */ size_t); + H5_CHECKED_ASSIGN(hdr->man_dtable.row_max_dblock_free[u], size_t, hdr->man_dtable.row_tot_dblock_free[u], hsize_t); } /* end if */ else if(H5HF_hdr_compute_free_space(hdr, u) < 0) |