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/H5Oshmesg.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/H5Oshmesg.c')
| -rw-r--r-- | src/H5Oshmesg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Oshmesg.c b/src/H5Oshmesg.c index ed32fda..74fe739 100644 --- a/src/H5Oshmesg.c +++ b/src/H5Oshmesg.c @@ -88,7 +88,7 @@ H5O_shmesg_decode(H5F_t *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_flags, HDassert(f); HDassert(p); - if(NULL == (mesg = H5MM_calloc(sizeof(H5O_shmesg_table_t)))) + if(NULL == (mesg = (H5O_shmesg_table_t *)H5MM_calloc(sizeof(H5O_shmesg_table_t)))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for shared message table message") /* Retrieve version, table address, and number of indexes */ @@ -163,7 +163,7 @@ H5O_shmesg_copy(const void *_mesg, void *_dest) /* Sanity check */ HDassert(mesg); - if(!dest && NULL == (dest = H5MM_malloc(sizeof(H5O_shmesg_table_t)))) + if(!dest && NULL == (dest = (H5O_shmesg_table_t *)H5MM_malloc(sizeof(H5O_shmesg_table_t)))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for shared message table message") /* All this message requires is a shallow copy */ |