philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed h5diff command-line parameters to use 1 and 2 instead of src

Browse Source 
and dst.
This commit is contained in:
Dana Robinson
2020-04-22 16:49:52 -07:00
parent 8cd9d8349e
commit 785bd0975b
13 changed files with 151 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
tools/src/h5diff/h5diff_common.c
View File

@@ -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");