diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-07-28 11:42:41 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-28 11:42:41 (GMT) |
commit | f563c2b926445f7a975553bc7742a38f42d3b6f4 (patch) | |
tree | fd21684ce4e86bd32d945ba1bd3d8065dbcf194f /tools/src/h5dump | |
parent | fe4b1c572841fff38a6b9422ea63d345ccfa96bf (diff) | |
download | hdf5-f563c2b926445f7a975553bc7742a38f42d3b6f4.zip hdf5-f563c2b926445f7a975553bc7742a38f42d3b6f4.tar.gz hdf5-f563c2b926445f7a975553bc7742a38f42d3b6f4.tar.bz2 |
Sync tools with develop (#3301)
Diffstat (limited to 'tools/src/h5dump')
-rw-r--r-- | tools/src/h5dump/h5dump.c | 33 | ||||
-rw-r--r-- | tools/src/h5dump/h5dump_ddl.c | 2 | ||||
-rw-r--r-- | tools/src/h5dump/h5dump_defines.h | 4 | ||||
-rw-r--r-- | tools/src/h5dump/h5dump_xml.c | 4 |
4 files changed, 27 insertions, 16 deletions
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index 73309cd..1458354 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -32,12 +32,15 @@ static hbool_t get_onion_revision_count = FALSE; #ifdef H5_HAVE_ROS3_VFD /* Default "anonymous" S3 configuration */ -static H5FD_ros3_fapl_t ros3_fa_g = { - 1, /* Structure Version */ - FALSE, /* Authenticate? */ - "", /* AWS Region */ - "", /* Access Key ID */ - "", /* Secret Access Key */ +static H5FD_ros3_fapl_ext_t ros3_fa_g = { + { + 1, /* Structure Version */ + FALSE, /* Authenticate? */ + "", /* AWS Region */ + "", /* Access Key ID */ + "", /* Secret Access Key */ + }, + "", /* Session/security token */ }; #endif /* H5_HAVE_ROS3_VFD */ @@ -219,6 +222,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, " --vfd-value Value (ID) of the VFL driver to use for opening the\n"); PRINTVALSTREAM(rawoutstream, " HDF5 file specified\n"); @@ -594,7 +605,7 @@ parse_mask_list(const char *h_list) ptr = h_list; while (*ptr) { /* scan for an offset which is an unsigned int */ - if (!HDisdigit(*ptr)) { + if (!isdigit(*ptr)) { error_msg("Bad mask list(%s)\n", h_list); return FAIL; } @@ -607,7 +618,7 @@ parse_mask_list(const char *h_list) } /* skip to end of integer */ - while (HDisdigit(*++ptr)) + while (isdigit(*++ptr)) ; /* Look for the common separator */ if (*ptr++ != ',') { @@ -616,7 +627,7 @@ parse_mask_list(const char *h_list) } /* scan for a length which is a positive int */ - if (!HDisdigit(*ptr)) { + if (!isdigit(*ptr)) { error_msg("Bad mask list(%s)\n", h_list); return FAIL; } @@ -633,7 +644,7 @@ parse_mask_list(const char *h_list) } /* skip to end of int */ - while (HDisdigit(*++ptr)) + while (isdigit(*++ptr)) ; /* store the offset,length pair */ @@ -1230,7 +1241,7 @@ end_collect: get_onion_revision_count = TRUE; else { errno = 0; - onion_fa_g.revision_num = HDstrtoull(vfd_info_g.info, NULL, 10); + onion_fa_g.revision_num = strtoull(vfd_info_g.info, NULL, 10); if (errno == ERANGE) { printf("Invalid onion revision specified\n"); goto error; diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c index a69aeac..da9093c 100644 --- a/tools/src/h5dump/h5dump_ddl.c +++ b/tools/src/h5dump/h5dump_ddl.c @@ -1649,7 +1649,7 @@ error: H5Oclose(oid); H5Aclose(attr_id); } - H5E_END_TRY; + H5E_END_TRY dump_indent -= COL; } diff --git a/tools/src/h5dump/h5dump_defines.h b/tools/src/h5dump/h5dump_defines.h index bb4236d..5f89178 100644 --- a/tools/src/h5dump/h5dump_defines.h +++ b/tools/src/h5dump/h5dump_defines.h @@ -28,7 +28,7 @@ else { \ PRINTSTREAM(rawoutstream, "%s %s", (obj), (begin)); \ } \ - } while (0); + } while (0) #define end_obj(obj, end) \ do { \ @@ -39,7 +39,7 @@ } \ if (HDstrlen(obj)) \ PRINTSTREAM(rawoutstream, "%s", obj); \ - } while (0); + } while (0) /* 3 private values: can't be set, but can be read. Note: these are defined in H5Zprivate, they are diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c index 95c99f6..cb279e3 100644 --- a/tools/src/h5dump/h5dump_xml.c +++ b/tools/src/h5dump/h5dump_xml.c @@ -3069,7 +3069,7 @@ error: H5Tclose(type); H5Sclose(space); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } @@ -3238,7 +3238,7 @@ error: H5Tclose(type); H5Sclose(space); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } |