From 611b8dbb8a7bcf6a31a49d1f87b88bacbc377baa Mon Sep 17 00:00:00 2001
From: Pedro Vicente Nunes <pvn@hdfgroup.org>
Date: Mon, 26 Feb 2007 15:42:07 -0500
Subject: [svn-r13396] Bug fix: Some output was being printed in quiet mode

---
 tools/lib/h5diff_array.c | 474 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 309 insertions(+), 165 deletions(-)

diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 3467116..242cae7 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -851,9 +851,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -878,9 +881,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,ABS(temp1_char-temp2_char));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -944,9 +950,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -971,9 +980,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,PDIFF(temp1_uchar,temp2_uchar));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1039,9 +1051,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1066,9 +1081,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,ABS(temp1_short-temp2_short));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1135,10 +1153,13 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
-                  PDIFF(temp1_ushort,temp2_ushort));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
+                      PDIFF(temp1_ushort,temp2_ushort));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1163,9 +1184,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,PDIFF(temp1_ushort,temp2_ushort));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1230,9 +1254,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1257,9 +1284,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,ABS(temp1_int-temp2_int));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1324,9 +1354,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1351,9 +1384,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1418,10 +1454,13 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
-                  ABS(temp1_long-temp2_long));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
+                      ABS(temp1_long-temp2_long));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1446,9 +1485,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,ABS(temp1_long-temp2_long));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1514,9 +1556,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1541,9 +1586,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1609,9 +1657,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1636,9 +1687,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1705,9 +1759,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1735,9 +1792,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1810,9 +1870,12 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,ABS(temp1_float-temp2_float));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,ABS(temp1_float-temp2_float));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1841,10 +1904,13 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
-                  ABS(temp1_float-temp2_float));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
+                      ABS(temp1_float-temp2_float));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1914,10 +1980,13 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                  ABS(temp1_double-temp2_double));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                      ABS(temp1_double-temp2_double));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -1947,10 +2016,13 @@ hsize_t diff_datum(void       *_mem1,
           
           if (not_comparable && !both_zero) /* not comparable */
           {
-              print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
-              parallel_print(SPACES);
-              parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                  ABS(temp1_double-temp2_double));
+              if ( print_data(options) )
+              {
+                  print_pos(ph,1,i,acc,pos,rank,dims,obj1,obj2);
+                  parallel_print(SPACES);
+                  parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                      ABS(temp1_double-temp2_double));
+              }
               options->not_cmp=1;
               nfound++;
           }
@@ -2498,10 +2570,13 @@ hsize_t diff_float(unsigned char *mem1,
             
             if (not_comparable && !both_zero) /* not comparable */
             {
-                print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                parallel_print(SPACES);
-                parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
-                    ABS(temp1_float-temp2_float));
+                if ( print_data(options) )
+                {
+                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
+                        ABS(temp1_float-temp2_float));
+                }
                 options->not_cmp=1;
                 nfound++;
             }
@@ -2540,10 +2615,13 @@ hsize_t diff_float(unsigned char *mem1,
             
             if (not_comparable && !both_zero) /* not comparable */
             {
-                print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                parallel_print(SPACES);
-                parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
-                    ABS(temp1_float-temp2_float));
+                if ( print_data(options) )
+                {
+                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT_P_NOTCOMP,temp1_float,temp2_float,
+                        ABS(temp1_float-temp2_float));
+                }
                 options->not_cmp=1;
                 nfound++;
             }
@@ -2670,10 +2748,13 @@ hsize_t diff_double(unsigned char *mem1,
             
             if (not_comparable && !both_zero) /* not comparable */
             {
-                print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                parallel_print(SPACES);
-                parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                    ABS(temp1_double-temp2_double));
+                if ( print_data(options) )
+                {
+                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                        ABS(temp1_double-temp2_double));
+                }
                 options->not_cmp=1;
                 nfound++;
             }
@@ -2712,10 +2793,13 @@ hsize_t diff_double(unsigned char *mem1,
             
             if (not_comparable && !both_zero) /* not comparable */
             {
-                print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-                parallel_print(SPACES);
-                parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
-                    ABS(temp1_double-temp2_double));
+                if ( print_data(options) )
+                {
+                    print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                    parallel_print(SPACES);
+                    parallel_print(F_FORMAT_P_NOTCOMP,temp1_double,temp2_double,
+                        ABS(temp1_double-temp2_double));
+                }
                 options->not_cmp=1;
                 nfound++;
             }
@@ -2840,10 +2924,13 @@ hsize_t diff_schar(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,
-                 ABS(temp1_char-temp2_char));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,
+                     ABS(temp1_char-temp2_char));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -2882,10 +2969,13 @@ hsize_t diff_schar(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,
-                 ABS(temp1_char-temp2_char));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(I_FORMAT_P_NOTCOMP,temp1_char,temp2_char,
+                     ABS(temp1_char-temp2_char));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -3014,10 +3104,13 @@ hsize_t diff_uchar(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,
-                 PDIFF(temp1_uchar,temp2_uchar));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,
+                     PDIFF(temp1_uchar,temp2_uchar));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -3056,10 +3149,13 @@ hsize_t diff_uchar(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,
-                 PDIFF(temp1_uchar,temp2_uchar));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(I_FORMAT_P_NOTCOMP,temp1_uchar,temp2_uchar,
+                     PDIFF(temp1_uchar,temp2_uchar));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -3185,10 +3281,13 @@ hsize_t diff_short(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,
-                 ABS(temp1_short-temp2_short));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,
+                     ABS(temp1_short-temp2_short));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -3229,10 +3328,13 @@ hsize_t diff_short(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,
-                 ABS(temp1_short-temp2_short));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(I_FORMAT_P_NOTCOMP,temp1_short,temp2_short,
+                     ABS(temp1_short-temp2_short));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -3359,10 +3461,13 @@ hsize_t diff_ushort(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
-                 PDIFF(temp1_ushort,temp2_ushort));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
+                     PDIFF(temp1_ushort,temp2_ushort));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -3403,10 +3508,13 @@ hsize_t diff_ushort(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
-                 PDIFF(temp1_ushort,temp2_ushort));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(I_FORMAT_P_NOTCOMP,temp1_ushort,temp2_ushort,
+                     PDIFF(temp1_ushort,temp2_ushort));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -3534,10 +3642,13 @@ hsize_t diff_int(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,
-                 ABS(temp1_int-temp2_int));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,
+                     ABS(temp1_int-temp2_int));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -3578,10 +3689,13 @@ hsize_t diff_int(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,
-                 ABS(temp1_int-temp2_int));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(I_FORMAT_P_NOTCOMP,temp1_int,temp2_int,
+                     ABS(temp1_int-temp2_int));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -3709,9 +3823,12 @@ hsize_t diff_uint(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -3752,9 +3869,12 @@ hsize_t diff_uint(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(I_FORMAT_P_NOTCOMP,temp1_uint,temp2_uint,PDIFF(temp1_uint,temp2_uint));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -3885,10 +4005,13 @@ hsize_t diff_long(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
-                 ABS(temp1_long-temp2_long));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
+                     ABS(temp1_long-temp2_long));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -3929,10 +4052,13 @@ hsize_t diff_long(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
-                 ABS(temp1_long-temp2_long));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(LI_FORMAT_P_NOTCOMP,temp1_long,temp2_long,
+                     ABS(temp1_long-temp2_long));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -4067,9 +4193,12 @@ hsize_t diff_ulong(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -4110,9 +4239,12 @@ hsize_t diff_ulong(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(ULI_FORMAT_P_NOTCOMP,temp1_ulong,temp2_ulong,PDIFF(temp1_ulong,temp2_ulong));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -4240,9 +4372,12 @@ hsize_t diff_llong(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -4281,9 +4416,12 @@ hsize_t diff_llong(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(LLI_FORMAT_P_NOTCOMP,temp1_llong,temp2_llong,ABS(temp1_llong-temp2_llong));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -4412,9 +4550,12 @@ hsize_t diff_ullong(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+             }
              options->not_cmp=1;
              nfound++;
          }
@@ -4455,9 +4596,12 @@ hsize_t diff_ullong(unsigned char *mem1,
          
          if (not_comparable && !both_zero) /* not comparable */
          {
-             print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
-             parallel_print(SPACES);
-             parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+             if ( print_data(options) )
+             {
+                 print_pos(ph,1,hyper_start+i,acc,pos,rank,dims,obj1,obj2);
+                 parallel_print(SPACES);
+                 parallel_print(ULLI_FORMAT_P_NOTCOMP,temp1_ullong,temp2_ullong,PDIFF(temp1_ullong,temp2_ullong));
+             }
              options->not_cmp=1;
              nfound++;
          }
-- 
cgit v0.12