diff options
author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-10-16 16:00:37 (GMT) |
---|---|---|
committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2008-10-16 16:00:37 (GMT) |
commit | 12e3697d798113c7f18a7d70abe9bcd1bb002cae (patch) | |
tree | 688c3492a907ba74873d424316573a6e542839c5 /tools | |
parent | b195e33d3ffa08b87af68f49f69e535cc13398d1 (diff) | |
download | hdf5-12e3697d798113c7f18a7d70abe9bcd1bb002cae.zip hdf5-12e3697d798113c7f18a7d70abe9bcd1bb002cae.tar.gz hdf5-12e3697d798113c7f18a7d70abe9bcd1bb002cae.tar.bz2 |
[svn-r15889] When comparing individual objects the file graph is not currently compared, so make h5diff return 0 (no diffrences)
Tested: windows, linux
Diffstat (limited to 'tools')
-rw-r--r-- | tools/h5diff/h5diff_common.c | 3 | ||||
-rw-r--r-- | tools/lib/h5diff.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c index eda96ae..797052c 100644 --- a/tools/h5diff/h5diff_common.c +++ b/tools/h5diff/h5diff_common.c @@ -67,6 +67,9 @@ void parse_command_line(int argc, /* process the command-line */ memset(options, 0, sizeof (diff_opt_t)); + /* assume equal contents initially */ + options->contents = 1; + /* parse command line options */ while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) { diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index bfd580d..5669945 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -446,10 +446,7 @@ hsize_t diff_match(hid_t file1_id, * in file1 must be the same as in file2 *------------------------------------------------------------------------- */ - - /* assume equal contents initially */ - options->contents = 1; - + /* number of different objects */ if ( info1->nused != info2->nused ) { |