diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-05 21:55:22 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-05 21:55:22 (GMT) |
| commit | cb772e9939a8dd4e447ad7f8e4cf2fdefb8f37db (patch) | |
| tree | 1e9ed63b05346164bbd792bb4f5bec7154290cea /testpar | |
| parent | b60f90da91886edc2afaaca9bf1587d7591051e1 (diff) | |
| download | hdf5-cb772e9939a8dd4e447ad7f8e4cf2fdefb8f37db.zip hdf5-cb772e9939a8dd4e447ad7f8e4cf2fdefb8f37db.tar.gz hdf5-cb772e9939a8dd4e447ad7f8e4cf2fdefb8f37db.tar.bz2 | |
[svn-r18714] Description:
Simplify parameters to 'deserialize' cache client callback.
Tested on:
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.6.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/t_cache.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index 95b7cdb3..989e857 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -315,10 +315,9 @@ hbool_t serve_write_request(struct mssg_t * mssg_ptr); /* call back functions & related data structures */ -static void * datum_deserialize(haddr_t addr, +static void * datum_deserialize(const void * image_ptr, size_t len, - const void * image_ptr, - const void * udata_ptr, + void * udata_ptr, hbool_t * dirty_ptr); static herr_t datum_image_len(void *thing, @@ -1685,13 +1684,13 @@ serve_write_request(struct mssg_t * mssg_ptr) */ void * -datum_deserialize(haddr_t addr, +datum_deserialize(const void * image_ptr, UNUSED size_t len, - const void * image_ptr, - const UNUSED void * udata_ptr, + void * udata_ptr, hbool_t * dirty_ptr) { const char * fcn_name = "load_datum()"; + haddr_t addr = *(haddr_t *)udata_ptr; hbool_t success = TRUE; int idx; struct datum * entry_ptr = NULL; @@ -2697,7 +2696,7 @@ lock_entry(H5C_t * cache_ptr, cache_entry_ptr = H5AC_protect(file_ptr, H5P_DATASET_XFER_DEFAULT, &(types[0]), entry_ptr->base_addr, - entry_ptr->local_len, NULL, H5AC_WRITE); + entry_ptr->local_len, &entry_ptr->base_addr, H5AC_WRITE); if ( ( cache_entry_ptr != (void *)(&(entry_ptr->header)) ) || ( entry_ptr->header.type != &(types[0]) ) || |