diff options
Diffstat (limited to 'src/H5FD.c')
| -rw-r--r-- | src/H5FD.c | 18 |
1 files changed, 6 insertions, 12 deletions
@@ -555,7 +555,6 @@ done: * Purpose: Decodes the driver information block. * * Return: Success: Non-negative - * * Failure: Negative * * Programmer: Robb Matzke @@ -566,18 +565,17 @@ done: herr_t H5FD_sb_decode(H5FD_t *file, const char *name, const uint8_t *buf) { - herr_t ret_value=SUCCEED; /* Return value */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(H5FD_sb_decode, FAIL) - assert(file && file->cls); - if(file->cls->sb_decode && - (file->cls->sb_decode)(file, name, buf) < 0) + HDassert(file && file->cls); + if(file->cls->sb_decode && (file->cls->sb_decode)(file, name, buf) < 0) HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver sb_decode request failed") done: FUNC_LEAVE_NOAPI(ret_value) -} +} /* end H5FD_sb_decode() */ /*------------------------------------------------------------------------- @@ -1407,10 +1405,6 @@ done: * Programmer: Robb Matzke * Tuesday, July 27, 1999 * - * Modifications: - * Vailin Choi, 29th July 2008 - * Two more parameters were added to H5FD_alloc() for handling alignment - * *------------------------------------------------------------------------- */ haddr_t @@ -1435,7 +1429,7 @@ H5FDalloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, HADDR_UNDEF, "not a data transfer property list") /* Do the real work */ - if(HADDR_UNDEF == (ret_value = H5FD_alloc(file, dxpl_id, type, size, NULL, NULL))) + if(HADDR_UNDEF == (ret_value = H5FD_alloc_real(file, dxpl_id, type, size, NULL, NULL))) HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "unable to allocate file memory") /* (Note compensating for base address subtraction in internal routine) */ @@ -1488,7 +1482,7 @@ H5FDfree(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t siz /* Do the real work */ /* (Note compensating for base address addition in internal routine) */ - if(H5FD_free(file, dxpl_id, type, addr - file->base_addr, size) < 0) + if(H5FD_free_real(file, dxpl_id, type, addr - file->base_addr, size) < 0) HGOTO_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "file deallocation request failed") done: |