mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix jni with %Lg instead of %Lf

Browse Source 
Fix warnings due to improper formed define tag in h5diff
This commit is contained in:
Allen Byrne 2020-09-29 11:42:17 -05:00
parent 274cd0ba1d
commit 3f15fb3522
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/jni/h5util.c
View File

@ -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;
}

8
tools/src/h5diff/h5diff_common.c
View File

@ -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");

2
tools/test/h5diff/CMakeTests.cmake
View File

@ -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

2
tools/test/h5diff/testh5diff.sh.in
View File

@ -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