summaryrefslogtreecommitdiffstats
path: root/src/H5Olayout.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-02-10 19:48:08 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-02-10 19:48:08 (GMT)
commit5f94d17285913b2497d169cadfb639f300773407 (patch)
treef4a96b86d8ac5d13411ca897e1377fb2f1808cb3 /src/H5Olayout.c
parentf16098f402139aa4e258542661c3003389803de9 (diff)
downloadhdf5-5f94d17285913b2497d169cadfb639f300773407.zip
hdf5-5f94d17285913b2497d169cadfb639f300773407.tar.gz
hdf5-5f94d17285913b2497d169cadfb639f300773407.tar.bz2
[svn-r21925] Description:
Bring r21919-21924 from trunk to 1.8 branch: cleanup FUNC_ENTER macros, etc. Also removed Subversion mergeinfo tags from a few directories and files. These are artifacts from non-root merges using pre-1.6 Subversion clients. (This should fix the problem of unchanged directories looking "changed" during checkins.) Tested on: Mac OSX/64 10.7.3 (amazon) w/debug & production (daily tested on trunk)
Diffstat (limited to 'src/H5Olayout.c')
-rw-r--r--src/H5Olayout.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 4a119ac..e4d6486 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -103,7 +103,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
unsigned u;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_layout_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -295,7 +295,7 @@ H5O_layout_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const voi
unsigned u;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_layout_encode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -373,7 +373,7 @@ H5O_layout_copy(const void *_mesg, void *_dest)
H5O_layout_t *dest = (H5O_layout_t *) _dest;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_layout_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(mesg);
@@ -433,7 +433,7 @@ H5O_layout_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg
const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg;
size_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_layout_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
@@ -465,7 +465,7 @@ H5O_layout_reset(void *_mesg)
{
H5O_layout_t *mesg = (H5O_layout_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_layout_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(mesg) {
/* Free the compact storage buffer */
@@ -498,7 +498,7 @@ H5O_layout_free(void *_mesg)
H5O_layout_t *mesg = (H5O_layout_t *) _mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_layout_free)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(mesg);
@@ -531,7 +531,7 @@ H5O_layout_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
H5O_layout_t *mesg = (H5O_layout_t *) _mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_layout_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -590,7 +590,7 @@ H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst,
hbool_t copied = FALSE; /* Whether the data was copied */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_layout_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(file_src);
@@ -680,7 +680,7 @@ H5O_layout_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg,
const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg;
unsigned u;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_layout_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);