diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-23 16:50:42 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-23 16:50:42 (GMT) |
| commit | 710d1caf54cc4edb47ef83280b6d5a1af445b9d1 (patch) | |
| tree | afd07de632487436fa2b032ead09fd1c3209804e | |
| parent | 0e8941b0881e5b39dbf87f2456c40eeb148dc79b (diff) | |
| download | hdf5-710d1caf54cc4edb47ef83280b6d5a1af445b9d1.zip hdf5-710d1caf54cc4edb47ef83280b6d5a1af445b9d1.tar.gz hdf5-710d1caf54cc4edb47ef83280b6d5a1af445b9d1.tar.bz2 | |
[svn-r29531] Normalization w/ revise_chunks in preparation for big merge.
hl and bin directories
Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
autotools serial w/ Java, Fortran, & C++
| -rwxr-xr-x | bin/cmakehdf5 | 2 | ||||
| -rw-r--r-- | hl/src/H5DOpublic.h | 10 | ||||
| -rw-r--r-- | hl/src/H5TB.c | 2 | ||||
| -rw-r--r-- | hl/test/Makefile.am | 1 | ||||
| -rw-r--r-- | hl/test/test_dset_opt.c | 2 |
5 files changed, 6 insertions, 11 deletions
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5 index ccef469..7f6453a 100755 --- a/bin/cmakehdf5 +++ b/bin/cmakehdf5 @@ -29,7 +29,7 @@ exit_code=0 # and should have invoked as "$srcdir/bin/$progname" or # "bin/$progname". So, by striping bin/$program from $0, # we can find $srcdir. -if [ $0 == bin/$progname ]; then +if [ "$0" = "bin/${progname}" ]; then srcdir="." # current directory else # $0 is $srdir/bin/$progname diff --git a/hl/src/H5DOpublic.h b/hl/src/H5DOpublic.h index 774709e..9cf6921 100644 --- a/hl/src/H5DOpublic.h +++ b/hl/src/H5DOpublic.h @@ -22,17 +22,13 @@ extern "C" { /*------------------------------------------------------------------------- * - * Direct chunk write function + * "Optimized dataset" routines. * *------------------------------------------------------------------------- */ -H5_HLDLL herr_t H5DOwrite_chunk(hid_t dset_id, - hid_t dxpl_id, - uint32_t filters, - const hsize_t *offset, - size_t data_size, - const void *buf); +H5_HLDLL herr_t H5DOwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, + const hsize_t *offset, size_t data_size, const void *buf); #ifdef __cplusplus } diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c index 0f90393..bcd3339 100644 --- a/hl/src/H5TB.c +++ b/hl/src/H5TB.c @@ -3248,7 +3248,7 @@ out: * *------------------------------------------------------------------------- */ -static +H5_ATTR_PURE static hbool_t H5TB_find_field(const char *field, const char *field_list) { const char *start = field_list; diff --git a/hl/test/Makefile.am b/hl/test/Makefile.am index 32d14b6..bea760e 100644 --- a/hl/test/Makefile.am +++ b/hl/test/Makefile.am @@ -1,4 +1,3 @@ -# # Copyright by The HDF Group. # Copyright by the Board of Trustees of the University of Illinois. # All rights reserved. diff --git a/hl/test/test_dset_opt.c b/hl/test/test_dset_opt.c index a8ffa44..c1e369e 100644 --- a/hl/test/test_dset_opt.c +++ b/hl/test/test_dset_opt.c @@ -41,7 +41,7 @@ #define CHUNK_NX 4 #define CHUNK_NY 4 -#define DEFLATE_SIZE_ADJUST(s) (ceil(((double)(s))*1.001F)+12) +#define DEFLATE_SIZE_ADJUST(s) (ceil(((double)(s))*(double)1.001F)+12) /* Temporary filter IDs used for testing */ #define H5Z_FILTER_BOGUS1 305 |