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/H5HFdbg.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/H5HFdbg.c')
| -rw-r--r-- | src/H5HFdbg.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c index 1dc2f2e..41e317d 100644 --- a/src/H5HFdbg.c +++ b/src/H5HFdbg.c @@ -387,11 +387,11 @@ H5HF_dblock_debug_cb(H5FS_section_info_t *_sect, void *_udata) if(sect_start < dblock_start) start = 0; else - H5_ASSIGN_OVERFLOW(/* To: */ start, /* From: */ (sect_start - dblock_start), /* From: */ hsize_t, /* To: */ size_t) + H5_CHECKED_ASSIGN(start, size_t, (sect_start - dblock_start), hsize_t) if(sect_end > dblock_end) - H5_ASSIGN_OVERFLOW(/* To: */ end, /* From: */ udata->dblock_size, /* From: */ hsize_t, /* To: */ size_t) + H5_CHECKED_ASSIGN(end, size_t, udata->dblock_size, hsize_t) else - H5_ASSIGN_OVERFLOW(/* To: */ end, /* From: */ ((sect_end - dblock_start) + 1), /* From: */ hsize_t, /* To: */ size_t) + H5_CHECKED_ASSIGN(end, size_t, ((sect_end - dblock_start) + 1), hsize_t) /* Calculate the length */ len = end - start; |