summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tools/h5dump/CMakeLists.txt3
-rw-r--r--tools/h5dump/testh5dump.sh.in3
-rw-r--r--tools/h5stat/h5stat_gentest.c4
-rw-r--r--tools/lib/h5diff_dset.c2
-rw-r--r--tools/misc/h5debug.c14
-rw-r--r--tools/testfiles/tnofilename.ddl86
6 files changed, 11 insertions, 101 deletions
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index 652fe83..f77d6a5 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -131,7 +131,6 @@ IF (BUILD_TESTING)
tnamed_dtype_attr.ddl
tnestcomp-1.ddl
tnbit.ddl
- tnofilename.ddl
tno-subset.ddl
tnullspace.ddl
zerodim.ddl
@@ -838,8 +837,6 @@ IF (BUILD_TESTING)
tnestcomp-1.out.err
tnbit.out
tnbit.out.err
- tnofilename.out
- tnofilename.out.err
tno-subset.out
tno-subset.out.err
tnullspace.out
diff --git a/tools/h5dump/testh5dump.sh.in b/tools/h5dump/testh5dump.sh.in
index ee91880..57168e0 100644
--- a/tools/h5dump/testh5dump.sh.in
+++ b/tools/h5dump/testh5dump.sh.in
@@ -247,7 +247,6 @@ $SRC_H5DUMP_TESTFILES/tmulti.ddl
$SRC_H5DUMP_TESTFILES/tnamed_dtype_attr.ddl
$SRC_H5DUMP_TESTFILES/tnestcomp-1.ddl
$SRC_H5DUMP_TESTFILES/tnbit.ddl
-$SRC_H5DUMP_TESTFILES/tnofilename.ddl
$SRC_H5DUMP_TESTFILES/tno-subset.ddl
$SRC_H5DUMP_TESTFILES/tnullspace.ddl
$SRC_H5DUMP_TESTFILES/zerodim.ddl
@@ -881,7 +880,7 @@ TOOLTEST texceedsubcount.ddl -d 1d -c 1,3 taindices.h5
TOOLTEST texceedsubstride.ddl -d 1d -S 1,3 taindices.h5
TOOLTEST texceedsubblock.ddl -d 1d -k 1,3 taindices.h5
-###### 2/17 SKIP tests because compression values are different ############
+
# tests for filters
# SZIP
option="-H -p -d szip tfilters.h5"
diff --git a/tools/h5stat/h5stat_gentest.c b/tools/h5stat/h5stat_gentest.c
index e333128..a7bb4b0 100644
--- a/tools/h5stat/h5stat_gentest.c
+++ b/tools/h5stat/h5stat_gentest.c
@@ -42,7 +42,7 @@ static void gen_file(void)
{
hid_t fcpl; /* File creation property */
hid_t fapl; /* File access property */
- hid_t file; /* File id */
+ hid_t file; /* File id */
hid_t gid; /* Group id */
hid_t type_id; /* Datatype id */
hid_t space_id; /* Dataspace id */
@@ -50,7 +50,7 @@ static void gen_file(void)
hid_t dset_id; /* Dataset id */
char name[30]; /* Group name */
char attrname[30]; /* Attribute name */
- int ret; /* Return value */
+ int ret; /* Return value */
int i; /* Local index variable */
fapl = H5Pcreate(H5P_FILE_ACCESS);
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index bfb8429..c1ed429 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -409,7 +409,7 @@ hsize_t diff_datasetid( hid_t did1,
options, name1, name2, m_tid1, did1, did2);
/* reclaim any VL memory, if necessary */
- if(vl_data) {
+ if(vl_data) {
H5Dvlen_reclaim(m_tid1, sid1, H5P_DEFAULT, buf1);
H5Dvlen_reclaim(m_tid2, sid2, H5P_DEFAULT, buf2);
} /* end if */
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index 30d5d3b..f24fbba 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -225,8 +225,8 @@ main(int argc, char *argv[])
herr_t status = SUCCEED;
if(argc == 1) {
- HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
- HDexit(1);
+ HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
+ HDexit(1);
} /* end if */
/* Initialize the library */
@@ -247,7 +247,7 @@ main(int argc, char *argv[])
HDexit(1);
} /* end if */
if(HDstrchr(argv[1], '%'))
- H5Pset_fapl_family (fapl, (hsize_t)0, H5P_DEFAULT);
+ H5Pset_fapl_family (fapl, (hsize_t)0, H5P_DEFAULT);
if((fid = H5Fopen(argv[1], H5F_ACC_RDONLY, fapl)) < 0) {
HDfprintf(stderr, "cannot open file\n");
HDexit(1);
@@ -298,10 +298,10 @@ main(int argc, char *argv[])
status = H5HL_debug(f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL);
} else if(!HDmemcmp (sig, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
- /*
- * Debug a global heap collection.
- */
- status = H5HG_debug (f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL);
+ /*
+ * Debug a global heap collection.
+ */
+ status = H5HG_debug (f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL);
} else if(!HDmemcmp(sig, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) {
/*
diff --git a/tools/testfiles/tnofilename.ddl b/tools/testfiles/tnofilename.ddl
deleted file mode 100644
index f9bd972..0000000
--- a/tools/testfiles/tnofilename.ddl
+++ /dev/null
@@ -1,86 +0,0 @@
-usage: h5dump [OPTIONS] file
- OPTIONS
- -h, --help Print a usage message and exit
- -n, --contents Print a list of the file contents and exit
- -B, --superblock Print the content of the super block
- -H, --header Print the header only; no data is displayed
- -A, --onlyattr Print the header and value of attributes
- -i, --object-ids Print the object ids
- -r, --string Print 1-byte integer datasets as ASCII
- -e, --escape Escape non printing characters
- -V, --version Print version number and exit
- -a P, --attribute=P Print the specified attribute
- -d P, --dataset=P Print the specified dataset
- -y, --noindex Do not print array indices with the data
- -p, --properties Print dataset filters, storage layout and fill value
- -f D, --filedriver=D Specify which driver to open the file with
- -g P, --group=P Print the specified group and all members
- -l P, --soft-link=P Print the value(s) of the specified soft link
- -o F, --output=F Output raw data into file F
- -b B, --binary=B Binary file output, of form B
- -t P, --datatype=P Print the specified named datatype
- -w N, --width=N Set the number of columns of output. A value of 0 (zero)
- sets the number of columns to the maximum (65535).
- Default width is 80 columns.
- -m T, --format=T Set the floating point output format
- -q Q, --sort_by=Q Sort groups and attributes by index Q
- -z Z, --sort_order=Z Sort groups and attributes by order Z
- -R, --region Print dataset pointed by region references
- -x, --xml Output in XML using Schema
- -u, --use-dtd Output in XML using DTD
- -D U, --xml-dtd=U Use the DTD or schema at U
- -X S, --xml-ns=S (XML Schema) Use qualified names n the XML
- ":": no namespace, default: "hdf5:"
- E.g., to dump a file called `-f', use h5dump -- -f
- --enable-error-stack Prints messages from the HDF5 error stack as they
- occur.
- --no-compact-subset Disable compact form of subsetting and allow the use
- of "[" in datset names.
-
- Subsetting is available by using the following options with a dataset
- attribute. Subsetting is done by selecting a hyperslab from the data.
- Thus, the options mirror those for performing a hyperslab selection.
- One of the START, COUNT, STRIDE, or BLOCK parameters are mandatory if you do subsetting.
- The STRIDE, COUNT, and BLOCK parameters are optional and will default to 1 in
- each dimension. START is optional and will default to 0 in each dimension.
-
- -s START, --start=START Offset of start of subsetting selection
- -S STRIDE, --stride=STRIDE Hyperslab stride
- -c COUNT, --count=COUNT Number of blocks to include in selection
- -k BLOCK, --block=BLOCK Size of block in hyperslab
- START, COUNT, STRIDE, and BLOCK - is a list of integers the number of which are equal to the
- number of dimensions in the dataspace being queried
-
- D - is the file driver to use in opening the file. Acceptable values
- are "sec2", "family", "split", "multi", "direct", and "stream". Without
- the file driver flag, the file will be opened with each driver in
- turn and in the order specified above until one driver succeeds
- in opening the file.
- F - is a filename.
- P - is the full path from the root group to the object.
- N - is an integer greater than 1.
- T - is a string containing the floating point format, e.g '%.3f'
- U - is a URI reference (as defined in [IETF RFC 2396],
- updated by [IETF RFC 2732])
- B - is the form of binary output: NATIVE for a memory type, FILE for the
- file type, LE or BE for pre-existing little or big endian types.
- Must be used with -o (output file) and it is recommended that
- -d (dataset) is used. B is an optional argument, defaults to NATIVE
- Q - is the sort index type. It can be "creation_order" or "name" (default)
- Z - is the sort order type. It can be "descending" or "ascending" (default)
-
- Examples:
-
- 1) Attribute foo of the group /bar_none in file quux.h5
-
- h5dump -a /bar_none/foo quux.h5
-
- 2) Selecting a subset from dataset /foo in file quux.h5
-
- h5dump -d /foo -s "0,1" -S "1,1" -c "2,3" -k "2,2" quux.h5
-
- 3) Saving dataset 'dset' in file quux.h5 to binary file 'out.bin'
- using a little-endian type
-
- h5dump -d /dset -b LE -o out.bin quux.h5
-
generated by cgit v0.12 at 2024-12-28 09:16:40 (GMT)