summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
Diffstat (limited to 'hl')
-rwxr-xr-xhl/fortran/src/H5LTfc.c4
-rwxr-xr-xhl/fortran/src/H5TBfc.c7
-rwxr-xr-xhl/fortran/test/tsttable.f902
-rw-r--r--hl/src/H5IM.c14
-rw-r--r--hl/src/H5TA.c61
-rw-r--r--hl/test/test_image.c11
-rw-r--r--hl/test/test_table.c8
7 files changed, 45 insertions, 62 deletions
diff --git a/hl/fortran/src/H5LTfc.c b/hl/fortran/src/H5LTfc.c
index f2b1aca..12a8a3c 100755
--- a/hl/fortran/src/H5LTfc.c
+++ b/hl/fortran/src/H5LTfc.c
@@ -870,7 +870,7 @@ nh5ltget_dataset_info_c(hid_t_f *loc_id,
ret = H5LTget_dataset_info(c_loc_id, c_name, c_dims, &c_classtype, &c_type_size);
*type_class = c_classtype;
- *type_size = c_type_size;
+ *type_size = (size_t_f)c_type_size;
for (i = 0; i < 32 ; i++) {
dims[i] = (hsize_t_f) c_dims[i];
}
@@ -1000,7 +1000,7 @@ nh5ltget_attribute_info_c(hid_t_f *loc_id,
ret = H5LTget_attribute_info(c_loc_id,c_name,c_attrname,c_dims,&c_classtype,&c_type_size);
*type_class = c_classtype;
- *type_size = c_type_size;
+ *type_size = (size_t_f)c_type_size;
for (i = 0; i < 32 ; i++) {
dims[i] = (hsize_t_f) c_dims[i];
}
diff --git a/hl/fortran/src/H5TBfc.c b/hl/fortran/src/H5TBfc.c
index 68bade4..78866c8 100755
--- a/hl/fortran/src/H5TBfc.c
+++ b/hl/fortran/src/H5TBfc.c
@@ -65,7 +65,6 @@ nh5tbmake_table_c(int_f *namelen1,
hsize_t c_nfields = *nfields;
hsize_t c_nrecords = *nrecords;
hsize_t c_chunk_size = *chunk_size;
- int c_compress = *compress;
size_t c_type_size = *type_size;
size_t *c_field_offset;
hid_t *c_field_types;
@@ -689,11 +688,11 @@ nh5tbget_field_info_c(hid_t_f *loc_id,
HD5packFstring(tmp, _fcdtocp(field_names), (int)(c_lenmax*c_nfields));
- *type_size = c_type_size;
+ *type_size = (size_t_f)c_type_size;
for (i=0; i < num_elem; i++)
{
- field_sizes[i] = c_field_sizes[i];
- field_offsets[i] = c_field_offsets[i];
+ field_sizes[i] = (size_t_f)c_field_sizes[i];
+ field_offsets[i] = (size_t_f)c_field_offsets[i];
}
diff --git a/hl/fortran/test/tsttable.f90 b/hl/fortran/test/tsttable.f90
index 2f27d3c..44a42ce 100755
--- a/hl/fortran/test/tsttable.f90
+++ b/hl/fortran/test/tsttable.f90
@@ -54,7 +54,7 @@ integer(SIZE_T) :: type_sized ! Size of the double prec
integer(SIZE_T) :: type_sizer ! Size of the real datatype
integer(HID_T) :: type_id_c ! Memory datatype identifier (for character field)
integer(SIZE_T) :: offset ! Member's offset
-integer(HSIZE_T) :: start ! start record
+integer(HSIZE_T) :: start = 0 ! start record
integer, dimension(nrecords) :: bufi ! Data buffer
integer, dimension(nrecords) :: bufir ! Data buffer
real, dimension(nrecords) :: bufr ! Data buffer
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index a2b8172..4d5ce75 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -535,10 +535,7 @@ herr_t H5IMlink_palette( hid_t loc_id,
hobj_ref_t *refbuf; /* buffer to read references */
hssize_t n_refs;
hsize_t dim_ref;
- int ok_pal, has_pal;
-
- /* Try to find the palette dataset */
- has_pal = H5LTfind_dataset( loc_id, pal_name );
+ int ok_pal;
/* The image dataset may or not have the attribute "PALETTE"
* First we try to open to see if it is already there; if not, it is created.
@@ -888,7 +885,6 @@ herr_t H5IMget_palette_info( hid_t loc_id,
hsize_t dim_ref;
hobj_ref_t *refbuf; /* buffer to read references */
hid_t pal_id;
- int rank;
hid_t pal_space_id;
hsize_t pal_maxdims[2];
@@ -938,7 +934,7 @@ herr_t H5IMget_palette_info( hid_t loc_id,
if ( (pal_space_id = H5Dget_space( pal_id )) < 0 )
goto out;
- if ( (rank = H5Sget_simple_extent_ndims( pal_space_id )) < 0 )
+ if ( H5Sget_simple_extent_ndims( pal_space_id ) < 0 )
goto out;
if ( H5Sget_simple_extent_dims( pal_space_id, pal_dims, pal_maxdims ) < 0 )
@@ -1114,7 +1110,6 @@ herr_t H5IMis_image( hid_t loc_id,
int has_class;
hid_t attr_type;
hid_t attr_id;
- hid_t attr_class;
char attr_data[20];
herr_t ret;
@@ -1143,7 +1138,7 @@ herr_t H5IMis_image( hid_t loc_id,
if ( (attr_type = H5Aget_type( attr_id )) < 0 )
goto out;
- if ( (attr_class = H5Tget_class( attr_type )) < 0 )
+ if ( H5Tget_class( attr_type ) < 0 )
goto out;
if ( H5Aread( attr_id, attr_type, attr_data ) < 0 )
@@ -1203,7 +1198,6 @@ herr_t H5IMis_palette( hid_t loc_id,
int has_class;
hid_t attr_type;
hid_t attr_id;
- hid_t attr_class;
char attr_data[20];
herr_t ret;
@@ -1232,7 +1226,7 @@ herr_t H5IMis_palette( hid_t loc_id,
if ( (attr_type = H5Aget_type( attr_id )) < 0 )
goto out;
- if ( (attr_class = H5Tget_class( attr_type )) < 0 )
+ if ( H5Tget_class( attr_type ) < 0 )
goto out;
if ( H5Aread( attr_id, attr_type, attr_data ) < 0 )
diff --git a/hl/src/H5TA.c b/hl/src/H5TA.c
index 79a845b..f90819c 100644
--- a/hl/src/H5TA.c
+++ b/hl/src/H5TA.c
@@ -305,10 +305,9 @@ herr_t H5TBappend_records( hid_t loc_id,
hid_t tid=-1;
hid_t mem_type_id=-1;
hsize_t count[1];
- hssize_t offset[1];
+ hsize_t offset[1];
hid_t sid=-1;
hid_t mem_space_id=-1;
- int rank;
hsize_t dims[1];
hsize_t mem_dims[1];
hsize_t nrecords_orig;
@@ -346,7 +345,7 @@ herr_t H5TBappend_records( hid_t loc_id,
return -1;
/* Get the dimensions */
- if ( (rank = H5Sget_simple_extent_dims( sid, dims, NULL )) != 1 )
+ if ( H5Sget_simple_extent_dims( sid, dims, NULL ) != 1 )
goto out;
/* Define a hyperslab in the dataset */
@@ -426,7 +425,7 @@ herr_t H5TBwrite_records( hid_t loc_id,
hid_t did;
hid_t tid;
hsize_t count[1];
- hssize_t offset[1];
+ hsize_t offset[1];
hid_t sid=-1;
hid_t mem_space_id=-1;
hsize_t mem_size[1];
@@ -540,7 +539,7 @@ herr_t H5TBwrite_fields_name( hid_t loc_id,
hid_t member_type_id;
hid_t nmtype_id;
hsize_t count[1];
- hssize_t offset[1];
+ hsize_t offset[1];
hid_t sid=-1;
char *member_name;
hssize_t nfields;
@@ -710,10 +709,9 @@ herr_t H5TBwrite_fields_index( hid_t loc_id,
hid_t member_type_id;
hid_t nmtype_id;
hsize_t count[1];
- hssize_t offset[1];
+ hsize_t offset[1];
hid_t sid=-1;
char *member_name;
- int nmenbers;
hsize_t i, j;
hid_t PRESERVE;
size_t size_native;
@@ -733,7 +731,7 @@ herr_t H5TBwrite_fields_index( hid_t loc_id,
goto out;
/* Get the number of fields */
- if ( ( nmenbers = H5Tget_nmembers( tid )) < 0 )
+ if ( H5Tget_nmembers( tid ) < 0 )
goto out;
/* Create a write id */
@@ -954,7 +952,7 @@ herr_t H5TBread_records( hid_t loc_id,
hid_t ftype_id;
hid_t mem_type_id=-1;
hsize_t count[1];
- hssize_t offset[1];
+ hsize_t offset[1];
hid_t sid=-1;
hsize_t dims[1];
hid_t mem_space_id=-1;
@@ -1071,7 +1069,7 @@ herr_t H5TBread_fields_name( hid_t loc_id,
char *member_name;
hssize_t nfields;
hsize_t count[1];
- hssize_t offset[1];
+ hsize_t offset[1];
hid_t sid=-1;
hid_t mem_space_id=-1;
hsize_t mem_size[1];
@@ -1224,10 +1222,9 @@ herr_t H5TBread_fields_index( hid_t loc_id,
hid_t read_type_id=-1;
hid_t member_type_id;
hid_t nmtype_id;
- hssize_t member_size;
char *member_name;
hsize_t count[1];
- hssize_t offset[1];
+ hsize_t offset[1];
hid_t sid=-1;
hid_t mem_space_id=-1;
hsize_t mem_size[1];
@@ -1259,7 +1256,7 @@ herr_t H5TBread_fields_index( hid_t loc_id,
goto out;
/* Get the member size */
- if ( ( member_size = H5Tget_size( member_type_id )) < 0 )
+ if ( H5Tget_size( member_type_id ) == 0 )
goto out;
/* Convert to native type */
@@ -1387,7 +1384,7 @@ herr_t H5TBdelete_record( hid_t loc_id,
hid_t did;
hid_t tid;
hsize_t count[1];
- hssize_t offset[1];
+ hsize_t offset[1];
hid_t sid;
hid_t mem_space_id;
hsize_t mem_size[1];
@@ -1558,7 +1555,7 @@ herr_t H5TBinsert_record( hid_t loc_id,
hid_t tid=-1;
hid_t mem_type_id=-1;
hsize_t count[1];
- hssize_t offset[1];
+ hsize_t offset[1];
hid_t sid=-1;
hid_t mem_space_id=-1;
hsize_t dims[1];
@@ -1719,10 +1716,10 @@ herr_t H5TBadd_records_from( hid_t loc_id,
hid_t type_id1;
hid_t space_id1=-1;
hid_t mem_space_id1=-1;
- hssize_t type_size1;
+ size_t type_size1;
hsize_t count[1];
- hssize_t offset[1];
+ hsize_t offset[1];
hsize_t mem_size[1];
hsize_t nfields;
hsize_t ntotal_records;
@@ -1768,10 +1765,10 @@ herr_t H5TBadd_records_from( hid_t loc_id,
goto out;
/* Get the size of the datatype */
- if ( ( type_size1 = H5Tget_size( type_id1 )) < 0 )
+ if ( ( type_size1 = H5Tget_size( type_id1 )) == 0 )
goto out;
- tmp_buf = (unsigned char *)calloc((size_t)nrecords, (size_t)type_size1 );
+ tmp_buf = (unsigned char *)calloc((size_t)nrecords, type_size1 );
/* Define a hyperslab in the dataset of the size of the records */
offset[0] = start1;
@@ -1877,7 +1874,7 @@ herr_t H5TBcombine_tables( hid_t loc_id1,
hid_t plist_id3;
hsize_t count[1];
- hssize_t offset[1];
+ hsize_t offset[1];
hid_t mem_space_id;
hsize_t mem_size[1];
hsize_t nfields;
@@ -1889,7 +1886,7 @@ herr_t H5TBcombine_tables( hid_t loc_id1,
size_t type_size;
hid_t sid;
hid_t member_type_id;
- hssize_t member_offset;
+ size_t member_offset;
char attr_name[255];
hid_t attr_id;
char aux[255];
@@ -2012,8 +2009,7 @@ herr_t H5TBcombine_tables( hid_t loc_id1,
goto out;
/* Get the member offset */
- if ( ( member_offset = H5Tget_member_offset( type_id3, (unsigned) i )) < 0 )
- goto out;
+ member_offset = H5Tget_member_offset( type_id3, (unsigned) i );
strcpy( attr_name, "FIELD_" );
sprintf( aux, "%d", (int) i );
@@ -2260,15 +2256,14 @@ herr_t H5TBinsert_field( hid_t loc_id,
size_t member_size;
size_t new_member_size = 0;
char *member_name;
- hssize_t total_size;
+ size_t total_size;
hsize_t nfields;
hsize_t nrecords;
- int rank_chunk;
hsize_t dims_chunk[1];
hsize_t dims[1];
hsize_t maxdims[1] = { H5S_UNLIMITED };
hsize_t count[1];
- hssize_t offset[1];
+ hsize_t offset[1];
hsize_t mem_size[1];
hid_t write_type_id;
hid_t PRESERVE;
@@ -2276,7 +2271,7 @@ herr_t H5TBinsert_field( hid_t loc_id,
int inserted;
hsize_t idx;
char table_title[255];
- hssize_t member_offset;
+ size_t member_offset;
char attr_name[255];
hid_t attr_id;
char aux[255];
@@ -2306,7 +2301,7 @@ herr_t H5TBinsert_field( hid_t loc_id,
goto out;
/* Get the size of the datatype */
- if ( ( total_size = H5Tget_size( type_id1 )) < 0 )
+ if ( ( total_size = H5Tget_size( type_id1 )) == 0 )
goto out;
/* Get the dataspace handle */
@@ -2327,7 +2322,7 @@ herr_t H5TBinsert_field( hid_t loc_id,
goto out;
/* alloc fill value attribute buffer */
- tmp_fill_buf = (unsigned char *)malloc((size_t) total_size );
+ tmp_fill_buf = (unsigned char *)malloc(total_size );
/* Get the fill value attributes */
if ( (H5TBAget_fill( loc_id, dset_name, dataset_id1, tmp_fill_buf )) < 0 )
@@ -2405,7 +2400,7 @@ herr_t H5TBinsert_field( hid_t loc_id,
*/
/* Retrieve the size of chunk */
- if ( ( rank_chunk = H5Pget_chunk( plist_id1, 1, dims_chunk )) < 0 )
+ if ( H5Pget_chunk( plist_id1, 1, dims_chunk ) < 0 )
goto out;
/* Create a new simple data space with unlimited size, using the dimension */
@@ -2593,8 +2588,7 @@ herr_t H5TBinsert_field( hid_t loc_id,
goto out;
/* Get the member offset */
- if ( ( member_offset = H5Tget_member_offset( type_id1, (unsigned) i )) < 0 )
- goto out;
+ member_offset = H5Tget_member_offset( type_id1, (unsigned) i );
strcpy( attr_name, "FIELD_" );
sprintf( aux, "%d", (int)i );
@@ -2714,7 +2708,6 @@ herr_t H5TBdelete_field( hid_t loc_id,
size_t type_size2;
hsize_t nfields;
hsize_t nrecords;
- int rank_chunk;
hsize_t dims_chunk[1];
hsize_t dims[1];
hsize_t maxdims[1] = { H5S_UNLIMITED };
@@ -2892,7 +2885,7 @@ herr_t H5TBdelete_field( hid_t loc_id,
*/
/* Retrieve the size of chunk */
- if ( ( rank_chunk = H5Pget_chunk( plist_id1, 1, dims_chunk )) < 0 )
+ if ( H5Pget_chunk( plist_id1, 1, dims_chunk ) < 0 )
goto out;
/* Create a new simple data space with unlimited size, using the dimension */
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index d47cab1..c01dd0d 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -31,15 +31,12 @@ unsigned char image_out2[ WIDTH*HEIGHT*3 ];
int main( void )
{
hid_t file_id;
- herr_t status;
hsize_t width, height, planes;
hsize_t pal_dims[] = {9,3};
hsize_t pal_dims_out[2];
hsize_t i;
char interlace[20];
hssize_t npals;
- herr_t is_image;
- herr_t is_palette;
unsigned char pal_data_out[9*3];
/* create a 9 entry grey palette */
@@ -165,10 +162,10 @@ int main( void )
*-------------------------------------------------------------------------
*/
- if ( (is_image = H5IMis_image( file_id, "Image1" )) < 0 )
+ if ( H5IMis_image( file_id, "Image1" ) < 0 )
goto out;
- if ( (is_image = H5IMis_image( file_id, "Image2" )) < 0 )
+ if ( H5IMis_image( file_id, "Image2" ) < 0 )
goto out;
/*-------------------------------------------------------------------------
@@ -176,7 +173,7 @@ int main( void )
*-------------------------------------------------------------------------
*/
- if ( (is_palette = H5IMis_palette( file_id, "Pallete" )) < 0 )
+ if ( H5IMis_palette( file_id, "Pallete" ) < 0 )
goto out;
/*-------------------------------------------------------------------------
@@ -185,7 +182,7 @@ int main( void )
*/
/* Close the file. */
- status = H5Fclose( file_id );
+ if(H5Fclose( file_id ) < 0) goto out;
PASSED();
return 0;
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
index b791fe1..57b3791 100644
--- a/hl/test/test_table.c
+++ b/hl/test/test_table.c
@@ -934,9 +934,9 @@ int test_table(hid_t fid, int write)
rbuf[i].longi != position_in[i].longi ||
rbuf[i].pressure != pressure_in[i] )
{
- fprintf(stderr,"%d %f %d\n",
+ fprintf(stderr,"%ld %f %d\n",
rbuf[i].longi,rbuf[i].pressure,rbuf[i].lati);
- fprintf(stderr,"%d %f %d\n",
+ fprintf(stderr,"%ld %f %d\n",
position_in[i].longi,pressure_in[i],position_in[i].lati);
goto out;
}
@@ -1560,9 +1560,9 @@ static int cmp_par(hsize_t i, hsize_t j, particle_t *rbuf, particle_t *wbuf )
rbuf[i].pressure != wbuf[j].pressure ||
rbuf[i].temperature != wbuf[j].temperature ) {
fprintf(stderr,"read and write buffers have differences\n");
- fprintf(stderr,"%s %d %f %f %d\n",
+ fprintf(stderr,"%s %ld %f %f %d\n",
rbuf[i].name,rbuf[i].longi,rbuf[i].pressure,rbuf[i].temperature,rbuf[i].lati);
- fprintf(stderr,"%s %d %f %f %d\n",
+ fprintf(stderr,"%s %ld %f %f %d\n",
wbuf[j].name,wbuf[j].longi,wbuf[j].pressure,wbuf[j].temperature,wbuf[j].lati);
return -1;
}
generated by cgit v0.12 at 2024-07-08 14:35:06 (GMT)