From 9f208ec4e25257c4cc5877afc375e3f39cc8beff Mon Sep 17 00:00:00 2001 From: Mike McGreevy Date: Thu, 17 Jun 2010 12:27:41 -0500 Subject: [svn-r19017] Purpose: Minor code cleanup Description: Add missing declaration of H5AC_ignore_tags() to H5ACprivate.h Clean up some warnings in cache_tagging.c test file Tested: jam, gandalf --- src/H5ACprivate.h | 2 ++ test/cache_tagging.c | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h index a320f46..c59f681 100644 --- a/src/H5ACprivate.h +++ b/src/H5ACprivate.h @@ -390,5 +390,7 @@ H5_DLL herr_t H5AC_tag(hid_t dxpl_id, haddr_t metadata_tag, haddr_t * prev_tag); H5_DLL herr_t H5AC_retag_copied_metadata(H5F_t * f, haddr_t metadata_tag); +H5_DLL herr_t H5AC_ignore_tags(H5F_t * f); + #endif /* !_H5ACprivate_H */ diff --git a/test/cache_tagging.c b/test/cache_tagging.c index 0aa04ab..cc1b37c 100644 --- a/test/cache_tagging.c +++ b/test/cache_tagging.c @@ -397,7 +397,6 @@ error: static int verify_tag(hid_t fid, int id, haddr_t tag) { int i = 0; /* Iterator */ - H5C_cache_entry_t *entry_ptr = NULL; /* Entry Pointer */ int found = FALSE; /* If Entry Found */ H5F_t * f = NULL; /* File Pointer */ H5C_t * cache_ptr = NULL; /* Cache Pointer */ @@ -3835,17 +3834,17 @@ check_invalid_tag_application(void) if ( NULL == (f = (H5F_t *)H5I_object(fid)) ) TEST_ERROR; /* Create dxpl */ - if ( dxpl_id = H5Pcreate(H5P_DATASET_XFER) < 0) TEST_ERROR; + if ( (dxpl_id = H5Pcreate(H5P_DATASET_XFER)) < 0) TEST_ERROR; /* Call H5HL_create, an internal function that calls H5AC_set without setting up a tag */ /* Ensure this returns FAILURE, as a tag has not been set up. */ - if ( H5HL_create(f, H5AC_ind_dxpl_id, 1024, &addr) >= 0) TEST_ERROR; + if ( H5HL_create(f, H5AC_ind_dxpl_id, (size_t)1024, &addr) >= 0) TEST_ERROR; /* Now set up a tag in the dxpl */ if ( H5AC_tag(H5AC_ind_dxpl_id, (haddr_t)25, NULL) < 0) TEST_ERROR; /* Verify the same call to H5HL_create now works as intended, with a tag set up. */ - if ( H5HL_create(f, H5AC_ind_dxpl_id, 1024, &addr) < 0) TEST_ERROR; + if ( H5HL_create(f, H5AC_ind_dxpl_id, (size_t)1024, &addr) < 0) TEST_ERROR; /* Reset dxpl to use invalid tag. */ if ( H5AC_tag(H5AC_ind_dxpl_id, H5AC__INVALID_TAG, NULL) < 0) TEST_ERROR; -- cgit v0.12