From 6cf950574aabee86cabee53c12b43ae56ab623c3 Mon Sep 17 00:00:00 2001 From: Matthew Larson Date: Mon, 19 Jun 2023 17:27:22 -0500 Subject: [PATCH 1/4] Add note about HDF5_VOL_CONNECTOR to h5dump usage --- tools/src/h5dump/h5dump.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index 2a5eeb70b2d..61467de176b 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -219,6 +219,10 @@ usage(const char *prog) PRINTVALSTREAM(rawoutstream, " --vol-info VOL-specific info to pass to the VOL connector used for\n"); PRINTVALSTREAM(rawoutstream, " opening the HDF5 file specified\n"); + PRINTVALSTREAM(rawoutstream, + " If none of the above options are used to specify a VOL, then\n"); + PRINTVALSTREAM(rawoutstream, + " the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used.\n"); PRINTVALSTREAM(rawoutstream, " --vfd-value Value (ID) of the VFL driver to use for opening the\n"); PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n"); From 908a07c5af86975eeede0840a8116d41d83bc43c Mon Sep 17 00:00:00 2001 From: Matthew Larson Date: Tue, 20 Jun 2023 09:05:05 -0500 Subject: [PATCH 2/4] Update testfiles --- tools/src/h5dump/h5dump.c | 10 ++++++---- tools/testfiles/h5dump-help.txt | 2 ++ tools/testfiles/pbits/tnofilename-with-packed-bits.ddl | 2 ++ tools/testfiles/pbits/tpbitsIncomplete.ddl | 2 ++ tools/testfiles/pbits/tpbitsLengthExceeded.ddl | 2 ++ tools/testfiles/pbits/tpbitsLengthPositive.ddl | 2 ++ tools/testfiles/pbits/tpbitsMaxExceeded.ddl | 2 ++ tools/testfiles/pbits/tpbitsOffsetExceeded.ddl | 2 ++ tools/testfiles/pbits/tpbitsOffsetNegative.ddl | 2 ++ 9 files changed, 22 insertions(+), 4 deletions(-) diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index 61467de176b..0b85299b7e0 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -219,10 +219,12 @@ usage(const char *prog) PRINTVALSTREAM(rawoutstream, " --vol-info VOL-specific info to pass to the VOL connector used for\n"); PRINTVALSTREAM(rawoutstream, " opening the HDF5 file specified\n"); - PRINTVALSTREAM(rawoutstream, - " If none of the above options are used to specify a VOL, then\n"); - PRINTVALSTREAM(rawoutstream, - " the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used.\n"); + PRINTVALSTREAM( + rawoutstream, + " If none of the above options are used to specify a VOL, then\n"); + PRINTVALSTREAM( + rawoutstream, + " the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used.\n"); PRINTVALSTREAM(rawoutstream, " --vfd-value Value (ID) of the VFL driver to use for opening the\n"); PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n"); diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt index e20df732d31..a64e850c28e 100644 --- a/tools/testfiles/h5dump-help.txt +++ b/tools/testfiles/h5dump-help.txt @@ -32,6 +32,8 @@ usage: h5dump [OPTIONS] files HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl index e20df732d31..a64e850c28e 100644 --- a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl +++ b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl @@ -32,6 +32,8 @@ usage: h5dump [OPTIONS] files HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/testfiles/pbits/tpbitsIncomplete.ddl index e20df732d31..a64e850c28e 100644 --- a/tools/testfiles/pbits/tpbitsIncomplete.ddl +++ b/tools/testfiles/pbits/tpbitsIncomplete.ddl @@ -32,6 +32,8 @@ usage: h5dump [OPTIONS] files HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl index e20df732d31..a64e850c28e 100644 --- a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl +++ b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl @@ -32,6 +32,8 @@ usage: h5dump [OPTIONS] files HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/testfiles/pbits/tpbitsLengthPositive.ddl index e20df732d31..a64e850c28e 100644 --- a/tools/testfiles/pbits/tpbitsLengthPositive.ddl +++ b/tools/testfiles/pbits/tpbitsLengthPositive.ddl @@ -32,6 +32,8 @@ usage: h5dump [OPTIONS] files HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl index e20df732d31..a64e850c28e 100644 --- a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl +++ b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl @@ -32,6 +32,8 @@ usage: h5dump [OPTIONS] files HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl index e20df732d31..a64e850c28e 100644 --- a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl +++ b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl @@ -32,6 +32,8 @@ usage: h5dump [OPTIONS] files HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl index e20df732d31..a64e850c28e 100644 --- a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl +++ b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl @@ -32,6 +32,8 @@ usage: h5dump [OPTIONS] files HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the From 52083af4210b3c1f008cc44419015d42b4d861db Mon Sep 17 00:00:00 2001 From: Matthew Larson Date: Wed, 21 Jun 2023 10:56:11 -0500 Subject: [PATCH 3/4] Update usage+testfiles for tools with VOL args --- tools/src/h5diff/h5diff_common.c | 6 ++++++ tools/src/h5dump/h5dump.c | 9 +++------ tools/src/h5ls/h5ls.c | 9 ++++++++- tools/src/misc/h5mkgrp.c | 3 +++ tools/test/h5diff/testfiles/h5diff_10.txt | 3 +++ tools/test/h5diff/testfiles/h5diff_600.txt | 3 +++ tools/test/h5diff/testfiles/h5diff_603.txt | 3 +++ tools/test/h5diff/testfiles/h5diff_606.txt | 3 +++ tools/test/h5diff/testfiles/h5diff_612.txt | 3 +++ tools/test/h5diff/testfiles/h5diff_615.txt | 3 +++ tools/test/h5diff/testfiles/h5diff_621.txt | 3 +++ tools/test/h5diff/testfiles/h5diff_622.txt | 3 +++ tools/test/h5diff/testfiles/h5diff_623.txt | 3 +++ tools/test/h5diff/testfiles/h5diff_624.txt | 3 +++ tools/test/misc/testfiles/h5mkgrp_help.txt | 3 +++ tools/testfiles/h5dump-help.txt | 3 ++- tools/testfiles/help-1.ls | 3 +++ tools/testfiles/help-2.ls | 3 +++ tools/testfiles/help-3.ls | 3 +++ tools/testfiles/pbits/tnofilename-with-packed-bits.ddl | 3 ++- tools/testfiles/pbits/tpbitsIncomplete.ddl | 3 ++- tools/testfiles/pbits/tpbitsLengthExceeded.ddl | 3 ++- tools/testfiles/pbits/tpbitsLengthPositive.ddl | 3 ++- tools/testfiles/pbits/tpbitsMaxExceeded.ddl | 3 ++- tools/testfiles/pbits/tpbitsOffsetExceeded.ddl | 3 ++- tools/testfiles/pbits/tpbitsOffsetNegative.ddl | 3 ++- tools/testfiles/textlinksrc-nodangle-1.ls | 3 +++ tools/testfiles/tgroup-1.ls | 3 +++ 28 files changed, 84 insertions(+), 15 deletions(-) diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c index a2fe5d9b80e..f366ec8f1af 100644 --- a/tools/src/h5diff/h5diff_common.c +++ b/tools/src/h5diff/h5diff_common.c @@ -640,6 +640,12 @@ usage(void) 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, + " If none of the above options are used to specify a VOL for a file, then\n"); + PRINTVALSTREAM(rawoutstream, + " the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,\n"); + PRINTVALSTREAM(rawoutstream, + " if that environment variable is unset) will be used\n"); PRINTVALSTREAM(rawoutstream, " --vfd-value-1 Value (ID) of the VFL driver to use for opening the\n"); PRINTVALSTREAM(rawoutstream, " first HDF5 file specified\n"); diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index 0b85299b7e0..73b037f9e74 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -219,12 +219,9 @@ usage(const char *prog) PRINTVALSTREAM(rawoutstream, " --vol-info VOL-specific info to pass to the VOL connector used for\n"); PRINTVALSTREAM(rawoutstream, " opening the HDF5 file specified\n"); - PRINTVALSTREAM( - rawoutstream, - " If none of the above options are used to specify a VOL, then\n"); - PRINTVALSTREAM( - rawoutstream, - " the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used.\n"); + PRINTVALSTREAM(rawoutstream, " If none of the above options are used to specify a VOL, then\n"); + PRINTVALSTREAM(rawoutstream, " the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,\n"); + PRINTVALSTREAM(rawoutstream, " if that environment variable is unset) will be used\n"); PRINTVALSTREAM(rawoutstream, " --vfd-value Value (ID) of the VFL driver to use for opening the\n"); PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n"); diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index 5d9e184571d..74e663e343e 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -238,7 +238,14 @@ usage(void) PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n"); PRINTVALSTREAM(rawoutstream, " --vol-info VOL-specific info to pass to the VOL connector used for\n"); - PRINTVALSTREAM(rawoutstream, " opening the HDF5 file specified\n"); + PRINTVALSTREAM(rawoutstream, + " opening the HDF5 file specified\n"); + PRINTVALSTREAM(rawoutstream, + " If none of the above options are used to specify a VOL, then\n"); + PRINTVALSTREAM(rawoutstream, + " the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,\n"); + PRINTVALSTREAM(rawoutstream, + " if that environment variable is unset) will be used\n"); PRINTVALSTREAM(rawoutstream, " --vfd-value Value (ID) of the VFL driver to use for opening the\n"); PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n"); PRINTVALSTREAM(rawoutstream, " --vfd-name Name of the VFL driver to use for opening the\n"); diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c index c183a4124da..85fd3afe455 100644 --- a/tools/src/misc/h5mkgrp.c +++ b/tools/src/misc/h5mkgrp.c @@ -105,6 +105,9 @@ usage(const char *prog) PRINTVALSTREAM(rawoutstream, " --vol-info VOL-specific info to pass to the VOL connector used for\n"); PRINTVALSTREAM(rawoutstream, " opening the HDF5 file specified\n"); + PRINTVALSTREAM(rawoutstream, " If none of the above options are used to specify a VOL, then\n"); + PRINTVALSTREAM(rawoutstream, " the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,\n"); + PRINTVALSTREAM(rawoutstream, " if that environment variable is unset) will be used\n"); PRINTVALSTREAM(rawoutstream, " --vfd-value Value (ID) of the VFL driver to use for opening the\n"); PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n"); diff --git a/tools/test/h5diff/testfiles/h5diff_10.txt b/tools/test/h5diff/testfiles/h5diff_10.txt index fe3474c076c..dbd5418e623 100644 --- a/tools/test/h5diff/testfiles/h5diff_10.txt +++ b/tools/test/h5diff/testfiles/h5diff_10.txt @@ -37,6 +37,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_600.txt b/tools/test/h5diff/testfiles/h5diff_600.txt index eaf9c15ac19..46a1c45a109 100644 --- a/tools/test/h5diff/testfiles/h5diff_600.txt +++ b/tools/test/h5diff/testfiles/h5diff_600.txt @@ -37,6 +37,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_603.txt b/tools/test/h5diff/testfiles/h5diff_603.txt index aa0697aa6fd..e930dbe50b4 100644 --- a/tools/test/h5diff/testfiles/h5diff_603.txt +++ b/tools/test/h5diff/testfiles/h5diff_603.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_606.txt b/tools/test/h5diff/testfiles/h5diff_606.txt index 87d6b012926..02b80ebba54 100644 --- a/tools/test/h5diff/testfiles/h5diff_606.txt +++ b/tools/test/h5diff/testfiles/h5diff_606.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_612.txt b/tools/test/h5diff/testfiles/h5diff_612.txt index a44d94abc83..4cccecec36c 100644 --- a/tools/test/h5diff/testfiles/h5diff_612.txt +++ b/tools/test/h5diff/testfiles/h5diff_612.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_615.txt b/tools/test/h5diff/testfiles/h5diff_615.txt index 5dc9cd3716c..3641164ca39 100644 --- a/tools/test/h5diff/testfiles/h5diff_615.txt +++ b/tools/test/h5diff/testfiles/h5diff_615.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_621.txt b/tools/test/h5diff/testfiles/h5diff_621.txt index d7998b58ba6..05b952c875b 100644 --- a/tools/test/h5diff/testfiles/h5diff_621.txt +++ b/tools/test/h5diff/testfiles/h5diff_621.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_622.txt b/tools/test/h5diff/testfiles/h5diff_622.txt index badfddd6f37..4d3e9455011 100644 --- a/tools/test/h5diff/testfiles/h5diff_622.txt +++ b/tools/test/h5diff/testfiles/h5diff_622.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_623.txt b/tools/test/h5diff/testfiles/h5diff_623.txt index 6ddd3da1bff..fd992ef71cb 100644 --- a/tools/test/h5diff/testfiles/h5diff_623.txt +++ b/tools/test/h5diff/testfiles/h5diff_623.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/h5diff/testfiles/h5diff_624.txt b/tools/test/h5diff/testfiles/h5diff_624.txt index 083632a9d84..cc9578f84dc 100644 --- a/tools/test/h5diff/testfiles/h5diff_624.txt +++ b/tools/test/h5diff/testfiles/h5diff_624.txt @@ -38,6 +38,9 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] HDF5 file specified --vol-info-2 VOL-specific info to pass to the VOL connector used for opening the second HDF5 file specified + If none of the above options are used to specify a VOL for a file, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value-1 Value (ID) of the VFL driver to use for opening the first HDF5 file specified --vfd-name-1 Name of the VFL driver to use for opening the first diff --git a/tools/test/misc/testfiles/h5mkgrp_help.txt b/tools/test/misc/testfiles/h5mkgrp_help.txt index 5d81b347ae4..d01fbeecf7c 100644 --- a/tools/test/misc/testfiles/h5mkgrp_help.txt +++ b/tools/test/misc/testfiles/h5mkgrp_help.txt @@ -11,6 +11,9 @@ usage: h5mkgrp [OPTIONS] FILE GROUP... HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt index a64e850c28e..9274600ce03 100644 --- a/tools/testfiles/h5dump-help.txt +++ b/tools/testfiles/h5dump-help.txt @@ -33,7 +33,8 @@ usage: h5dump [OPTIONS] files --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified If none of the above options are used to specify a VOL, then - the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/help-1.ls b/tools/testfiles/help-1.ls index 6ed1aabd025..1cf733bc3a3 100644 --- a/tools/testfiles/help-1.ls +++ b/tools/testfiles/help-1.ls @@ -52,6 +52,9 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...] HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/help-2.ls b/tools/testfiles/help-2.ls index 6ed1aabd025..1cf733bc3a3 100644 --- a/tools/testfiles/help-2.ls +++ b/tools/testfiles/help-2.ls @@ -52,6 +52,9 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...] HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/help-3.ls b/tools/testfiles/help-3.ls index 6ed1aabd025..1cf733bc3a3 100644 --- a/tools/testfiles/help-3.ls +++ b/tools/testfiles/help-3.ls @@ -52,6 +52,9 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...] HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl index a64e850c28e..9274600ce03 100644 --- a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl +++ b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl @@ -33,7 +33,8 @@ usage: h5dump [OPTIONS] files --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified If none of the above options are used to specify a VOL, then - the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/testfiles/pbits/tpbitsIncomplete.ddl index a64e850c28e..9274600ce03 100644 --- a/tools/testfiles/pbits/tpbitsIncomplete.ddl +++ b/tools/testfiles/pbits/tpbitsIncomplete.ddl @@ -33,7 +33,8 @@ usage: h5dump [OPTIONS] files --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified If none of the above options are used to specify a VOL, then - the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl index a64e850c28e..9274600ce03 100644 --- a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl +++ b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl @@ -33,7 +33,8 @@ usage: h5dump [OPTIONS] files --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified If none of the above options are used to specify a VOL, then - the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/testfiles/pbits/tpbitsLengthPositive.ddl index a64e850c28e..9274600ce03 100644 --- a/tools/testfiles/pbits/tpbitsLengthPositive.ddl +++ b/tools/testfiles/pbits/tpbitsLengthPositive.ddl @@ -33,7 +33,8 @@ usage: h5dump [OPTIONS] files --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified If none of the above options are used to specify a VOL, then - the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl index a64e850c28e..9274600ce03 100644 --- a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl +++ b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl @@ -33,7 +33,8 @@ usage: h5dump [OPTIONS] files --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified If none of the above options are used to specify a VOL, then - the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl index a64e850c28e..9274600ce03 100644 --- a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl +++ b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl @@ -33,7 +33,8 @@ usage: h5dump [OPTIONS] files --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified If none of the above options are used to specify a VOL, then - the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl index a64e850c28e..9274600ce03 100644 --- a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl +++ b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl @@ -33,7 +33,8 @@ usage: h5dump [OPTIONS] files --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified If none of the above options are used to specify a VOL, then - the VOL specified by HDF5_VOL_CONNECTOR (if any) will be used. + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/textlinksrc-nodangle-1.ls b/tools/testfiles/textlinksrc-nodangle-1.ls index 6ed1aabd025..1cf733bc3a3 100644 --- a/tools/testfiles/textlinksrc-nodangle-1.ls +++ b/tools/testfiles/textlinksrc-nodangle-1.ls @@ -52,6 +52,9 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...] HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the diff --git a/tools/testfiles/tgroup-1.ls b/tools/testfiles/tgroup-1.ls index 6ed1aabd025..1cf733bc3a3 100644 --- a/tools/testfiles/tgroup-1.ls +++ b/tools/testfiles/tgroup-1.ls @@ -52,6 +52,9 @@ usage: h5ls [OPTIONS] file[/OBJECT] [file[/[OBJECT]...] HDF5 file specified --vol-info VOL-specific info to pass to the VOL connector used for opening the HDF5 file specified + If none of the above options are used to specify a VOL, then + the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector, + if that environment variable is unset) will be used --vfd-value Value (ID) of the VFL driver to use for opening the HDF5 file specified --vfd-name Name of the VFL driver to use for opening the From a6d0ddd9c570281062c44a63c325a36e00efcdaf Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 15:59:30 +0000 Subject: [PATCH 4/4] Committing clang-format changes --- tools/src/h5diff/h5diff_common.c | 9 +++++---- tools/src/h5dump/h5dump.c | 11 ++++++++--- tools/src/h5ls/h5ls.c | 10 ++++------ tools/src/misc/h5mkgrp.c | 10 +++++++--- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c index f366ec8f1af..fa2d13d29f0 100644 --- a/tools/src/h5diff/h5diff_common.c +++ b/tools/src/h5diff/h5diff_common.c @@ -640,10 +640,11 @@ usage(void) 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, - " If none of the above options are used to specify a VOL for a file, then\n"); - PRINTVALSTREAM(rawoutstream, - " the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,\n"); + PRINTVALSTREAM(rawoutstream, " If none of the above options are used to " + "specify a VOL for a file, then\n"); + PRINTVALSTREAM( + rawoutstream, + " the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,\n"); PRINTVALSTREAM(rawoutstream, " if that environment variable is unset) will be used\n"); PRINTVALSTREAM(rawoutstream, diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index 73b037f9e74..4a75740a674 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -219,9 +219,14 @@ usage(const char *prog) PRINTVALSTREAM(rawoutstream, " --vol-info VOL-specific info to pass to the VOL connector used for\n"); PRINTVALSTREAM(rawoutstream, " opening the HDF5 file specified\n"); - PRINTVALSTREAM(rawoutstream, " If none of the above options are used to specify a VOL, then\n"); - PRINTVALSTREAM(rawoutstream, " the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,\n"); - PRINTVALSTREAM(rawoutstream, " if that environment variable is unset) will be used\n"); + PRINTVALSTREAM( + rawoutstream, + " If none of the above options are used to specify a VOL, then\n"); + PRINTVALSTREAM( + rawoutstream, + " the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,\n"); + PRINTVALSTREAM(rawoutstream, + " if that environment variable is unset) will be used\n"); PRINTVALSTREAM(rawoutstream, " --vfd-value Value (ID) of the VFL driver to use for opening the\n"); PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n"); diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index 74e663e343e..0dfefbed931 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -238,14 +238,12 @@ usage(void) PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n"); PRINTVALSTREAM(rawoutstream, " --vol-info VOL-specific info to pass to the VOL connector used for\n"); - PRINTVALSTREAM(rawoutstream, - " opening the HDF5 file specified\n"); - PRINTVALSTREAM(rawoutstream, + PRINTVALSTREAM(rawoutstream, " opening the HDF5 file specified\n"); + PRINTVALSTREAM(rawoutstream, " If none of the above options are used to specify a VOL, then\n"); - PRINTVALSTREAM(rawoutstream, + PRINTVALSTREAM(rawoutstream, " the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,\n"); - PRINTVALSTREAM(rawoutstream, - " if that environment variable is unset) will be used\n"); + PRINTVALSTREAM(rawoutstream, " if that environment variable is unset) will be used\n"); PRINTVALSTREAM(rawoutstream, " --vfd-value Value (ID) of the VFL driver to use for opening the\n"); PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n"); PRINTVALSTREAM(rawoutstream, " --vfd-name Name of the VFL driver to use for opening the\n"); diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c index 85fd3afe455..453e99af3b2 100644 --- a/tools/src/misc/h5mkgrp.c +++ b/tools/src/misc/h5mkgrp.c @@ -105,9 +105,13 @@ usage(const char *prog) PRINTVALSTREAM(rawoutstream, " --vol-info VOL-specific info to pass to the VOL connector used for\n"); PRINTVALSTREAM(rawoutstream, " opening the HDF5 file specified\n"); - PRINTVALSTREAM(rawoutstream, " If none of the above options are used to specify a VOL, then\n"); - PRINTVALSTREAM(rawoutstream, " the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,\n"); - PRINTVALSTREAM(rawoutstream, " if that environment variable is unset) will be used\n"); + PRINTVALSTREAM(rawoutstream, + " If none of the above options are used to specify a VOL, then\n"); + PRINTVALSTREAM( + rawoutstream, + " the VOL named by HDF5_VOL_CONNECTOR (or the native VOL connector,\n"); + PRINTVALSTREAM(rawoutstream, + " if that environment variable is unset) will be used\n"); PRINTVALSTREAM(rawoutstream, " --vfd-value Value (ID) of the VFL driver to use for opening the\n"); PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n");