mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r24138] Cast constants to specified type.

Browse Source 
Cast smaller vars to larger type.
Cast calculation result to correct type.
Changed int member to hbool_t

Tested: local linux
This commit is contained in:
Allen Byrne 2013-09-13 16:11:30 -05:00
parent 3c021d3a77
commit a8c63e28d5
6 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/h5diff/h5diff_common.c
View File

@ -15,6 +15,7 @@
#include <stdlib.h>
#include <string.h>
#include "H5private.h"
#include "h5diff.h"
#include "h5diff_common.h"
#include "h5tools.h"
@ -135,7 +136,7 @@ void parse_command_line(int argc,
options->m_verbose_level = 0;
break;
}
else if (!strncmp (argv[i], "-v", 2))
else if (!strncmp (argv[i], "-v", (size_t)2))
{
options->m_verbose_level = atoi(&argv[i][2]);
break;
@ -149,7 +150,7 @@ void parse_command_line(int argc,
options->m_verbose_level = 0;
break;
}
else if ( !strncmp (argv[i], "--verbose", 9) && argv[i][9]=='=')
else if ( !strncmp (argv[i], "--verbose", (size_t)9) && argv[i][9]=='=')
{
options->m_verbose_level = atoi(&argv[i][10]);
break;
@ -164,7 +165,7 @@ void parse_command_line(int argc,
options->m_report = 1;
break;
case 'l':
options->follow_links = 1;
options->follow_links = TRUE;
break;
case 'x':
options->no_dangle_links = 1;

14
tools/lib/h5diff.c
View File

@ -839,10 +839,10 @@ hsize_t h5diff(const char *fname1,
{
h5difftrace("h5diff no object specified\n");
/* set root group */
obj1fullname = (char*)HDcalloc(2, sizeof(char));
obj1fullname = (char*)HDcalloc((size_t)2, sizeof(char));
HDstrcat(obj1fullname, "/");
obj1type = H5TRAV_TYPE_GROUP;
obj2fullname = (char*)HDcalloc(2, sizeof(char));
obj2fullname = (char*)HDcalloc((size_t)2, sizeof(char));
HDstrcat(obj2fullname, "/");
obj2type = H5TRAV_TYPE_GROUP;
}
@ -1554,9 +1554,9 @@ hsize_t diff(hid_t file1_id,
hid_t grp1_id = (-1);
hid_t grp2_id = (-1);
int ret;
int is_dangle_link1 = 0;
int is_dangle_link2 = 0;
int is_hard_link = 0;
hbool_t is_dangle_link1 = FALSE;
hbool_t is_dangle_link2 = FALSE;
hbool_t is_hard_link = FALSE;
hsize_t nfound = 0;
h5trav_type_t object_type;
@ -1598,7 +1598,7 @@ hsize_t diff(hid_t file1_id,
goto out;
}
else
is_dangle_link1 = 1;
is_dangle_link1 = TRUE;
}
else if (ret < 0)
goto out;
@ -1616,7 +1616,7 @@ hsize_t diff(hid_t file1_id,
goto out;
}
else
is_dangle_link2 = 1;
is_dangle_link2 = TRUE;
}
else if (ret < 0)
goto out;

2
tools/lib/h5diff.h
View File

@ -71,7 +71,7 @@ typedef struct {
double percent; /* relative error value */
int n; /* count, compare up to count */
hsize_t count; /* count value */
int follow_links; /* follow symbolic links */
hbool_t follow_links; /* follow symbolic links */
int no_dangle_links; /* return error when find dangling link */
int err_stat; /* an error ocurred (1, error, 0, no error) */
int cmn_objs; /* do we have common objects */

10
tools/lib/h5diff_array.c
View File

@ -5792,14 +5792,14 @@ int ull2float(unsigned long long ull_value, float *f_value)
src_size = H5Tget_size(H5T_NATIVE_ULLONG);
dst_size = H5Tget_size(H5T_NATIVE_FLOAT);
buf = (unsigned char*)HDcalloc(1, MAX(src_size, dst_size));
buf = (unsigned char*)HDcalloc((size_t)1, MAX(src_size, dst_size));
if(!buf)
goto error;
HDmemcpy(buf, &ull_value, src_size);
/* do conversion */
if(H5Tconvert(H5T_NATIVE_ULLONG, H5T_NATIVE_FLOAT, 1, buf, NULL, dxpl_id)<0)
if(H5Tconvert(H5T_NATIVE_ULLONG, H5T_NATIVE_FLOAT, (size_t)1, buf, NULL, dxpl_id)<0)
goto error;
HDmemcpy(f_value, buf, dst_size);
@ -6358,9 +6358,9 @@ static void get_member_types(hid_t tid, mcomp_t *members)
return;
members->n = (unsigned)nmembs;
members->ids = (hid_t *)HDcalloc(members->n, sizeof(hid_t));
members->offsets = (size_t *)HDcalloc(members->n, sizeof(size_t));
members->m = (mcomp_t **)HDcalloc(members->n, sizeof(mcomp_t *));
members->ids = (hid_t *)HDcalloc((size_t)members->n, sizeof(hid_t));
members->offsets = (size_t *)HDcalloc((size_t)members->n, sizeof(size_t));
members->m = (mcomp_t **)HDcalloc((size_t)members->n, sizeof(mcomp_t *));
for(u = 0; u < members->n; u++)
{

12
tools/lib/h5diff_attr.c
View File

@ -169,7 +169,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
if((attr1_id = H5Aopen_by_idx(loc1_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto error;
/* get name */
if(H5Aget_name(attr1_id, ATTR_NAME_MAX, name1) < 0)
if(H5Aget_name(attr1_id, (size_t)ATTR_NAME_MAX, name1) < 0)
goto error;
/*------------------
@ -177,7 +177,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
if((attr2_id = H5Aopen_by_idx(loc2_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto error;
/* get name */
if(H5Aget_name(attr2_id, ATTR_NAME_MAX, name2) < 0)
if(H5Aget_name(attr2_id, (size_t)ATTR_NAME_MAX, name2) < 0)
goto error;
/* criteria is string compare */
@ -225,7 +225,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
if((attr1_id = H5Aopen_by_idx(loc1_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr1, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto error;
/* get name */
if(H5Aget_name(attr1_id, ATTR_NAME_MAX, name1) < 0)
if(H5Aget_name(attr1_id, (size_t)ATTR_NAME_MAX, name1) < 0)
goto error;
table_attr_mark_exist(infile, name1, table_lp);
@ -247,7 +247,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t
if((attr2_id = H5Aopen_by_idx(loc2_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)curr2, H5P_DEFAULT, H5P_DEFAULT)) < 0)
goto error;
/* get name */
if(H5Aget_name(attr2_id, ATTR_NAME_MAX, name2) < 0)
if(H5Aget_name(attr2_id, (size_t)ATTR_NAME_MAX, name2) < 0)
goto error;
table_attr_mark_exist(infile, name2, table_lp);
@ -447,8 +447,8 @@ hsize_t diff_attr(hid_t loc1_id,
for(j = 0; j < rank1; j++)
nelmts1 *= dims1[j];
buf1 = (void *)HDmalloc((unsigned)(nelmts1 * msize1));
buf2 = (void *)HDmalloc((unsigned)(nelmts1 * msize2));
buf1 = (void *)HDmalloc((size_t)(nelmts1 * msize1));
buf2 = (void *)HDmalloc((size_t)(nelmts1 * msize2));
if(buf1 == NULL || buf2 == NULL) {
parallel_print( "cannot read into memory\n" );
goto error;

2
tools/lib/h5tools_filters.c
View File

@ -62,7 +62,7 @@ int h5tools_canreadf(const char* name, /* object name, serves also as boolean pr
/* check availability of filters */
for(i = 0; i < nfilters; i++)
{
if((filtn = H5Pget_filter2(dcpl_id, (unsigned)i, 0, 0, 0, 0, 0, NULL)) < 0)
if((filtn = H5Pget_filter2(dcpl_id, (unsigned)i, 0, 0, 0, (size_t)0, 0, NULL)) < 0)
return -1;
switch(filtn)