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/H5Fmount.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/H5Fmount.c')
| -rw-r--r-- | src/H5Fmount.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Fmount.c b/src/H5Fmount.c index b922446..74674c6 100644 --- a/src/H5Fmount.c +++ b/src/H5Fmount.c @@ -215,8 +215,8 @@ H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child, /* Make room in the table */ if(parent->shared->mtab.nmounts >= parent->shared->mtab.nalloc) { unsigned n = MAX(16, 2 * parent->shared->mtab.nalloc); - H5F_mount_t *x = H5MM_realloc(parent->shared->mtab.child, - n * sizeof(parent->shared->mtab.child[0])); + H5F_mount_t *x = (H5F_mount_t *)H5MM_realloc(parent->shared->mtab.child, n * sizeof(parent->shared->mtab.child[0])); + if(!x) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for mount table") parent->shared->mtab.child = x; @@ -463,7 +463,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id) { H5G_loc_t loc; H5F_t *child = NULL; - herr_t ret_value=SUCCEED; /* Return value */ + herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Fmount, FAIL) H5TRACE4("e", "i*sii", loc_id, name, child_id, plist_id); @@ -473,7 +473,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location") if(!name || !*name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") - if(NULL == (child = H5I_object_verify(child_id,H5I_FILE))) + if(NULL == (child = (H5F_t *)H5I_object_verify(child_id, H5I_FILE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file") if(H5P_DEFAULT == plist_id) plist_id = H5P_FILE_MOUNT_DEFAULT; |