diff options
author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-10-15 16:10:15 (GMT) |
---|---|---|
committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-10-15 16:10:15 (GMT) |
commit | b353fb8b5a51f8ba853df9512d7ab57e66f86395 (patch) | |
tree | be5b09a1593920153b1cbd1e14ae6a00d1f342ce /tools/lib/h5diff.c | |
parent | 122b938cbf1a48a384cda69b0943489afa0f2dca (diff) | |
download | hdf5-b353fb8b5a51f8ba853df9512d7ab57e66f86395.zip hdf5-b353fb8b5a51f8ba853df9512d7ab57e66f86395.tar.gz hdf5-b353fb8b5a51f8ba853df9512d7ab57e66f86395.tar.bz2 |
[svn-r15871] Eliminate -c option and make that behavior the default and return 2 instead of -1 on error status
Tested: windows, linux
Diffstat (limited to 'tools/lib/h5diff.c')
-rw-r--r-- | tools/lib/h5diff.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 0022860..bfd580d 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -442,33 +442,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 *------------------------------------------------------------------------- |