diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2015-10-13 09:33:03 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2015-10-13 09:33:03 (GMT) |
commit | b767c1a0ae221b4d39cead548bd26a229a8529c9 (patch) | |
tree | 452bd065fea24fa0b3d0bbfe5d26f61812bb8948 /tools | |
parent | 76ff9fa1d25f2f060b6ef620a9c6d1a1652c6fa8 (diff) | |
download | hdf5-b767c1a0ae221b4d39cead548bd26a229a8529c9.zip hdf5-b767c1a0ae221b4d39cead548bd26a229a8529c9.tar.gz hdf5-b767c1a0ae221b4d39cead548bd26a229a8529c9.tar.bz2 |
[svn-r28049] Merge of r27997-28047 from the trunk.
Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) gcc 4.9.2
serial w/ Fortran and C++
parallel (MPICH 3.1.4) w/ Fortran
Diffstat (limited to 'tools')
-rw-r--r-- | tools/lib/h5diff_attr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index 6474082..190343b 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -334,8 +334,8 @@ hsize_t diff_attr(hid_t loc1_id, size_t msize2; /* memory size of memory type */ void *buf1=NULL; /* data buffer */ void *buf2=NULL; /* data buffer */ - int buf1hasdata=0; /* buffer has data */ - int buf2hasdata=0; /* buffer has data */ + hbool_t buf1hasdata=FALSE; /* buffer has data */ + hbool_t buf2hasdata=FALSE; /* buffer has data */ hsize_t nelmts1; /* number of elements in dataset */ int rank1; /* rank of dataset */ int rank2; /* rank of dataset */ @@ -472,12 +472,12 @@ hsize_t diff_attr(hid_t loc1_id, parallel_print("Failed reading attribute1 %s/%s\n", path1, name1); goto error; }else - buf1hasdata = 1; + buf1hasdata = TRUE; if(H5Aread(attr2_id,mtype2_id,buf2) < 0){ parallel_print("Failed reading attribute2 %s/%s\n", path2, name2); goto error; }else - buf2hasdata = 1; + buf2hasdata = TRUE; /* format output string */ HDsnprintf(np1, sizeof(np1), "%s of <%s>", name1, path1); |