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

1 8 Merges from develop (#432)

Browse Source 
* Update supported platforms

* Merge PR#3 changes from develop

* # WARNING: head commit changed in the meantime

Merge gcc 10 diagnostics option from develop

Merge CMake changes from develop
Merge warnings from develop
Merge #318 OSX changes from develop
Merge tools changes from develop
Merge test macros from develop

* Format updates

* Fix missing semicolon and format fix

* Format update

* Correct actions, remove java option

* Update autotools build files

* Add testfiles

* Fix configure issue with make flags

* Init fapls to default

* Update generated files and fix h5repack id closure

* update format

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
whitespace cleanup
tools sync

* format alignment

* initialize vars

* revert H5private change

* Merge #380 from develop
This commit is contained in:
Allen Byrne
2021-03-05 16:08:22 -06:00
committed by GitHub
parent c1da03ef09
commit 089a6f60ac
100 changed files with 1988 additions and 1747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tools/h5diff/h5diff_common.c
View File

@@ -70,7 +70,6 @@ check_options(diff_opt_t *opts)
}
}
#if TRILABS_227
/*-------------------------------------------------------------------------
* Function: parse_hsize_list
*
@@ -186,7 +185,6 @@ parse_subset_params(const char *dset)
return s;
}
#endif
/*-------------------------------------------------------------------------
* Function: parse_command_line
@@ -442,11 +440,9 @@ parse_command_line(int argc, const char *argv[], const char **fname1, const char
* TRILABS_227 is complete except for an issue with printing indices
* the following calls will enable subsetting
*/
#if TRILABS_227
opts->sset[0] = parse_subset_params(*objname1);
opts->sset[1] = parse_subset_params(*objname2);
#endif
H5TOOLS_ENDDEBUG("");
}
@@ -766,19 +762,27 @@ usage(void)
/*
* TRILABS_227 is complete except for an issue with printing indices
* the following will be needed for subsetting
*/
PRINTVALSTREAM(rawoutstream, " Subsetting options:\n");
PRINTVALSTREAM(rawoutstream, " Subsetting is available by using the fcompact form of subsetting, as
follows:\n"); PRINTVALSTREAM(rawoutstream, " obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]\n");
PRINTVALSTREAM(rawoutstream, " It is not required to use all parameters, but until the last parameter
value used,\n"); PRINTVALSTREAM(rawoutstream, " all of the semicolons (;) are required, even when a
parameter value is not specified. Example:\n"); PRINTVALSTREAM(rawoutstream, " obj1
/foo/mydataset[START;;COUNT;BLOCK]\n"); PRINTVALSTREAM(rawoutstream, " obj1 /foo/mydataset[START]\n");
PRINTVALSTREAM(rawoutstream, " The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1
in\n"); PRINTVALSTREAM(rawoutstream, " each dimension. START is optional and will default to 0 in each
dimension.\n"); PRINTVALSTREAM(rawoutstream, " Each of START, STRIDE, COUNT, and BLOCK must be a
comma-separated list of integers with\n"); PRINTVALSTREAM(rawoutstream, " one integer for each dimension
of the dataset.\n"); PRINTVALSTREAM(rawoutstream, "\n");
*/
PRINTVALSTREAM(rawoutstream,
" Subsetting is available by using the fcompact form of subsetting, as follows:\n");
PRINTVALSTREAM(rawoutstream, " obj1 /foo/mydataset[START;STRIDE;COUNT;BLOCK]\n");
PRINTVALSTREAM(rawoutstream,
" It is not required to use all parameters, but until the last parameter value used,\n");
PRINTVALSTREAM(
rawoutstream,
" all of the semicolons (;) are required, even when a parameter value is not specified. Example:\n");
PRINTVALSTREAM(rawoutstream, " obj1 /foo/mydataset[START;;COUNT;BLOCK]\n");
PRINTVALSTREAM(rawoutstream, " obj1 /foo/mydataset[START]\n");
PRINTVALSTREAM(rawoutstream,
" The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in\n");
PRINTVALSTREAM(rawoutstream,
" each dimension. START is optional and will default to 0 in each dimension.\n");
PRINTVALSTREAM(
rawoutstream,
" Each of START, STRIDE, COUNT, and BLOCK must be a comma-separated list of integers with\n");
PRINTVALSTREAM(rawoutstream, " one integer for each dimension of the dataset.\n");
PRINTVALSTREAM(rawoutstream, "\n");
PRINTVALSTREAM(rawoutstream, " Exit code:\n");
PRINTVALSTREAM(rawoutstream, " 0 if no differences, 1 if differences found, 2 if error\n");
PRINTVALSTREAM(rawoutstream, "\n");