diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2019-06-29 00:30:41 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2019-06-29 00:30:41 (GMT) |
| commit | f97ea92fe5450cefd4c4d9fb266e7f42a952f2f9 (patch) | |
| tree | a90c9464b052898428c596e7c085683024141890 /tools/lib/h5tools.c | |
| parent | 13d951d37205bcd48723330a898e5d67c5e1ecb2 (diff) | |
| parent | 6ced6457c3048bd10bf6f470b329b4810d9be826 (diff) | |
| download | hdf5-f97ea92fe5450cefd4c4d9fb266e7f42a952f2f9.zip hdf5-f97ea92fe5450cefd4c4d9fb266e7f42a952f2f9.tar.gz hdf5-f97ea92fe5450cefd4c4d9fb266e7f42a952f2f9.tar.bz2 | |
Merge pull request #1784 in HDFFV/hdf5 from ~KOZIOL/hdf5:feature/update_gcc_flags to develop
* commit '6ced6457c3048bd10bf6f470b329b4810d9be826':
Move the -Wformat-nonliteral warning to the developer flags. Fix bugs I introduced in the last commit.
Updated configure & CMake compiler flags for GCC 8.x, along with corresponding changes to warnhist script (and some extra improvements for condensing C++ and Java warnings), and fixed a bunch of warnings.
Diffstat (limited to 'tools/lib/h5tools.c')
| -rw-r--r-- | tools/lib/h5tools.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index d93f7b0..f103647 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -1283,7 +1283,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t mem = ((unsigned char*)_mem) + block_index * size; if (H5Tis_variable_str(tid)) { - s = *(char**) mem; + s = *(char **)((void *)mem); if (s != NULL) size = HDstrlen(s); else @@ -1375,10 +1375,10 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t for (block_index = 0; block_index < block_nelmts; block_index++) { mem = ((unsigned char*)_mem) + block_index * size; /* Get the number of sequence elements */ - nelmts = ((hvl_t *) mem)->len; + nelmts = ((hvl_t *)((void *)mem))->len; /* dump the array element */ - if (render_bin_output(stream, container, memb, ((char *) (((hvl_t *) mem)->p)), nelmts) < 0) { + if (render_bin_output(stream, container, memb, ((char *) (((hvl_t *)((void *)mem))->p)), nelmts) < 0) { H5Tclose(memb); H5E_THROW(FAIL, H5E_tools_min_id_g, "render_bin_output failed") } |