summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Soumagne <jsoumagne@hdfgroup.org>2013-07-26 17:05:38 (GMT)
committerJerome Soumagne <jsoumagne@hdfgroup.org>2013-07-26 17:05:38 (GMT)
commitcb41664db2fdfb7da5cc754a0119364741d0dae4 (patch)
tree06d1023042c69c55be7b01c6a6ec8679356f68f3
parenta195bb78b9bede6207fc2491161428f7eb3c4272 (diff)
downloadhdf5-cb41664db2fdfb7da5cc754a0119364741d0dae4.zip
hdf5-cb41664db2fdfb7da5cc754a0119364741d0dae4.tar.gz
hdf5-cb41664db2fdfb7da5cc754a0119364741d0dae4.tar.bz2
[svn-r23937] Remove unused param / var warnings and fix H5HF_sect_single_dblock_info prototype
-rw-r--r--hl/test/test_lite.c3
-rw-r--r--src/H5Dint.c2
-rw-r--r--src/H5FDmulti.c2
-rw-r--r--src/H5HFman.c2
-rw-r--r--src/H5HFpkg.h2
-rw-r--r--src/H5HFsection.c8
6 files changed, 10 insertions, 9 deletions
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index 282755e..b649462 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -1813,10 +1813,9 @@ static int test_valid_path(void)
{
hid_t file_id, group;
herr_t status;
- FILE *fp = NULL;
htri_t path_valid;
const char *data_string_in = "test";
-
+
TESTING("H5LTpath_valid");
/* Create a new file using default properties. */
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 5545a98..d22c643 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -2358,7 +2358,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5D__mark(H5D_t *dataset, hid_t dxpl_id, unsigned flags)
+H5D__mark(H5D_t *dataset, hid_t UNUSED dxpl_id, unsigned flags)
{
herr_t ret_value = SUCCEED; /* Return value */
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index a3ce7f8..f907e0a 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -1784,6 +1784,7 @@ H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
H5FD_mem_t mt, mmt, hi = H5FD_MEM_DEFAULT;
haddr_t start_addr = 0;
static const char *func = "H5FD_multi_read"; /* Function Name for error reporting */
+ dxpl_id = dxpl_id; /* Suppress compiler warning */
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
@@ -1836,6 +1837,7 @@ H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
H5FD_mem_t mt, mmt, hi = H5FD_MEM_DEFAULT;
haddr_t start_addr = 0;
static const char *func = "H5FD_multi_read"; /* Function Name for error reporting */
+ dxpl_id = dxpl_id; /* Suppress compiler warning */
/* Clear the error stack */
H5Eclear2(H5E_DEFAULT);
diff --git a/src/H5HFman.c b/src/H5HFman.c
index 58e3318..b43356f 100644
--- a/src/H5HFman.c
+++ b/src/H5HFman.c
@@ -157,7 +157,7 @@ H5HF_man_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, const void *obj
HDassert(sec_node->sect_info.state == H5FS_SECT_LIVE);
/* Retrieve direct block address from section */
- if(H5HF_sect_single_dblock_info(hdr, dxpl_id, sec_node, &dblock_addr, &dblock_size) < 0)
+ if(H5HF_sect_single_dblock_info(hdr, sec_node, &dblock_addr, &dblock_size) < 0)
HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve direct block information")
/* Lock direct block */
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h
index e0deca7..3e2db99 100644
--- a/src/H5HFpkg.h
+++ b/src/H5HFpkg.h
@@ -761,7 +761,7 @@ H5_DLL H5HF_free_section_t *H5HF_sect_single_new(hsize_t sect_off,
size_t sect_size, H5HF_indirect_t *parent, unsigned par_entry);
H5_DLL herr_t H5HF_sect_single_revive(H5HF_hdr_t *hdr, hid_t dxpl_id,
H5HF_free_section_t *sect);
-H5_DLL herr_t H5HF_sect_single_dblock_info(H5HF_hdr_t *hdr, hid_t dxpl_id,
+H5_DLL herr_t H5HF_sect_single_dblock_info(H5HF_hdr_t *hdr,
H5HF_free_section_t *sect, haddr_t *dblock_addr, size_t *dblock_size);
H5_DLL herr_t H5HF_sect_single_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id,
H5HF_free_section_t *sect, size_t amt);
diff --git a/src/H5HFsection.c b/src/H5HFsection.c
index bf779a6..794d36c 100644
--- a/src/H5HFsection.c
+++ b/src/H5HFsection.c
@@ -648,7 +648,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5HF_sect_single_dblock_info(H5HF_hdr_t *hdr, hid_t dxpl_id,
+H5HF_sect_single_dblock_info(H5HF_hdr_t *hdr,
H5HF_free_section_t *sect, haddr_t *dblock_addr, size_t *dblock_size)
{
FUNC_ENTER_NOAPI_NOERR
@@ -766,7 +766,7 @@ H5HF_sect_single_full_dblock(H5HF_hdr_t *hdr, hid_t dxpl_id,
HDassert(hdr);
/* Retrieve direct block address from section */
- if(H5HF_sect_single_dblock_info(hdr, dxpl_id, sect, &dblock_addr, &dblock_size) < 0)
+ if(H5HF_sect_single_dblock_info(hdr, sect, &dblock_addr, &dblock_size) < 0)
HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve direct block information")
/* Check for section occupying entire direct block */
@@ -1087,7 +1087,7 @@ H5HF_sect_single_shrink(H5FS_section_info_t **_sect, void UNUSED *_udata)
HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't revive single free section")
/* Retrieve direct block address from section */
- if(H5HF_sect_single_dblock_info(hdr, dxpl_id, (*sect), &dblock_addr, &dblock_size) < 0)
+ if(H5HF_sect_single_dblock_info(hdr, (*sect), &dblock_addr, &dblock_size) < 0)
HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve direct block information")
/* Protect the direct block for the section */
@@ -1197,7 +1197,7 @@ H5HF_sect_single_valid(const H5FS_section_class_t UNUSED *cls, const H5FS_sectio
/* Retrieve direct block address from section */
/* (Casting away const OK - QAK) */
- status = H5HF_sect_single_dblock_info(iblock->hdr, H5AC_dxpl_id, (H5HF_free_section_t *)sect, &dblock_addr, &dblock_size);
+ status = H5HF_sect_single_dblock_info(iblock->hdr, (H5HF_free_section_t *)sect, &dblock_addr, &dblock_size);
HDassert(status >= 0);
HDassert(H5F_addr_eq(iblock->ents[sect->u.single.par_entry].addr, dblock_addr));
HDassert(dblock_size > 0);