diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-08-21 21:15:00 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-08-21 21:15:00 (GMT) |
| commit | 7a2756e7ae8164ac6601957f3a9617a00456f918 (patch) | |
| tree | 07de6d5fe4151080e2da9375156ee5a62c2c627b /src/H5MP.c | |
| parent | 428715468b9ddbe7077a191939fde535588afe3a (diff) | |
| download | hdf5-7a2756e7ae8164ac6601957f3a9617a00456f918.zip hdf5-7a2756e7ae8164ac6601957f3a9617a00456f918.tar.gz hdf5-7a2756e7ae8164ac6601957f3a9617a00456f918.tar.bz2 | |
[svn-r15513] Description:
Bring back r15510 & r15512 from trunk:
Fix compiler warnings and formatting.
Tested on:
Mac OS X/32 10.5.4 (amazon)
More tests upcoming
Diffstat (limited to 'src/H5MP.c')
| -rw-r--r-- | src/H5MP.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -147,14 +147,14 @@ H5MP_new_page(H5MP_pool_t *mp, size_t page_size) /* Allocate page */ if(page_size > mp->page_size) { - if(NULL == (new_page = H5MM_malloc(page_size))) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for page") + if(NULL == (new_page = (H5MP_page_t *)H5MM_malloc(page_size))) + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for page") new_page->free_size = page_size - H5MP_BLOCK_ALIGN(sizeof(H5MP_page_t)); new_page->fac_alloc = FALSE; } /* end if */ else { - if((new_page = H5FL_FAC_MALLOC(mp->page_fac)) == NULL) - HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for page") + if(NULL == (new_page = (H5MP_page_t *)H5FL_FAC_MALLOC(mp->page_fac))) + HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for page") new_page->free_size = mp->max_size; new_page->fac_alloc = TRUE; } /* end else */ |