summaryrefslogtreecommitdiffstats
path: root/tools/lib/h5diff_attr.c
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-09-13 21:11:30 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-09-13 21:11:30 (GMT)
commita8c63e28d570c1eea5a23b9ed684efb4cd24e3ba (patch)
treea501ac6a79670c132cad11386a819ffaea570945 /tools/lib/h5diff_attr.c
parent3c021d3a7775df18247de19cee3805178cd2666c (diff)
downloadhdf5-a8c63e28d570c1eea5a23b9ed684efb4cd24e3ba.zip
hdf5-a8c63e28d570c1eea5a23b9ed684efb4cd24e3ba.tar.gz
hdf5-a8c63e28d570c1eea5a23b9ed684efb4cd24e3ba.tar.bz2
[svn-r24138] Cast constants to specified type.
Cast smaller vars to larger type. Cast calculation result to correct type. Changed int member to hbool_t Tested: local linux
Diffstat (limited to 'tools/lib/h5diff_attr.c')
-rw-r--r--tools/lib/h5diff_attr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index ef1d761..44b623f 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -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;