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/src | |
| 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/src')
| -rw-r--r-- | tools/src/h5dump/h5dump_xml.c | 4 | ||||
| -rw-r--r-- | tools/src/h5format_convert/h5format_convert.c | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c index ec76511..2fa9fd0 100644 --- a/tools/src/h5dump/h5dump_xml.c +++ b/tools/src/h5dump/h5dump_xml.c @@ -2881,7 +2881,7 @@ xml_print_refs(hid_t did, int source) goto error; } - refbuf = (hobj_ref_t *) buf; + refbuf = (hobj_ref_t *)((void *)buf); /* setup */ HDmemset(&buffer, 0, sizeof(h5tools_str_t)); @@ -3057,7 +3057,7 @@ xml_print_strs(hid_t did, int source) for (i = 0; i < (hsize_t)ssiz; i++) { if (is_vlstr) { - onestring = *(char **) bp; + onestring = *(char **)((void *)bp); if (onestring) str_size = HDstrlen(onestring); } diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c index 5fb02f4..257a047 100644 --- a/tools/src/h5format_convert/h5format_convert.c +++ b/tools/src/h5format_convert/h5format_convert.c @@ -259,22 +259,20 @@ convert(hid_t fid, const char *dname) error_msg("unable to get the chunk indexing type for \"%s\"\n", dname); h5tools_setstatus(EXIT_FAILURE); goto error; - } - else if(verbose_g) { - HDfprintf(stdout, "Retrieve the dataset's chunk indexing type\n"); } + else if(verbose_g) + HDfprintf(stdout, "Retrieve the dataset's chunk indexing type\n"); if(idx_type == H5D_CHUNK_IDX_BTREE) { if(verbose_g) HDfprintf(stdout, "Dataset's chunk indexing type is already version 1 B-tree: no further action\n"); h5tools_setstatus(EXIT_SUCCESS); goto done; - } - else if(verbose_g) { - HDfprintf(stdout, "Dataset's chunk indexing type is not version 1 B-tree\n"); } + else if (verbose_g) + HDfprintf(stdout, "Dataset's chunk indexing type is not version 1 B-tree\n"); - break; + break; case H5D_CONTIGUOUS: if(verbose_g) |