diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-09-08 14:26:53 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-09-08 14:26:53 (GMT) |
| commit | 663ff104455b79bd3e431aada6e44402f057a002 (patch) | |
| tree | 57b307c279281190e27642f462b09b321c7b8f2c | |
| parent | 6f23a13c375bc0257a76add966d67a5de64937e2 (diff) | |
| parent | c0d6729ab079686b69c2797cc15fb0f3bc788600 (diff) | |
| download | hdf5-663ff104455b79bd3e431aada6e44402f057a002.zip hdf5-663ff104455b79bd3e431aada6e44402f057a002.tar.gz hdf5-663ff104455b79bd3e431aada6e44402f057a002.tar.bz2 | |
Merge pull request #660 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit 'c0d6729ab079686b69c2797cc15fb0f3bc788600':
Add missing test file
HDFFV-9774 Fix merge typo
| -rw-r--r-- | tools/h5diff/h5diff_common.c | 7 | ||||
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_459_ERR.txt | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c index e4696c0..84c6be2 100644 --- a/tools/h5diff/h5diff_common.c +++ b/tools/h5diff/h5diff_common.c @@ -230,8 +230,9 @@ void parse_command_line(int argc, options->percent = atof(opt_arg); /* -p 0 is the same as default */ - if (H5_DBL_ABS_EQUAL(options->percent, (double)0.0F)) - options->p = 0; + if (options->percent == 0) + options->p = 0; + break; case 'n': @@ -341,7 +342,7 @@ void parse_command_line(int argc, * *------------------------------------------------------------------------- */ -H5_ATTR_PURE static int +static int check_n_input( const char *str ) { unsigned i; diff --git a/tools/h5diff/testfiles/h5diff_459_ERR.txt b/tools/h5diff/testfiles/h5diff_459_ERR.txt new file mode 100644 index 0000000..6594c9a --- /dev/null +++ b/tools/h5diff/testfiles/h5diff_459_ERR.txt @@ -0,0 +1,6 @@ +Warning: </ext_link_noexist1> is a dangling link. +H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs): + #000: (file name) line (number) in h5diff(): Error: treat dangling link as error + major: Failure in tools library + minor: error in function +EXIT CODE: 2 |