[svn-r12679]

bug fix


the number of atribute differences was not added to the total sum of
differences

2 files changed, 110 insertions, 110 deletions

diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index ef480d2..84c5b42 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -489,7 +489,7 @@ diff (hid_t file1_id,
  *-------------------------------------------------------------------------
  */
   if (path1)
-   nfound = diff_attr(type1_id,type2_id,path1,path2,options);
+   nfound += diff_attr(type1_id,type2_id,path1,path2,options);
 
   if ( H5Tclose(type1_id)<0)
    goto out;
@@ -522,7 +522,7 @@ diff (hid_t file1_id,
   *-------------------------------------------------------------------------
   */
   if (path1)
-   nfound = diff_attr(grp1_id,grp2_id,path1,path2,options);
+   nfound += diff_attr(grp1_id,grp2_id,path1,path2,options);
 
   if ( H5Gclose(grp1_id)<0)
    goto out;
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index 570e4c8..54456fe 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -241,136 +241,136 @@ hsize_t diff_datum(void       *_mem1,
 
 
 hsize_t diff_float(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+    unsigned char *mem2,
+    hsize_t       nelmts,
+    int           rank,
+    hsize_t       *acc,
+    hsize_t       *pos,
+    diff_opt_t    *options,
+    const char    *obj1,
+    const char    *obj2,
+    int           *ph);
 
 hsize_t diff_double(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+    unsigned char *mem2,
+    hsize_t       nelmts,
+    int           rank,
+    hsize_t       *acc,
+    hsize_t       *pos,
+    diff_opt_t    *options,
+    const char    *obj1,
+    const char    *obj2,
+    int           *ph);
 
 hsize_t diff_schar(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+    unsigned char *mem2,
+    hsize_t       nelmts,
+    int           rank,
+    hsize_t       *acc,
+    hsize_t       *pos,
+    diff_opt_t    *options,
+    const char    *obj1,
+    const char    *obj2,
+    int           *ph);
 
 hsize_t diff_uchar(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+    unsigned char *mem2,
+    hsize_t       nelmts,
+    int           rank,
+    hsize_t       *acc,
+    hsize_t       *pos,
+    diff_opt_t    *options,
+    const char    *obj1,
+    const char    *obj2,
+    int           *ph);
 
 hsize_t diff_short(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+    unsigned char *mem2,
+    hsize_t       nelmts,
+    int           rank,
+    hsize_t       *acc,
+    hsize_t       *pos,
+    diff_opt_t    *options,
+    const char    *obj1,
+    const char    *obj2,
+    int           *ph);
 
 hsize_t diff_ushort(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+    unsigned char *mem2,
+    hsize_t       nelmts,
+    int           rank,
+    hsize_t       *acc,
+    hsize_t       *pos,
+    diff_opt_t    *options,
+    const char    *obj1,
+    const char    *obj2,
+    int           *ph);
 
 hsize_t diff_int(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+    unsigned char *mem2,
+    hsize_t       nelmts,
+    int           rank,
+    hsize_t       *acc,
+    hsize_t       *pos,
+    diff_opt_t    *options,
+    const char    *obj1,
+    const char    *obj2,
+    int           *ph);
 
 hsize_t diff_uint(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+    unsigned char *mem2,
+    hsize_t       nelmts,
+    int           rank,
+    hsize_t       *acc,
+    hsize_t       *pos,
+    diff_opt_t    *options,
+    const char    *obj1,
+    const char    *obj2,
+    int           *ph);
 
 hsize_t diff_long(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+    unsigned char *mem2,
+    hsize_t       nelmts,
+    int           rank,
+    hsize_t       *acc,
+    hsize_t       *pos,
+    diff_opt_t    *options,
+    const char    *obj1,
+    const char    *obj2,
+    int           *ph);
 
 hsize_t diff_ulong(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+    unsigned char *mem2,
+    hsize_t       nelmts,
+    int           rank,
+    hsize_t       *acc,
+    hsize_t       *pos,
+    diff_opt_t    *options,
+    const char    *obj1,
+    const char    *obj2,
+    int           *ph);
 
 hsize_t diff_llong(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+    unsigned char *mem2,
+    hsize_t       nelmts,
+    int           rank,
+    hsize_t       *acc,
+    hsize_t       *pos,
+    diff_opt_t    *options,
+    const char    *obj1,
+    const char    *obj2,
+    int           *ph);
 
 hsize_t diff_ullong(unsigned char *mem1,
-	unsigned char *mem2,
-	hsize_t       nelmts,
-	int           rank,
-	hsize_t       *acc,
-	hsize_t       *pos,
-	diff_opt_t    *options,
-	const char    *obj1,
-	const char    *obj2,
-	int           *ph);
+    unsigned char *mem2,
+    hsize_t       nelmts,
+    int           rank,
+    hsize_t       *acc,
+    hsize_t       *pos,
+    diff_opt_t    *options,
+    const char    *obj1,
+    const char    *obj2,
+    int           *ph);