diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2017-02-20 04:33:22 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2017-02-20 04:33:22 (GMT) |
| commit | 2c2fb928daa8fa82930f78d00f9ee0dcad70d35a (patch) | |
| tree | 5fdb1f02dd14a502cffa330b69c0b87a9fc68e2f /src/H5FDmulti.c | |
| parent | 7e4b64bd834c95fee396aabc2cb73227f7baf873 (diff) | |
| parent | 101fa7af8ebe26ad015b64d3b881df8a9124ccc2 (diff) | |
| download | hdf5-2c2fb928daa8fa82930f78d00f9ee0dcad70d35a.zip hdf5-2c2fb928daa8fa82930f78d00f9ee0dcad70d35a.tar.gz hdf5-2c2fb928daa8fa82930f78d00f9ee0dcad70d35a.tar.bz2 | |
Merge pull request #302 in HDFFV/hdf5 from merge_page_buffering_02 to develop
* commit '101fa7af8ebe26ad015b64d3b881df8a9124ccc2':
Cleanups and normalizations against incoming page_buffering changes.
Switch major error code from H5E_FSPACE [back] to H5E_RESOURCE
Misc. style cleanups from the page_buffering branch.
Diffstat (limited to 'src/H5FDmulti.c')
| -rw-r--r-- | src/H5FDmulti.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index befcaca..7e12869 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -1151,14 +1151,18 @@ H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2) ALL_MEMBERS(mt) { out_mt = mt; - if (f1->memb[mt] && f2->memb[mt]) break; - if (!cmp) { - if (f1->memb[mt]) cmp = -1; - else if (f2->memb[mt]) cmp = 1; + if(f1->memb[mt] && f2->memb[mt]) + break; + if(!cmp) { + if(f1->memb[mt]) + cmp = -1; + else if(f2->memb[mt]) + cmp = 1; } } END_MEMBERS; assert(cmp || out_mt<H5FD_MEM_NTYPES); - if (out_mt>=H5FD_MEM_NTYPES) return cmp; + if(out_mt>=H5FD_MEM_NTYPES) + return cmp; return H5FDcmp(f1->memb[out_mt], f2->memb[out_mt]); } |