diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-09-29 16:42:17 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-09-29 16:42:17 (GMT) |
| commit | 3f15fb35222a0fb2ba2f1f88a2d78daaea633ec8 (patch) | |
| tree | 68133f7b0915277221a0cfdb2595b011d80e9cfb | |
| parent | 274cd0ba1d83fa515df43bbd50284bc6c36e4061 (diff) | |
| download | hdf5-3f15fb35222a0fb2ba2f1f88a2d78daaea633ec8.zip hdf5-3f15fb35222a0fb2ba2f1f88a2d78daaea633ec8.tar.gz hdf5-3f15fb35222a0fb2ba2f1f88a2d78daaea633ec8.tar.bz2 | |
Fix jni with %Lg instead of %Lf
Fix warnings due to improper formed define tag in h5diff
| -rw-r--r-- | java/src/jni/h5util.c | 4 | ||||
| -rw-r--r-- | tools/src/h5diff/h5diff_common.c | 8 | ||||
| -rw-r--r-- | tools/test/h5diff/CMakeTests.cmake | 2 | ||||
| -rw-r--r-- | tools/test/h5diff/testh5diff.sh.in | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c index eccf7ef..8c3686d 100644 --- a/java/src/jni/h5util.c +++ b/java/src/jni/h5util.c @@ -784,10 +784,8 @@ h5str_sprintf if (NULL == (this_str = (char *) HDmalloc(27))) H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer"); - H5_GCC_DIAG_OFF("format-overflow") - if (HDsprintf(this_str, "%Lf", tmp_ldouble) < 0) + if (HDsprintf(this_str, "%Lg", tmp_ldouble) < 0) H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure"); - H5_GCC_DIAG_ON("format-overflow") break; } diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c index 8ed2d37..a381711 100644 --- a/tools/src/h5diff/h5diff_common.c +++ b/tools/src/h5diff/h5diff_common.c @@ -75,7 +75,7 @@ static void check_options(diff_opt_t* opts) } } -#if TRILABS-227 +#if TRILABS_227 /*------------------------------------------------------------------------- * Function: parse_hsize_list * @@ -478,10 +478,10 @@ void parse_command_line(int argc, const char* argv[], const char** fname1, const H5TOOLS_DEBUG("objname2 = %s", *objname2); /* - * TRILABS-227 is complete except for an issue with printing indices + * TRILABS_227 is complete except for an issue with printing indices * the following calls will enable subsetting */ -#if TRILABS-227 +#if TRILABS_227 opts->sset[0] = parse_subset_params(*objname1); opts->sset[1] = parse_subset_params(*objname2); @@ -762,7 +762,7 @@ void usage(void) PRINTVALSTREAM(rawoutstream, " symbolic links are compared.).\n"); PRINTVALSTREAM(rawoutstream, "\n"); /* - * TRILABS-227 is complete except for an issue with printing indices + * TRILABS_227 is complete except for an issue with printing indices * the following will be needed for subsetting PRINTVALSTREAM(rawoutstream, " Subsetting options:\n"); PRINTVALSTREAM(rawoutstream, " Subsetting is available by using the fcompact form of subsetting, as follows:\n"); diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake index 4e8e8d1..4e5ce5c 100644 --- a/tools/test/h5diff/CMakeTests.cmake +++ b/tools/test/h5diff/CMakeTests.cmake @@ -1549,7 +1549,7 @@ ADD_H5_TEST (h5diff_801 1 -v ${FILE7} ${FILE8A} /g1/array /g1/array) # ############################################################################## # # dataset subsets # ############################################################################## -#TRILABS-227 ADD_H5_TEST (h5diff_830 1 --enable-error-stack -v ${FILE7} ${FILE8} /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;]) +#TRILABS_227 ADD_H5_TEST (h5diff_830 1 --enable-error-stack -v ${FILE7} ${FILE8} /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;]) # ############################################################################## # # VDS tests diff --git a/tools/test/h5diff/testh5diff.sh.in b/tools/test/h5diff/testh5diff.sh.in index 587c340..bbee564 100644 --- a/tools/test/h5diff/testh5diff.sh.in +++ b/tools/test/h5diff/testh5diff.sh.in @@ -1205,7 +1205,7 @@ TOOLTEST h5diff_801.txt -v h5diff_dset1.h5 h5diff_dset3.h5 /g1/array /g1/array # ############################################################################## # # dataset subsets # ############################################################################## -#TRILABS-227 TOOLTEST h5diff_830.txt --enable-error-stack -v h5diff_dset1.h5 h5diff_dset2.h5 /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;] +#TRILABS_227 TOOLTEST h5diff_830.txt --enable-error-stack -v h5diff_dset1.h5 h5diff_dset2.h5 /g1/array3D[0,0,0;2,2,1;2,2,2;] /g1/array3D[0,0,0;2,2,1;2,2,2;] # ############################################################################## # VDS tests |