summaryrefslogtreecommitdiffstats
path: root/hl/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-10-09 04:14:29 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-10-09 04:14:29 (GMT)
commit20720af231c875330a6074f65ee1c54e6a806fbb (patch)
tree64ae80f3ab6b76c09e2c309e76eb161cf133eed4 /hl/src
parent25d1056dbff92a7662ee73c67596d24906530dbc (diff)
downloadhdf5-20720af231c875330a6074f65ee1c54e6a806fbb.zip
hdf5-20720af231c875330a6074f65ee1c54e6a806fbb.tar.gz
hdf5-20720af231c875330a6074f65ee1c54e6a806fbb.tar.bz2
[svn-r12735] Description:
Clean up some compiler warnings and resolve some inconsistenceis between hsize_t and size_t in the interface. Tested on: FreeBSD/32 4.11 (sleipnir) w/threadsafe Linux/32 2.4 (heping) w/FORTRAN & C++ Linux/64 2.4 (mir) w/enable-1.6-compat
Diffstat (limited to 'hl/src')
-rw-r--r--hl/src/H5PT.c11
-rw-r--r--hl/src/H5PTpublic.h8
-rw-r--r--hl/src/H5TB.c8
-rw-r--r--hl/src/H5TBprivate.h4
4 files changed, 16 insertions, 15 deletions
diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c
index ee03a1b..e6e106f 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -102,7 +102,7 @@ hid_t H5PTcreate_fl ( hid_t loc_id,
goto out;
if(compression >= 0 && compression <= 9)
{
- if( H5Pset_deflate(plist_id, compression) < 0)
+ if( H5Pset_deflate(plist_id, (unsigned)compression) < 0)
goto out;
}
@@ -403,7 +403,7 @@ out:
*-------------------------------------------------------------------------
*/
herr_t H5PTappend( hid_t table_id,
- hsize_t nrecords,
+ size_t nrecords,
const void * data )
{
htbl_t * table;
@@ -457,7 +457,7 @@ out:
*-------------------------------------------------------------------------
*/
herr_t H5PTget_next( hid_t table_id,
- hsize_t nrecords,
+ size_t nrecords,
void * data)
{
htbl_t * table;
@@ -503,7 +503,7 @@ out:
*/
herr_t H5PTread_packets( hid_t table_id,
hsize_t start,
- hsize_t nrecords,
+ size_t nrecords,
void *data)
{
htbl_t * table;
@@ -780,11 +780,12 @@ out:
*/
herr_t H5PTfree_vlen_readbuff( hid_t table_id,
- hsize_t bufflen,
+ size_t _bufflen,
void * buff )
{
hid_t space_id = H5I_BADID;
htbl_t * table;
+ hsize_t bufflen = _bufflen;
herr_t ret_value;
/* find the table struct from its ID */
diff --git a/hl/src/H5PTpublic.h b/hl/src/H5PTpublic.h
index b0388e0..756eb51 100644
--- a/hl/src/H5PTpublic.h
+++ b/hl/src/H5PTpublic.h
@@ -51,7 +51,7 @@ H5_HLDLL herr_t H5PTclose( hid_t table_id );
*/
H5_HLDLL herr_t H5PTappend( hid_t table_id,
- hsize_t nrecords,
+ size_t nrecords,
const void * data );
/*-------------------------------------------------------------------------
@@ -63,12 +63,12 @@ H5_HLDLL herr_t H5PTappend( hid_t table_id,
H5_HLDLL herr_t H5PTget_next( hid_t table_id,
- hsize_t nrecords,
+ size_t nrecords,
void * data );
H5_HLDLL herr_t H5PTread_packets( hid_t table_id,
hsize_t start,
- hsize_t nrecords,
+ size_t nrecords,
void *data );
/*-------------------------------------------------------------------------
@@ -109,7 +109,7 @@ H5_HLDLL herr_t H5PTget_index( hid_t table_id,
*/
H5_HLDLL herr_t H5PTfree_vlen_readbuff( hid_t table_id,
- hsize_t bufflen,
+ size_t bufflen,
void * buff );
#ifdef __cplusplus
diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c
index db912a8..4d9ec84 100644
--- a/hl/src/H5TB.c
+++ b/hl/src/H5TB.c
@@ -324,7 +324,7 @@ herr_t H5TBappend_records( hid_t loc_id,
goto out;
/* Append the records */
- if ((H5TB_common_append_records(did, mem_type_id, nrecords, nrecords_orig, data))<0)
+ if ((H5TB_common_append_records(did, mem_type_id, (size_t)nrecords, nrecords_orig, data))<0)
goto out;
/* Release the datatype. */
@@ -934,7 +934,7 @@ herr_t H5TBread_records( hid_t loc_id,
goto out;
/* Read the records */
- if ((H5TB_common_read_records(did, mem_type_id, start, nrecords, nrecords_orig, data)) < 0)
+ if ((H5TB_common_read_records(did, mem_type_id, start, (size_t)nrecords, nrecords_orig, data)) < 0)
goto out;
/* get the dataspace handle */
@@ -3671,7 +3671,7 @@ out:
*/
herr_t H5TB_common_append_records( hid_t dataset_id,
hid_t mem_type_id,
- hsize_t nrecords,
+ size_t nrecords,
hsize_t orig_table_size,
const void * data)
{
@@ -3746,7 +3746,7 @@ out:
herr_t H5TB_common_read_records( hid_t dataset_id,
hid_t mem_type_id,
hsize_t start,
- hsize_t nrecords,
+ size_t nrecords,
hsize_t table_size,
void *data)
{
diff --git a/hl/src/H5TBprivate.h b/hl/src/H5TBprivate.h
index 46dcf15..9d9ad4f 100644
--- a/hl/src/H5TBprivate.h
+++ b/hl/src/H5TBprivate.h
@@ -34,7 +34,7 @@
herr_t H5TB_common_append_records( hid_t dataset_id,
hid_t mem_type_id,
- hsize_t nrecords,
+ size_t nrecords,
hsize_t orig_table_size,
const void * data);
@@ -49,7 +49,7 @@ herr_t H5TB_common_append_records( hid_t dataset_id,
herr_t H5TB_common_read_records( hid_t dataset_id,
hid_t mem_type_id,
hsize_t start,
- hsize_t nrecords,
+ size_t nrecords,
hsize_t table_size,
void *data);