summaryrefslogtreecommitdiffstats
path: root/tools/lib/h5diff.c
diff options
context:
space:
mode:
authorPedro Vicente Nunes <pvn@hdfgroup.org>2008-10-29 19:29:25 (GMT)
committerPedro Vicente Nunes <pvn@hdfgroup.org>2008-10-29 19:29:25 (GMT)
commite636e152ea862cb1cb9da3e0141f32ef5459052f (patch)
tree923d58473c91321fc0c7fe2158460219aca0f5cd /tools/lib/h5diff.c
parentcea8049404760b716944da782355eee9b0d1d914 (diff)
downloadhdf5-e636e152ea862cb1cb9da3e0141f32ef5459052f.zip
hdf5-e636e152ea862cb1cb9da3e0141f32ef5459052f.tar.gz
hdf5-e636e152ea862cb1cb9da3e0141f32ef5459052f.tar.bz2
[svn-r15987] Merge with 1.8 rev 15871
Eliminate -c option and make that behavior the default and return 2 instead of -1 on error status tested: linux
Diffstat (limited to 'tools/lib/h5diff.c')
-rw-r--r--tools/lib/h5diff.c32
1 files changed, 15 insertions, 17 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index f0c6048..df479de 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -450,33 +450,31 @@ hsize_t diff_match(hid_t file1_id,
/*-------------------------------------------------------------------------
- * contents mode. we do an "absolute" compare criteria, the number of objects
+ * the number of objects
* in file1 must be the same as in file2
*-------------------------------------------------------------------------
*/
- if ( options->m_contents )
+
+ /* assume equal contents initially */
+ options->contents = 1;
+
+ /* number of different objects */
+ if ( info1->nused != info2->nused )
{
- /* assume equal contents initially */
- options->contents = 1;
-
- /* number of different objects */
- if ( info1->nused != info2->nused )
+ options->contents = 0;
+ }
+
+
+ for( i = 0; i < table->nobjs; i++)
+ {
+ if( table->objs[i].flags[0] != table->objs[i].flags[1] )
{
options->contents = 0;
}
-
-
- for( i = 0; i < table->nobjs; i++)
- {
- if( table->objs[i].flags[0] != table->objs[i].flags[1] )
- {
- options->contents = 0;
- }
- }
-
}
+
/*-------------------------------------------------------------------------
* do the diff for common objects
*-------------------------------------------------------------------------