diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-09-10 19:53:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-09-10 19:53:38 (GMT) |
| commit | d517c77bc0fe9c9dbfd013d720e1533289decd9f (patch) | |
| tree | 97f369888eccbb8455ebbc2fd6de9f6834f6b433 /src/H5Olayout.c | |
| parent | fc7993a9f068319ed35f13fd153feeb5da3d86a7 (diff) | |
| download | hdf5-d517c77bc0fe9c9dbfd013d720e1533289decd9f.zip hdf5-d517c77bc0fe9c9dbfd013d720e1533289decd9f.tar.gz hdf5-d517c77bc0fe9c9dbfd013d720e1533289decd9f.tar.bz2 | |
[svn-r15610] Description:
Bring r15609 back from trunk:
Omnibus compiler warning cleanup & some formatting happiness.
Tested on:
Mac OS X/32 10.5.4 (amazon)
Too minor to require h5committest
Diffstat (limited to 'src/H5Olayout.c')
| -rw-r--r-- | src/H5Olayout.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 792c1f0..f6d9534 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -254,7 +254,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_flags, done: if(ret_value == NULL) if(mesg) - H5FL_FREE(H5O_layout_t, mesg); + (void)H5FL_FREE(H5O_layout_t, mesg); FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_layout_decode() */ @@ -552,22 +552,22 @@ H5O_layout_reset (void *_mesg) *------------------------------------------------------------------------- */ static herr_t -H5O_layout_free (void *_mesg) +H5O_layout_free(void *_mesg) { H5O_layout_t *mesg = (H5O_layout_t *) _mesg; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_layout_free); + FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_layout_free) - assert (mesg); + HDassert(mesg); /* Free the compact storage buffer */ - if(mesg->type==H5D_COMPACT) - mesg->u.compact.buf=H5MM_xfree(mesg->u.compact.buf); + if(mesg->type == H5D_COMPACT) + mesg->u.compact.buf = H5MM_xfree(mesg->u.compact.buf); - H5FL_FREE(H5O_layout_t,mesg); + (void)H5FL_FREE(H5O_layout_t, mesg); - FUNC_LEAVE_NOAPI(SUCCEED); -} + FUNC_LEAVE_NOAPI(SUCCEED) +} /* end H5O_layout_free() */ /*------------------------------------------------------------------------- @@ -721,7 +721,7 @@ H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, done: if(!ret_value) if(layout_dst) - H5FL_FREE(H5O_layout_t, layout_dst); + (void)H5FL_FREE(H5O_layout_t, layout_dst); FUNC_LEAVE_NOAPI(ret_value) } /* end H5O_layout_copy_file() */ @@ -742,8 +742,8 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5O_layout_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE * stream, - int indent, int fwidth) +H5O_layout_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, + FILE * stream, int indent, int fwidth) { const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg; unsigned u; @@ -791,5 +791,5 @@ H5O_layout_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE } /* end else */ FUNC_LEAVE_NOAPI(SUCCEED); -} +} /* end H5O_layout_debug() */ |