summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2020-04-22 23:49:52 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2020-04-22 23:49:52 (GMT)
commit785bd0975ba13c3033820d0fc809da963fcd54ca (patch)
treeb6de43bf842ae8bd97727cfa4ade87f6a6abde8f
parent8cd9d8349e5984d8a6f78c9c0c1bb566a9960b23 (diff)
downloadhdf5-785bd0975ba13c3033820d0fc809da963fcd54ca.zip
hdf5-785bd0975ba13c3033820d0fc809da963fcd54ca.tar.gz
hdf5-785bd0975ba13c3033820d0fc809da963fcd54ca.tar.bz2
Fixed h5diff command-line parameters to use 1 and 2 instead of src
and dst.
-rw-r--r--tools/lib/h5diff.c8
-rw-r--r--tools/lib/h5diff.h8
-rw-r--r--tools/src/h5diff/h5diff_common.c86
-rw-r--r--tools/test/h5diff/testfiles/h5diff_10.txt20
-rw-r--r--tools/test/h5diff/testfiles/h5diff_600.txt20
-rw-r--r--tools/test/h5diff/testfiles/h5diff_603.txt20
-rw-r--r--tools/test/h5diff/testfiles/h5diff_606.txt20
-rw-r--r--tools/test/h5diff/testfiles/h5diff_612.txt20
-rw-r--r--tools/test/h5diff/testfiles/h5diff_615.txt20
-rw-r--r--tools/test/h5diff/testfiles/h5diff_621.txt20
-rw-r--r--tools/test/h5diff/testfiles/h5diff_622.txt20
-rw-r--r--tools/test/h5diff/testfiles/h5diff_623.txt20
-rw-r--r--tools/test/h5diff/testfiles/h5diff_624.txt20
13 files changed, 151 insertions, 151 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index d11d28f..8b6ace9 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -572,8 +572,8 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
*-------------------------------------------------------------------------
*/
/* open file 1 */
- if (opts->custom_in_vol) {
- if((fapl1_id = h5tools_get_fapl(H5P_DEFAULT, &(opts->in_vol_info), NULL)) < 0 ) {
+ if (opts->custom_vol_1) {
+ if((fapl1_id = h5tools_get_fapl(H5P_DEFAULT, &(opts->vol_info_1), NULL)) < 0 ) {
parallel_print("h5diff: unable to create fapl for input file\n");
H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "unable to create input fapl\n");
}
@@ -587,8 +587,8 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char
/* open file 2 */
- if (opts->custom_out_vol) {
- if((fapl2_id = h5tools_get_fapl(H5P_DEFAULT, &(opts->out_vol_info), NULL)) < 0 ) {
+ if (opts->custom_vol_2) {
+ if((fapl2_id = h5tools_get_fapl(H5P_DEFAULT, &(opts->vol_info_2), NULL)) < 0 ) {
parallel_print("h5diff: unable to create fapl for output file\n");
H5TOOLS_GOTO_ERROR(H5DIFF_ERR, "unable to create output fapl\n");
}
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index 1ac1dd7..8fe9d86 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -87,10 +87,10 @@ typedef struct {
int m_list_not_cmp; /* list not comparable messages */
int exclude_path; /* exclude path to an object */
struct exclude_path_list * exclude; /* keep exclude path list */
- h5tools_vol_info_t in_vol_info; /* VOL information for input file */
- h5tools_vol_info_t out_vol_info; /* VOL information for output file */
- hbool_t custom_in_vol; /* Using a custom input VOL? */
- hbool_t custom_out_vol; /* Using a custom output VOL? */
+ h5tools_vol_info_t vol_info_1; /* VOL information for input file */
+ h5tools_vol_info_t vol_info_2; /* VOL information for output file */
+ hbool_t custom_vol_1; /* Using a custom input VOL? */
+ hbool_t custom_vol_2; /* Using a custom output VOL? */
} diff_opt_t;
diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c
index e040696..771b20f 100644
--- a/tools/src/h5diff/h5diff_common.c
+++ b/tools/src/h5diff/h5diff_common.c
@@ -27,27 +27,27 @@ static int check_d_input(const char*);
*/
static const char *s_opts = "hVrv:qn:d:p:NcelxE:S";
static struct long_options l_opts[] = {
- { "help", no_arg, 'h' },
- { "version", no_arg, 'V' },
- { "report", no_arg, 'r' },
- { "verbose", optional_arg, 'v' },
- { "quiet", no_arg, 'q' },
- { "count", require_arg, 'n' },
- { "delta", require_arg, 'd' },
- { "relative", require_arg, 'p' },
- { "nan", no_arg, 'N' },
- { "compare", no_arg, 'c' },
+ { "help", no_arg, 'h' },
+ { "version", no_arg, 'V' },
+ { "report", no_arg, 'r' },
+ { "verbose", optional_arg, 'v' },
+ { "quiet", no_arg, 'q' },
+ { "count", require_arg, 'n' },
+ { "delta", require_arg, 'd' },
+ { "relative", require_arg, 'p' },
+ { "nan", no_arg, 'N' },
+ { "compare", no_arg, 'c' },
{ "use-system-epsilon", no_arg, 'e' },
- { "follow-symlinks", no_arg, 'l' },
- { "no-dangling-links", no_arg, 'x' },
- { "exclude-path", require_arg, 'E' },
+ { "follow-symlinks", no_arg, 'l' },
+ { "no-dangling-links", no_arg, 'x' },
+ { "exclude-path", require_arg, 'E' },
{ "enable-error-stack", no_arg, 'S' },
- { "src-vol-value", require_arg, '1' },
- { "src-vol-name", require_arg, '2' },
- { "src-vol-info", require_arg, '3' },
- { "dst-vol-value", require_arg, '4' },
- { "dst-vol-name", require_arg, '5' },
- { "dst-vol-info", require_arg, '6' },
+ { "vol-value-1", require_arg, '1' },
+ { "vol-name-1", require_arg, '2' },
+ { "vol-info-1", require_arg, '3' },
+ { "vol-value-2", require_arg, '4' },
+ { "vol-name-2", require_arg, '5' },
+ { "vol-info-2", require_arg, '6' },
{ NULL, 0, '\0' }
};
@@ -266,35 +266,35 @@ void parse_command_line(int argc,
break;
case '1':
- opts->in_vol_info.type = VOL_BY_VALUE;
- opts->in_vol_info.u.value = (H5VL_class_value_t)HDatoi(opt_arg);
- opts->custom_in_vol = TRUE;
+ opts->vol_info_1.type = VOL_BY_VALUE;
+ opts->vol_info_1.u.value = (H5VL_class_value_t)HDatoi(opt_arg);
+ opts->custom_vol_1 = TRUE;
break;
case '2':
- opts->in_vol_info.type = VOL_BY_NAME;
- opts->in_vol_info.u.name = opt_arg;
- opts->custom_in_vol = TRUE;
+ opts->vol_info_1.type = VOL_BY_NAME;
+ opts->vol_info_1.u.name = opt_arg;
+ opts->custom_vol_1 = TRUE;
break;
case '3':
- opts->in_vol_info.info_string = opt_arg;
+ opts->vol_info_1.info_string = opt_arg;
break;
case '4':
- opts->out_vol_info.type = VOL_BY_VALUE;
- opts->out_vol_info.u.value = (H5VL_class_value_t)HDatoi(opt_arg);
- opts->custom_out_vol = TRUE;
+ opts->vol_info_2.type = VOL_BY_VALUE;
+ opts->vol_info_2.u.value = (H5VL_class_value_t)HDatoi(opt_arg);
+ opts->custom_vol_2 = TRUE;
break;
case '5':
- opts->out_vol_info.type = VOL_BY_NAME;
- opts->out_vol_info.u.name = opt_arg;
- opts->custom_out_vol = TRUE;
+ opts->vol_info_2.type = VOL_BY_NAME;
+ opts->vol_info_2.u.name = opt_arg;
+ opts->custom_vol_2 = TRUE;
break;
case '6':
- opts->out_vol_info.info_string = opt_arg;
+ opts->vol_info_2.info_string = opt_arg;
break;
}
}
@@ -507,18 +507,18 @@ void usage(void)
PRINTVALSTREAM(rawoutstream, " Quiet mode. Do not produce output.\n");
PRINTVALSTREAM(rawoutstream, " --enable-error-stack\n");
PRINTVALSTREAM(rawoutstream, " Prints messages from the HDF5 error stack as they occur.\n");
- PRINTVALSTREAM(rawoutstream, " --src-vol-value Value (ID) of the VOL connector to use for opening the\n");
- PRINTVALSTREAM(rawoutstream, " input HDF5 file specified\n");
- PRINTVALSTREAM(rawoutstream, " --src-vol-name Name of the VOL connector to use for opening the input\n");
+ PRINTVALSTREAM(rawoutstream, " --vol-value-1 Value (ID) of the VOL connector to use for opening the\n");
+ PRINTVALSTREAM(rawoutstream, " first HDF5 file specified\n");
+ PRINTVALSTREAM(rawoutstream, " --vol-name-1 Name of the VOL connector to use for opening the first\n");
PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n");
- PRINTVALSTREAM(rawoutstream, " --src-vol-info VOL-specific info to pass to the VOL connector used for\n");
- PRINTVALSTREAM(rawoutstream, " opening the input HDF5 file specified\n");
- PRINTVALSTREAM(rawoutstream, " --dst-vol-value Value (ID) of the VOL connector to use for opening the\n");
- PRINTVALSTREAM(rawoutstream, " output HDF5 file specified\n");
- PRINTVALSTREAM(rawoutstream, " --dst-vol-name Name of the VOL connector to use for opening the output\n");
+ PRINTVALSTREAM(rawoutstream, " --vol-info-1 VOL-specific info to pass to the VOL connector used for\n");
+ PRINTVALSTREAM(rawoutstream, " opening the first HDF5 file specified\n");
+ PRINTVALSTREAM(rawoutstream, " --vol-value-2 Value (ID) of the VOL connector to use for opening the\n");
+ PRINTVALSTREAM(rawoutstream, " second HDF5 file specified\n");
+ PRINTVALSTREAM(rawoutstream, " --vol-name-2 Name of the VOL connector to use for opening the second\n");
PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n");
- PRINTVALSTREAM(rawoutstream, " --dst-vol-info VOL-specific info to pass to the VOL connector used for\n");
- PRINTVALSTREAM(rawoutstream, " opening the output HDF5 file specified\n");
+ PRINTVALSTREAM(rawoutstream, " --vol-info-2 VOL-specific info to pass to the VOL connector used for\n");
+ PRINTVALSTREAM(rawoutstream, " opening the second HDF5 file specified\n");
PRINTVALSTREAM(rawoutstream, " --follow-symlinks\n");
PRINTVALSTREAM(rawoutstream, " Follow symbolic links (soft links and external links and compare the)\n");
PRINTVALSTREAM(rawoutstream, " links' target objects.\n");
diff --git a/tools/test/h5diff/testfiles/h5diff_10.txt b/tools/test/h5diff/testfiles/h5diff_10.txt
index 216ec1a..0a2fd12 100644
--- a/tools/test/h5diff/testfiles/h5diff_10.txt
+++ b/tools/test/h5diff/testfiles/h5diff_10.txt
@@ -25,18 +25,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
- --src-vol-value Value (ID) of the VOL connector to use for opening the
- input HDF5 file specified
- --src-vol-name Name of the VOL connector to use for opening the input
+ --vol-value-1 Value (ID) of the VOL connector to use for opening the
+ first HDF5 file specified
+ --vol-name-1 Name of the VOL connector to use for opening the first
HDF5 file specified
- --src-vol-info VOL-specific info to pass to the VOL connector used for
- opening the input HDF5 file specified
- --dst-vol-value Value (ID) of the VOL connector to use for opening the
- output HDF5 file specified
- --dst-vol-name Name of the VOL connector to use for opening the output
+ --vol-info-1 VOL-specific info to pass to the VOL connector used for
+ opening the first HDF5 file specified
+ --vol-value-2 Value (ID) of the VOL connector to use for opening the
+ second HDF5 file specified
+ --vol-name-2 Name of the VOL connector to use for opening the second
HDF5 file specified
- --dst-vol-info VOL-specific info to pass to the VOL connector used for
- opening the output HDF5 file specified
+ --vol-info-2 VOL-specific info to pass to the VOL connector used for
+ opening the second HDF5 file specified
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_600.txt b/tools/test/h5diff/testfiles/h5diff_600.txt
index c515535..55b8da7 100644
--- a/tools/test/h5diff/testfiles/h5diff_600.txt
+++ b/tools/test/h5diff/testfiles/h5diff_600.txt
@@ -25,18 +25,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
- --src-vol-value Value (ID) of the VOL connector to use for opening the
- input HDF5 file specified
- --src-vol-name Name of the VOL connector to use for opening the input
+ --vol-value-1 Value (ID) of the VOL connector to use for opening the
+ first HDF5 file specified
+ --vol-name-1 Name of the VOL connector to use for opening the first
HDF5 file specified
- --src-vol-info VOL-specific info to pass to the VOL connector used for
- opening the input HDF5 file specified
- --dst-vol-value Value (ID) of the VOL connector to use for opening the
- output HDF5 file specified
- --dst-vol-name Name of the VOL connector to use for opening the output
+ --vol-info-1 VOL-specific info to pass to the VOL connector used for
+ opening the first HDF5 file specified
+ --vol-value-2 Value (ID) of the VOL connector to use for opening the
+ second HDF5 file specified
+ --vol-name-2 Name of the VOL connector to use for opening the second
HDF5 file specified
- --dst-vol-info VOL-specific info to pass to the VOL connector used for
- opening the output HDF5 file specified
+ --vol-info-2 VOL-specific info to pass to the VOL connector used for
+ opening the second HDF5 file specified
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_603.txt b/tools/test/h5diff/testfiles/h5diff_603.txt
index 7249d68..36cd0ef 100644
--- a/tools/test/h5diff/testfiles/h5diff_603.txt
+++ b/tools/test/h5diff/testfiles/h5diff_603.txt
@@ -26,18 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
- --src-vol-value Value (ID) of the VOL connector to use for opening the
- input HDF5 file specified
- --src-vol-name Name of the VOL connector to use for opening the input
+ --vol-value-1 Value (ID) of the VOL connector to use for opening the
+ first HDF5 file specified
+ --vol-name-1 Name of the VOL connector to use for opening the first
HDF5 file specified
- --src-vol-info VOL-specific info to pass to the VOL connector used for
- opening the input HDF5 file specified
- --dst-vol-value Value (ID) of the VOL connector to use for opening the
- output HDF5 file specified
- --dst-vol-name Name of the VOL connector to use for opening the output
+ --vol-info-1 VOL-specific info to pass to the VOL connector used for
+ opening the first HDF5 file specified
+ --vol-value-2 Value (ID) of the VOL connector to use for opening the
+ second HDF5 file specified
+ --vol-name-2 Name of the VOL connector to use for opening the second
HDF5 file specified
- --dst-vol-info VOL-specific info to pass to the VOL connector used for
- opening the output HDF5 file specified
+ --vol-info-2 VOL-specific info to pass to the VOL connector used for
+ opening the second HDF5 file specified
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_606.txt b/tools/test/h5diff/testfiles/h5diff_606.txt
index 14f1115..c2e9ac1 100644
--- a/tools/test/h5diff/testfiles/h5diff_606.txt
+++ b/tools/test/h5diff/testfiles/h5diff_606.txt
@@ -26,18 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
- --src-vol-value Value (ID) of the VOL connector to use for opening the
- input HDF5 file specified
- --src-vol-name Name of the VOL connector to use for opening the input
+ --vol-value-1 Value (ID) of the VOL connector to use for opening the
+ first HDF5 file specified
+ --vol-name-1 Name of the VOL connector to use for opening the first
HDF5 file specified
- --src-vol-info VOL-specific info to pass to the VOL connector used for
- opening the input HDF5 file specified
- --dst-vol-value Value (ID) of the VOL connector to use for opening the
- output HDF5 file specified
- --dst-vol-name Name of the VOL connector to use for opening the output
+ --vol-info-1 VOL-specific info to pass to the VOL connector used for
+ opening the first HDF5 file specified
+ --vol-value-2 Value (ID) of the VOL connector to use for opening the
+ second HDF5 file specified
+ --vol-name-2 Name of the VOL connector to use for opening the second
HDF5 file specified
- --dst-vol-info VOL-specific info to pass to the VOL connector used for
- opening the output HDF5 file specified
+ --vol-info-2 VOL-specific info to pass to the VOL connector used for
+ opening the second HDF5 file specified
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_612.txt b/tools/test/h5diff/testfiles/h5diff_612.txt
index 6d447c8..2e09432 100644
--- a/tools/test/h5diff/testfiles/h5diff_612.txt
+++ b/tools/test/h5diff/testfiles/h5diff_612.txt
@@ -26,18 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
- --src-vol-value Value (ID) of the VOL connector to use for opening the
- input HDF5 file specified
- --src-vol-name Name of the VOL connector to use for opening the input
+ --vol-value-1 Value (ID) of the VOL connector to use for opening the
+ first HDF5 file specified
+ --vol-name-1 Name of the VOL connector to use for opening the first
HDF5 file specified
- --src-vol-info VOL-specific info to pass to the VOL connector used for
- opening the input HDF5 file specified
- --dst-vol-value Value (ID) of the VOL connector to use for opening the
- output HDF5 file specified
- --dst-vol-name Name of the VOL connector to use for opening the output
+ --vol-info-1 VOL-specific info to pass to the VOL connector used for
+ opening the first HDF5 file specified
+ --vol-value-2 Value (ID) of the VOL connector to use for opening the
+ second HDF5 file specified
+ --vol-name-2 Name of the VOL connector to use for opening the second
HDF5 file specified
- --dst-vol-info VOL-specific info to pass to the VOL connector used for
- opening the output HDF5 file specified
+ --vol-info-2 VOL-specific info to pass to the VOL connector used for
+ opening the second HDF5 file specified
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_615.txt b/tools/test/h5diff/testfiles/h5diff_615.txt
index 5bb0cca..a07de54 100644
--- a/tools/test/h5diff/testfiles/h5diff_615.txt
+++ b/tools/test/h5diff/testfiles/h5diff_615.txt
@@ -26,18 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
- --src-vol-value Value (ID) of the VOL connector to use for opening the
- input HDF5 file specified
- --src-vol-name Name of the VOL connector to use for opening the input
+ --vol-value-1 Value (ID) of the VOL connector to use for opening the
+ first HDF5 file specified
+ --vol-name-1 Name of the VOL connector to use for opening the first
HDF5 file specified
- --src-vol-info VOL-specific info to pass to the VOL connector used for
- opening the input HDF5 file specified
- --dst-vol-value Value (ID) of the VOL connector to use for opening the
- output HDF5 file specified
- --dst-vol-name Name of the VOL connector to use for opening the output
+ --vol-info-1 VOL-specific info to pass to the VOL connector used for
+ opening the first HDF5 file specified
+ --vol-value-2 Value (ID) of the VOL connector to use for opening the
+ second HDF5 file specified
+ --vol-name-2 Name of the VOL connector to use for opening the second
HDF5 file specified
- --dst-vol-info VOL-specific info to pass to the VOL connector used for
- opening the output HDF5 file specified
+ --vol-info-2 VOL-specific info to pass to the VOL connector used for
+ opening the second HDF5 file specified
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_621.txt b/tools/test/h5diff/testfiles/h5diff_621.txt
index 8369159..5f44dd7 100644
--- a/tools/test/h5diff/testfiles/h5diff_621.txt
+++ b/tools/test/h5diff/testfiles/h5diff_621.txt
@@ -26,18 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
- --src-vol-value Value (ID) of the VOL connector to use for opening the
- input HDF5 file specified
- --src-vol-name Name of the VOL connector to use for opening the input
+ --vol-value-1 Value (ID) of the VOL connector to use for opening the
+ first HDF5 file specified
+ --vol-name-1 Name of the VOL connector to use for opening the first
HDF5 file specified
- --src-vol-info VOL-specific info to pass to the VOL connector used for
- opening the input HDF5 file specified
- --dst-vol-value Value (ID) of the VOL connector to use for opening the
- output HDF5 file specified
- --dst-vol-name Name of the VOL connector to use for opening the output
+ --vol-info-1 VOL-specific info to pass to the VOL connector used for
+ opening the first HDF5 file specified
+ --vol-value-2 Value (ID) of the VOL connector to use for opening the
+ second HDF5 file specified
+ --vol-name-2 Name of the VOL connector to use for opening the second
HDF5 file specified
- --dst-vol-info VOL-specific info to pass to the VOL connector used for
- opening the output HDF5 file specified
+ --vol-info-2 VOL-specific info to pass to the VOL connector used for
+ opening the second HDF5 file specified
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_622.txt b/tools/test/h5diff/testfiles/h5diff_622.txt
index f7cd143..2e28a42 100644
--- a/tools/test/h5diff/testfiles/h5diff_622.txt
+++ b/tools/test/h5diff/testfiles/h5diff_622.txt
@@ -26,18 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
- --src-vol-value Value (ID) of the VOL connector to use for opening the
- input HDF5 file specified
- --src-vol-name Name of the VOL connector to use for opening the input
+ --vol-value-1 Value (ID) of the VOL connector to use for opening the
+ first HDF5 file specified
+ --vol-name-1 Name of the VOL connector to use for opening the first
HDF5 file specified
- --src-vol-info VOL-specific info to pass to the VOL connector used for
- opening the input HDF5 file specified
- --dst-vol-value Value (ID) of the VOL connector to use for opening the
- output HDF5 file specified
- --dst-vol-name Name of the VOL connector to use for opening the output
+ --vol-info-1 VOL-specific info to pass to the VOL connector used for
+ opening the first HDF5 file specified
+ --vol-value-2 Value (ID) of the VOL connector to use for opening the
+ second HDF5 file specified
+ --vol-name-2 Name of the VOL connector to use for opening the second
HDF5 file specified
- --dst-vol-info VOL-specific info to pass to the VOL connector used for
- opening the output HDF5 file specified
+ --vol-info-2 VOL-specific info to pass to the VOL connector used for
+ opening the second HDF5 file specified
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_623.txt b/tools/test/h5diff/testfiles/h5diff_623.txt
index 0b73fcc..21cb90a 100644
--- a/tools/test/h5diff/testfiles/h5diff_623.txt
+++ b/tools/test/h5diff/testfiles/h5diff_623.txt
@@ -26,18 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
- --src-vol-value Value (ID) of the VOL connector to use for opening the
- input HDF5 file specified
- --src-vol-name Name of the VOL connector to use for opening the input
+ --vol-value-1 Value (ID) of the VOL connector to use for opening the
+ first HDF5 file specified
+ --vol-name-1 Name of the VOL connector to use for opening the first
HDF5 file specified
- --src-vol-info VOL-specific info to pass to the VOL connector used for
- opening the input HDF5 file specified
- --dst-vol-value Value (ID) of the VOL connector to use for opening the
- output HDF5 file specified
- --dst-vol-name Name of the VOL connector to use for opening the output
+ --vol-info-1 VOL-specific info to pass to the VOL connector used for
+ opening the first HDF5 file specified
+ --vol-value-2 Value (ID) of the VOL connector to use for opening the
+ second HDF5 file specified
+ --vol-name-2 Name of the VOL connector to use for opening the second
HDF5 file specified
- --dst-vol-info VOL-specific info to pass to the VOL connector used for
- opening the output HDF5 file specified
+ --vol-info-2 VOL-specific info to pass to the VOL connector used for
+ opening the second HDF5 file specified
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.
diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/testfiles/h5diff_624.txt
index dc2e433..92c98d9 100644
--- a/tools/test/h5diff/testfiles/h5diff_624.txt
+++ b/tools/test/h5diff/testfiles/h5diff_624.txt
@@ -26,18 +26,18 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
Quiet mode. Do not produce output.
--enable-error-stack
Prints messages from the HDF5 error stack as they occur.
- --src-vol-value Value (ID) of the VOL connector to use for opening the
- input HDF5 file specified
- --src-vol-name Name of the VOL connector to use for opening the input
+ --vol-value-1 Value (ID) of the VOL connector to use for opening the
+ first HDF5 file specified
+ --vol-name-1 Name of the VOL connector to use for opening the first
HDF5 file specified
- --src-vol-info VOL-specific info to pass to the VOL connector used for
- opening the input HDF5 file specified
- --dst-vol-value Value (ID) of the VOL connector to use for opening the
- output HDF5 file specified
- --dst-vol-name Name of the VOL connector to use for opening the output
+ --vol-info-1 VOL-specific info to pass to the VOL connector used for
+ opening the first HDF5 file specified
+ --vol-value-2 Value (ID) of the VOL connector to use for opening the
+ second HDF5 file specified
+ --vol-name-2 Name of the VOL connector to use for opening the second
HDF5 file specified
- --dst-vol-info VOL-specific info to pass to the VOL connector used for
- opening the output HDF5 file specified
+ --vol-info-2 VOL-specific info to pass to the VOL connector used for
+ opening the second HDF5 file specified
--follow-symlinks
Follow symbolic links (soft links and external links and compare the)
links' target objects.