diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-08-03 12:57:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-03 12:57:29 (GMT) |
| commit | 7fc8531b767855e69fb4016783a1131ba581fd5b (patch) | |
| tree | a243310b99da59c858ae4eaeed8c452e0177bba4 /src/H5Fspace.c | |
| parent | a77d8bfcd7d066c6759b0346c02cbd612f90b7c2 (diff) | |
| download | hdf5-7fc8531b767855e69fb4016783a1131ba581fd5b.zip hdf5-7fc8531b767855e69fb4016783a1131ba581fd5b.tar.gz hdf5-7fc8531b767855e69fb4016783a1131ba581fd5b.tar.bz2 | |
Merge Made HGOTO_ERROR a do-while loop changes from develop (#3334)
Diffstat (limited to 'src/H5Fspace.c')
| -rw-r--r-- | src/H5Fspace.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Fspace.c b/src/H5Fspace.c index eb0e7f9..163d8d8 100644 --- a/src/H5Fspace.c +++ b/src/H5Fspace.c @@ -96,22 +96,22 @@ H5F__alloc(H5F_t *f, H5F_mem_t type, hsize_t size, haddr_t *frag_addr, hsize_t * /* Get the EOA for the file */ if (HADDR_UNDEF == (eoa = H5F_get_eoa(f, type))) - HGOTO_ERROR(H5E_FILE, H5E_CANTGET, HADDR_UNDEF, "Unable to get eoa") + HGOTO_ERROR(H5E_FILE, H5E_CANTGET, HADDR_UNDEF, "Unable to get eoa"); /* Check for overlapping into file's temporary allocation space */ if (H5_addr_gt((eoa + size), f->shared->tmp_addr)) HGOTO_ERROR(H5E_FILE, H5E_BADRANGE, HADDR_UNDEF, - "'normal' file space allocation request will overlap into 'temporary' file space") + "'normal' file space allocation request will overlap into 'temporary' file space"); } /* end if */ /* Call the file driver 'alloc' routine */ ret_value = H5FD_alloc(f->shared->lf, type, f, size, frag_addr, frag_size); if (!H5_addr_defined(ret_value)) - HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, HADDR_UNDEF, "file driver 'alloc' request failed") + HGOTO_ERROR(H5E_FILE, H5E_CANTALLOC, HADDR_UNDEF, "file driver 'alloc' request failed"); /* Mark EOA dirty */ if (H5F_eoa_dirty(f) < 0) - HGOTO_ERROR(H5E_FILE, H5E_CANTMARKDIRTY, HADDR_UNDEF, "unable to mark EOA as dirty") + HGOTO_ERROR(H5E_FILE, H5E_CANTMARKDIRTY, HADDR_UNDEF, "unable to mark EOA as dirty"); done: FUNC_LEAVE_NOAPI(ret_value) @@ -148,11 +148,11 @@ H5F__free(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size) /* Call the file driver 'free' routine */ if (H5FD_free(f->shared->lf, type, f, addr, size) < 0) - HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "file driver 'free' request failed") + HGOTO_ERROR(H5E_FILE, H5E_CANTFREE, FAIL, "file driver 'free' request failed"); /* Mark EOA dirty */ if (H5F_eoa_dirty(f) < 0) - HGOTO_ERROR(H5E_FILE, H5E_CANTMARKDIRTY, FAIL, "unable to mark EOA as dirty") + HGOTO_ERROR(H5E_FILE, H5E_CANTMARKDIRTY, FAIL, "unable to mark EOA as dirty"); done: FUNC_LEAVE_NOAPI(ret_value) @@ -189,7 +189,7 @@ H5F__try_extend(H5F_t *f, H5FD_mem_t type, haddr_t blk_end, hsize_t extra_reques /* Extend the object by extending the underlying file */ if ((ret_value = H5FD_try_extend(f->shared->lf, type, f, blk_end, extra_requested)) < 0) - HGOTO_ERROR(H5E_FILE, H5E_CANTEXTEND, FAIL, "driver try extend request failed") + HGOTO_ERROR(H5E_FILE, H5E_CANTEXTEND, FAIL, "driver try extend request failed"); /* H5FD_try_extend() updates driver message and marks the superblock * dirty, so no need to do it again here. |