summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-06-04 15:25:23 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-06-04 15:25:23 (GMT)
commitb56429d0863efa2595417847e92eab73b43bc5ae (patch)
tree14235d2364209ffe11c3ac6bfdfcc5456089787b
parentbb042d83c73df85f30c7103e9ff93b5cc630fced (diff)
downloadhdf5-b56429d0863efa2595417847e92eab73b43bc5ae.zip
hdf5-b56429d0863efa2595417847e92eab73b43bc5ae.tar.gz
hdf5-b56429d0863efa2595417847e92eab73b43bc5ae.tar.bz2
[svn-r6951] Purpose:
Code cleanup Description: Clean up various warnings & comment out unused code. Platforms tested: FreeBSD 4.8 (sleipnir) w/C++ FreeBSD 4.8 (sleipnir) w/parallel h5committested
-rw-r--r--src/H5Dio.c10
-rw-r--r--src/H5Gent.c4
-rw-r--r--src/H5HL.c4
-rw-r--r--test/dsets.c2
4 files changed, 12 insertions, 8 deletions
diff --git a/src/H5Dio.c b/src/H5Dio.c
index 731b4c7..25ac080 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -2294,7 +2294,6 @@ H5D_create_chunk_map(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *file_sp
hbool_t iter_init=0; /* Selection iteration info has been initialized */
unsigned f_ndims; /* The number of dimensions of the file's dataspace */
int sm_ndims; /* The number of dimensions of the memory buffer's dataspace (signed) */
- hsize_t offset[H5O_LAYOUT_NDIMS]; /* Offset of selection for chunk */
hsize_t nchunks, last_nchunks; /* Number of chunks in dataset */
H5TB_NODE *curr_node; /* Current node in TBBT */
char bogus; /* "bogus" buffer to pass to selection iterator */
@@ -2646,8 +2645,8 @@ H5D_create_chunk_file_map(fm_map *fm)
{
H5S_t *tmp_fspace=NULL; /* Temporary file dataspace */
hssize_t sel_points; /* Number of elements in file selection */
- hsize_t sel_start[H5O_LAYOUT_NDIMS]; /* Offset of low bound of file selection */
- hsize_t sel_end[H5O_LAYOUT_NDIMS]; /* Offset of high bound of file selection */
+ hssize_t sel_start[H5O_LAYOUT_NDIMS]; /* Offset of low bound of file selection */
+ hssize_t sel_end[H5O_LAYOUT_NDIMS]; /* Offset of high bound of file selection */
hssize_t start_coords[H5O_LAYOUT_NDIMS]; /* Starting coordinates of selection */
hssize_t coords[H5O_LAYOUT_NDIMS]; /* Current coordinates of chunk */
hsize_t count[H5O_LAYOUT_NDIMS]; /* Hyperslab count information */
@@ -2837,11 +2836,11 @@ H5D_create_chunk_mem_map(fm_map *fm)
#endif /* QAK */
/* Get offset of first block in file selection */
- if(H5S_get_select_hyper_blocklist(fm->file_space, 0, 1, file_off)<0)
+ if(H5S_get_select_hyper_blocklist(fm->file_space, (hsize_t)0, (hsize_t)1, file_off)<0)
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection block info");
/* Get offset of first block in memory selection */
- if(H5S_get_select_hyper_blocklist(fm->mem_space, 0, 1, mem_off)<0)
+ if(H5S_get_select_hyper_blocklist(fm->mem_space, (hsize_t)0, (hsize_t)1, mem_off)<0)
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get file selection block info");
/* Calculate the adjustment for memory selection from file selection */
@@ -2979,7 +2978,6 @@ H5D_chunk_mem_cb(void UNUSED *elem, hid_t UNUSED type_id, hsize_t ndims, hssize_
H5S_t *mspace; /* Memory chunk's dataspace */
hssize_t coords_in_mem[H5O_LAYOUT_NDIMS]; /* Coordinates of element in memory */
hsize_t chunk_index; /* Chunk index */
- hsize_t u; /* Local index variables */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOINIT(H5D_chunk_mem_cb);
diff --git a/src/H5Gent.c b/src/H5Gent.c
index 083ed9f..9596eb0 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -31,7 +31,9 @@ static int interface_initialize_g = 0;
#define INTERFACE_INIT NULL
/* Private prototypes */
+#ifdef NOT_YET
static herr_t H5G_ent_modified(H5G_entry_t *ent, H5G_type_t cache_type);
+#endif /* NOT_YET */
/*-------------------------------------------------------------------------
@@ -91,6 +93,7 @@ done:
*
*-------------------------------------------------------------------------
*/
+#ifdef NOT_YET
static herr_t
H5G_ent_modified(H5G_entry_t *ent, H5G_type_t cache_type)
{
@@ -107,6 +110,7 @@ H5G_ent_modified(H5G_entry_t *ent, H5G_type_t cache_type)
done:
FUNC_LEAVE_NOAPI(ret_value);
}
+#endif /* NOT_YET */
/*-------------------------------------------------------------------------
diff --git a/src/H5HL.c b/src/H5HL.c
index 3cf24a2..98e2323 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -71,9 +71,9 @@ typedef struct H5HL_t {
} H5HL_t;
/* PRIVATE PROTOTYPES */
+#ifdef NOT_YET
static void *H5HL_read(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t offset, size_t size,
void *buf);
-#ifdef NOT_YET
static herr_t H5HL_write(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t offset, size_t size,
const void *buf);
#endif /* NOT_YET */
@@ -621,6 +621,7 @@ H5HL_clear(H5HL_t *heap)
* The ADDR argument is passed by value.
*-------------------------------------------------------------------------
*/
+#ifdef NOT_YET
static void *
H5HL_read(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t offset, size_t size, void *buf)
{
@@ -648,6 +649,7 @@ H5HL_read(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t offset, size_t size, voi
done:
FUNC_LEAVE_NOAPI(ret_value);
}
+#endif /* NOT_YET */
/*-------------------------------------------------------------------------
diff --git a/test/dsets.c b/test/dsets.c
index e6bd6c3..1904dca 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -768,7 +768,7 @@ test_conv_buffer(hid_t fid)
hsize_t dimsb[1];
hsize_t dimsc[1];
hid_t xfer_list;
- hsize_t size;
+ size_t size;
TESTING("data type conversion buffer size");