summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-05-20 11:39:05 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-05-20 11:39:05 (GMT)
commit817f42c3bb8c0090a12dc78a9c537cbaefb2dd93 (patch)
tree69bc9e4d8b147da2f6e2c07bf70461a088aad2fa /testpar
parent6302b47cf5294306b7474b40fda43a5dfc82b54a (diff)
downloadhdf5-817f42c3bb8c0090a12dc78a9c537cbaefb2dd93.zip
hdf5-817f42c3bb8c0090a12dc78a9c537cbaefb2dd93.tar.gz
hdf5-817f42c3bb8c0090a12dc78a9c537cbaefb2dd93.tar.bz2
[svn-r18863] Description:
General cleanups to align metadata journaling branch and trunk Tested on: FreeBSD/32 6.3 (duty) in debug mode FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & 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.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index 74ac06c..d99cec0 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -3557,8 +3557,7 @@ unlock_entry(H5C_t * cache_ptr,
}
result = H5AC_unprotect(file_ptr, H5P_DATASET_XFER_DEFAULT, &(types[0]),
- entry_ptr->base_addr,
- (void *)(&(entry_ptr->header)), flags);
+ entry_ptr->base_addr, (void *)(&(entry_ptr->header)), flags);
if ( ( result < 0 ) ||
( entry_ptr->header.type != &(types[0]) ) ||
@@ -4193,7 +4192,7 @@ smoke_check_2(void)
/* we can't move pinned entries, so release any local pins now. */
local_unpin_all_entries(cache_ptr, file_ptr, FALSE);
- /* move the first half of the entries... */
+ /* Move the first half of the entries... */
for ( i = 0; i < (virt_num_data_entries / 2); i++ )
{
lock_entry(cache_ptr, file_ptr, i);
@@ -5048,10 +5047,7 @@ smoke_check_5(void)
resize_entry(i, data[i].len / 2);
}
- if ( i % 4 == 0 )
- mark_entry_dirty(cache_ptr, file_ptr, i);
- else
- mark_entry_dirty(cache_ptr, file_ptr, i);
+ mark_entry_dirty(cache_ptr, file_ptr, i);
if ( i % 8 <= 4 ) {