diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-17 14:28:40 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-03-17 14:28:40 (GMT) |
| commit | f2aa62ec76993c04c807c27e7a577a1ac3b0da3f (patch) | |
| tree | 8bfa87fd91e47b88afc4c98e2ba0c2c97e3a10f1 /test/gen_cross.c | |
| parent | 4ffe2f78c524e8edfc4be77117187870a5fd5a7a (diff) | |
| download | hdf5-f2aa62ec76993c04c807c27e7a577a1ac3b0da3f.zip hdf5-f2aa62ec76993c04c807c27e7a577a1ac3b0da3f.tar.gz hdf5-f2aa62ec76993c04c807c27e7a577a1ac3b0da3f.tar.bz2 | |
[svn-r24810] Description:
Bring r24803 & r24804 from trunk to 1.8 branch:
r24804:
Brought changes from Coverity branch back to trunk, and cleaned up misc.
other warnings & formatting issues:
r20833:
Fixed Coverity 667 and 668 with real integer overflow tests this time.
r20834:
Use HDstrncpy and HDstrncat. --gh
r20835:
Change to use strncpy - use base_len + 1 for line 156, use HDstrlen(path) + 1 for line 159
r20836:
Fixed coverity 585 by casting output of fgetc() to a char.
r20837:
Changed sprintf calls to snprintf with size 1 less than the allocated buffer to address coverity issue #967.
r24803:
Rename GCC_DIAG_OFF/ON macros to H5_GCC_DIAG_OFF/ON and move from
src/H5private.h to src/H5public.h. Wrap typedef of hsize_t and hssize_t
in DIAG_OFF(long-long) macros.
Clean up a bunch of "macro '-' is unused" warnings.
Tested on:
Mac OSX/64 10.9.2 (amazon) w/C++, FORTRAN & parallel
(too minor to require h5committest)
Diffstat (limited to 'test/gen_cross.c')
| -rw-r--r-- | test/gen_cross.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/gen_cross.c b/test/gen_cross.c index 8cbb2f5..bdc2835 100644 --- a/test/gen_cross.c +++ b/test/gen_cross.c @@ -46,8 +46,10 @@ #define DATASETNAME15 "Fletcher_float_data_be" #define DATASETNAME16 "Deflate_float_data_le" #define DATASETNAME17 "Deflate_float_data_be" +#ifdef H5_HAVE_FILTER_SZIP #define DATASETNAME18 "Szip_float_data_le" #define DATASETNAME19 "Szip_float_data_be" +#endif /* H5_HAVE_FILTER_SZIP */ #define DATASETNAME20 "Shuffle_float_data_le" #define DATASETNAME21 "Shuffle_float_data_be" #define DATASETNAME22 "Nbit_float_data_le" |