summaryrefslogtreecommitdiffstats
path: root/tools/lib/h5diff_array.c
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2007-02-21 20:05:04 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2007-02-21 20:05:04 (GMT)
commit67f5810d8452df6c13ead8056851c390f0d12235 (patch)
tree9b0293cbfa5b08eb0f20756d794a906dc4aec605 /tools/lib/h5diff_array.c
parent1e07756ac265fad1171cd18efcdb2b0ba9bb903d (diff)
downloadhdf5-67f5810d8452df6c13ead8056851c390f0d12235.zip
hdf5-67f5810d8452df6c13ead8056851c390f0d12235.tar.gz
hdf5-67f5810d8452df6c13ead8056851c390f0d12235.tar.bz2
[svn-r13368]
Added a little format alignment to the printing of dimensions
Diffstat (limited to 'tools/lib/h5diff_array.c')
-rw-r--r--tools/lib/h5diff_array.c90
1 files changed, 48 insertions, 42 deletions
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index bf26370..3467116 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -152,6 +152,7 @@ int print_data(diff_opt_t *options)
*
*-------------------------------------------------------------------------
*/
+
static
void print_pos( int *ph, /* print header */
int pp, /* print percentage */
@@ -163,47 +164,53 @@ void print_pos( int *ph, /* print header */
const char *obj1,
const char *obj2 )
{
- int i;
-
- /* print header */
- if ( *ph==1 )
- {
- *ph=0;
-
- if (pp)
- {
- parallel_print("%-15s %-15s %-15s %-15s %-15s\n",
- "position",
- (obj1!=NULL) ? obj1 : " ",
- (obj2!=NULL) ? obj2 : " ",
- "difference",
- "relative");
- parallel_print("------------------------------------------------------------------------\n");
- }
- else
- {
- parallel_print("%-15s %-15s %-15s %-20s\n",
- "position",
- (obj1!=NULL) ? obj1 : " ",
- (obj2!=NULL) ? obj2 : " ",
- "difference");
- parallel_print("------------------------------------------------------------\n");
- }
- }
-
- for ( i = 0; i < rank; i++)
- {
- pos[i] = curr_pos/acc[i];
- curr_pos -= acc[i]*pos[i];
- }
- assert( curr_pos == 0 );
+ int i;
+
+ /* print header */
+ if ( *ph==1 )
+ {
+ *ph=0;
- parallel_print("[ " );
- for ( i = 0; i < rank; i++)
- {
- parallel_print("%"H5_PRINTF_LL_WIDTH"u ", (unsigned long_long)pos[i]);
- }
- parallel_print("]" );
+ parallel_print("%-16s","size:");
+ print_dimensions (rank,dims);
+ parallel_print("%-11s","");
+ print_dimensions (rank,dims);
+ parallel_print("\n");
+
+ if (pp)
+ {
+ parallel_print("%-15s %-15s %-15s %-15s %-15s\n",
+ "position",
+ (obj1!=NULL) ? obj1 : " ",
+ (obj2!=NULL) ? obj2 : " ",
+ "difference",
+ "relative");
+ parallel_print("------------------------------------------------------------------------\n");
+ }
+ else
+ {
+ parallel_print("%-15s %-15s %-15s %-20s\n",
+ "position",
+ (obj1!=NULL) ? obj1 : " ",
+ (obj2!=NULL) ? obj2 : " ",
+ "difference");
+ parallel_print("------------------------------------------------------------\n");
+ }
+ } /* end print header */
+
+ for ( i = 0; i < rank; i++)
+ {
+ pos[i] = curr_pos/acc[i];
+ curr_pos -= acc[i]*pos[i];
+ }
+ assert( curr_pos == 0 );
+
+ parallel_print("[ " );
+ for ( i = 0; i < rank; i++)
+ {
+ parallel_print("%"H5_PRINTF_LL_WIDTH"u ", (unsigned long_long)pos[i]);
+ }
+ parallel_print("]" );
}
@@ -789,8 +796,7 @@ hsize_t diff_datum(void *_mem1,
obj2_id,
NULL,
NULL,
- options,
- 0);
+ options);
break;
default:
parallel_print("Warning: Comparison not possible of object types referenced: <%s> and <%s>",