summaryrefslogtreecommitdiffstats
path: root/src/H5Ostab.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-08-21 21:15:00 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-08-21 21:15:00 (GMT)
commit7a2756e7ae8164ac6601957f3a9617a00456f918 (patch)
tree07de6d5fe4151080e2da9375156ee5a62c2c627b /src/H5Ostab.c
parent428715468b9ddbe7077a191939fde535588afe3a (diff)
downloadhdf5-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/H5Ostab.c')
-rw-r--r--src/H5Ostab.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index 521a358..9524f43 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -99,32 +99,32 @@ static void *
H5O_stab_decode(H5F_t *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_flags,
unsigned UNUSED *ioflags, const uint8_t *p)
{
- H5O_stab_t *stab=NULL;
+ H5O_stab_t *stab = NULL;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_stab_decode);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_stab_decode)
/* check args */
- assert(f);
- assert(p);
+ HDassert(f);
+ HDassert(p);
/* decode */
- if (NULL==(stab = H5FL_CALLOC(H5O_stab_t)))
- HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
+ if(NULL == (stab = H5FL_CALLOC(H5O_stab_t)))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
H5F_addr_decode(f, &p, &(stab->btree_addr));
H5F_addr_decode(f, &p, &(stab->heap_addr));
/* Set return value */
- ret_value=stab;
+ ret_value = stab;
done:
- if(ret_value==NULL) {
- if(stab!=NULL)
- H5FL_FREE(H5O_stab_t,stab);
+ if(ret_value == NULL) {
+ if(stab != NULL)
+ (void)H5FL_FREE(H5O_stab_t,stab);
} /* end if */
- FUNC_LEAVE_NOAPI(ret_value);
-}
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5O_stab_decode() */
/*-------------------------------------------------------------------------
@@ -247,16 +247,16 @@ H5O_stab_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void UNUSED *
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_stab_free (void *mesg)
+H5O_stab_free(void *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_stab_free);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_stab_free)
- assert (mesg);
+ HDassert(mesg);
- H5FL_FREE(H5O_stab_t,mesg);
+ (void)H5FL_FREE(H5O_stab_t, mesg);
- FUNC_LEAVE_NOAPI(SUCCEED);
-}
+ FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5O_stab_free() */
/*-------------------------------------------------------------------------
@@ -283,7 +283,7 @@ H5O_stab_delete(H5F_t *f, hid_t dxpl_id, H5O_t UNUSED *open_oh, void *mesg)
HDassert(mesg);
/* Free the file space for the symbol table */
- if(H5G_stab_delete(f, dxpl_id, mesg) < 0)
+ if(H5G_stab_delete(f, dxpl_id, (const H5O_stab_t *)mesg) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free symbol table")
done:
@@ -339,7 +339,7 @@ H5O_stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst,
done:
if(!ret_value)
if(stab_dst)
- H5FL_FREE(H5O_stab_t, stab_dst);
+ (void)H5FL_FREE(H5O_stab_t, stab_dst);
FUNC_LEAVE_NOAPI(ret_value)
} /* H5O_stab_copy_file() */