summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2022-08-03 12:46:33 (GMT)
committerGitHub <noreply@github.com>2022-08-03 12:46:33 (GMT)
commita71534fcc248737491adcfd770c7ab69b4adc2d4 (patch)
treed20b88338c230be6663b86bc5a918faaab944ed8
parentfcf41b3cd60df51af9be529e379a9dd6c488d088 (diff)
downloadhdf5-a71534fcc248737491adcfd770c7ab69b4adc2d4.zip
hdf5-a71534fcc248737491adcfd770c7ab69b4adc2d4.tar.gz
hdf5-a71534fcc248737491adcfd770c7ab69b4adc2d4.tar.bz2
Corrects some bad format strings in the tools (#1964)
-rw-r--r--tools/lib/h5tools_dump.c17
-rw-r--r--tools/src/h5ls/h5ls.c2
2 files changed, 11 insertions, 8 deletions
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index a651230..ae2f66d 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -2202,9 +2202,8 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
sign_s = " unknown-sign";
/* print size, order, sign, and precision */
- h5tools_str_append(buffer, "%lu-bit%s%s integer %lu-bit precision",
- (unsigned long)(8 * H5Tget_size(type)), order_s, sign_s,
- H5Tget_precision(type));
+ h5tools_str_append(buffer, "%zu-bit%s%s integer %zu-bit precision", 8 * H5Tget_size(type),
+ order_s, sign_s, H5Tget_precision(type));
}
break;
@@ -2243,8 +2242,8 @@ h5tools_print_datatype(FILE *stream, h5tools_str_t *buffer, const h5tool_format_
order_s = "";
/* print size. byte order, and precision */
- h5tools_str_append(buffer, "%lu-bit%s floating-point %lu-bit precision",
- (unsigned long)(8 * H5Tget_size(type)), order_s, H5Tget_precision(type));
+ h5tools_str_append(buffer, "%zu-bit%s floating-point %zu-bit precision",
+ 8 * H5Tget_size(type), order_s, H5Tget_precision(type));
}
break;
@@ -3287,7 +3286,11 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
h5tools_str_reset(&buffer);
h5tools_str_append(&buffer, "FILENAME %s SIZE %" PRIuHSIZE, name, size);
- h5tools_str_append(&buffer, " OFFSET %ld", offset);
+ /* Using %lld with a cast to (long long) is probably the only portable
+ * way to print off_t values. There's no real standard for off_t other
+ * than it must be signed, according to POSIX.
+ */
+ h5tools_str_append(&buffer, " OFFSET %lld", (long long)offset);
h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
(hsize_t)0);
}
@@ -3360,7 +3363,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
ctx->need_prefix = TRUE;
h5tools_str_reset(&buffer);
- h5tools_str_append(&buffer, "%s %ld %s ", VDS_MAPPING, curr_vmap, BEGIN);
+ h5tools_str_append(&buffer, "%s %zu %s ", VDS_MAPPING, curr_vmap, BEGIN);
h5tools_render_element(stream, info, ctx, &buffer, &curr_pos, (size_t)ncols, (hsize_t)0,
(hsize_t)0);
diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c
index a14bb79..eed8b2e 100644
--- a/tools/src/h5ls/h5ls.c
+++ b/tools/src/h5ls/h5ls.c
@@ -1928,7 +1928,7 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name)
if (vmaps) {
size_t next;
- h5tools_str_append(&buffer, " %-10s {%ld} Source {\n", "Maps:", vmaps);
+ h5tools_str_append(&buffer, " %-10s {%zu} Source {\n", "Maps:", vmaps);
for (next = 0; next < (unsigned)vmaps; next++) {
H5Pget_virtual_filename(dcpl, next, f_name, sizeof(f_name));
H5Pget_virtual_dsetname(dcpl, next, dset_name, sizeof(dset_name));