diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-05-27 22:12:43 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-05-27 22:12:43 (GMT) |
| commit | b1cf507c6d8ff53f4f9e474fa5878360562b3a1d (patch) | |
| tree | 4fd757508145c9b969c717f2843ec5d6957df071 /src/H5HFdtable.c | |
| parent | 244784ab2cf816b135f27bf03b5a4fb91502aed9 (diff) | |
| parent | ae82b5232a98e170c74118fe3ddab4b525d89fe9 (diff) | |
| download | hdf5-b1cf507c6d8ff53f4f9e474fa5878360562b3a1d.zip hdf5-b1cf507c6d8ff53f4f9e474fa5878360562b3a1d.tar.gz hdf5-b1cf507c6d8ff53f4f9e474fa5878360562b3a1d.tar.bz2 | |
[svn-r27116] svn merge -r26937:27115 https://svn.hdfgroup.uiuc.edu/hdf5/trunk
Diffstat (limited to 'src/H5HFdtable.c')
| -rw-r--r-- | src/H5HFdtable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5HFdtable.c b/src/H5HFdtable.c index 607862a..c523396 100644 --- a/src/H5HFdtable.c +++ b/src/H5HFdtable.c @@ -168,7 +168,7 @@ HDfprintf(stderr, "%s: off = %Hu\n", "H5HF_dtable_lookup", off); /* Check for offset in first row */ if(off < dtable->num_id_first_row) { *row = 0; - H5_ASSIGN_OVERFLOW(/* To: */ *col, /* From: */ (off / dtable->cparam.start_block_size), /* From: */ hsize_t, /* To: */ unsigned); + H5_CHECKED_ASSIGN(*col, unsigned, (off / dtable->cparam.start_block_size), hsize_t); } /* end if */ else { unsigned high_bit = H5VM_log2_gen(off); /* Determine the high bit in the offset */ @@ -178,7 +178,7 @@ HDfprintf(stderr, "%s: off = %Hu\n", "H5HF_dtable_lookup", off); HDfprintf(stderr, "%s: high_bit = %u, off_mask = %Hu\n", "H5HF_dtable_lookup", high_bit, off_mask); #endif /* QAK */ *row = (high_bit - dtable->first_row_bits) + 1; - H5_ASSIGN_OVERFLOW(/* To: */ *col, /* From: */ ((off - off_mask) / dtable->row_block_size[*row]), /* From: */ hsize_t, /* To: */ unsigned); + H5_CHECKED_ASSIGN(*col, unsigned, ((off - off_mask) / dtable->row_block_size[*row]), hsize_t); } /* end else */ FUNC_LEAVE_NOAPI(SUCCEED) |