summaryrefslogtreecommitdiffstats
path: root/src/H5Fquery.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-06-18 18:37:49 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-06-18 18:37:49 (GMT)
commited7658df795092d7bd50705cae4319adb5985289 (patch)
tree78f3a1eb1e2fc5da697be2655b2f824710e5a6e1 /src/H5Fquery.c
parent879d58b86bacd743e75d78bed2c54f549aeb0a9d (diff)
downloadhdf5-ed7658df795092d7bd50705cae4319adb5985289.zip
hdf5-ed7658df795092d7bd50705cae4319adb5985289.tar.gz
hdf5-ed7658df795092d7bd50705cae4319adb5985289.tar.bz2
[svn-r17085] Description:
Bring r17002:17084 from trunk to revise_chunks branch. Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode Mac OS X/32 10.5.7 (amazon) in debug mode Mac OS X/32 10.5.7 (amazon) w/C++ & FORTRAN, w/threadsafe, in production mode
Diffstat (limited to 'src/H5Fquery.c')
-rw-r--r--src/H5Fquery.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/H5Fquery.c b/src/H5Fquery.c
index d070b94..5538d60 100644
--- a/src/H5Fquery.c
+++ b/src/H5Fquery.c
@@ -689,30 +689,30 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5F_get_next_proxy_addr
+ * Function: H5F_is_tmp_addr
*
- * Purpose: Quick and dirty routine to retrieve the next metadata proxy
- * address for a file.
+ * Purpose: Quick and dirty routine to determine if an address is in
+ * the 'temporary' file space.
* (Mainly added to stop non-file routines from poking about in the
* H5F_t data structure)
*
- * Return: Success: Address to use for metadata cache proxy
- * Failure: abort (should not happen)
+ * Return: TRUE/FALSE on success/abort on failure (shouldn't fail)
*
* Programmer: Quincey Koziol <koziol@hdfgroup.org>
- * May 19, 2009
+ * June 11, 2009
*
*-------------------------------------------------------------------------
*/
-haddr_t
-H5F_get_next_proxy_addr(const H5F_t *f)
+hbool_t
+H5F_is_tmp_addr(const H5F_t *f, haddr_t addr)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_next_proxy_addr)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_is_tmp_addr)
HDassert(f);
HDassert(f->shared);
+ HDassert(f->shared->lf);
- FUNC_LEAVE_NOAPI(f->shared->next_proxy_addr--)
-} /* end H5F_get_next_proxy_addr() */
+ FUNC_LEAVE_NOAPI(H5F_addr_le(f->shared->tmp_addr, addr))
+} /* end H5F_is_tmp_addr() */