diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2016-08-11 19:44:37 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2016-08-11 19:44:37 (GMT) |
| commit | 1d9e5ff1ca96bd10b66507ba281cb4617090e65e (patch) | |
| tree | d1190f7ff51ac7a1fd55ddb4c2f5a825e06d0bf2 /src | |
| parent | 785618f67854476f757e4ce5f69b5638c678e52b (diff) | |
| download | hdf5-1d9e5ff1ca96bd10b66507ba281cb4617090e65e.zip hdf5-1d9e5ff1ca96bd10b66507ba281cb4617090e65e.tar.gz hdf5-1d9e5ff1ca96bd10b66507ba281cb4617090e65e.tar.bz2 | |
[svn-r30277] Merge revisions 30264, 30268, and 30275 to 1.8 branch
30264:
Fixed an issue that could occur when using H5Pset_alignment where a block could
be unaligned, causing an assertion failure.
30268:
Remove failure causing code in test/mf.c unintentionally added in r30264.
30275:
Rework test_mf_bug1 to work with multi and split drivers.
Tested: h5committest, jelly, ummon (trunk); h5committest, jelly, ummon (1.8)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5MFaggr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5MFaggr.c b/src/H5MFaggr.c index 02a1720..21d460e 100644 --- a/src/H5MFaggr.c +++ b/src/H5MFaggr.c @@ -201,7 +201,7 @@ HDfprintf(stderr, "%s: aggr = {%a, %Hu, %Hu}\n", FUNC, aggr->addr, aggr->tot_siz alignment = 0; /* no alignment */ /* Generate fragment if aggregator is mis-aligned */ - if(alignment && aggr->addr > 0 && aggr->size > 0 && (aggr_mis_align = (aggr->addr + H5FD_get_base_addr(f->shared->lf)) % alignment)) { + if(alignment && aggr->addr > 0 && (aggr_mis_align = (aggr->addr + H5FD_get_base_addr(f->shared->lf)) % alignment)) { aggr_frag_addr = aggr->addr; aggr_frag_size = alignment - aggr_mis_align; } /* end if */ |