diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5F.c | 7 | ||||
| -rw-r--r-- | src/H5Pprivate.h | 20 | ||||
| -rw-r--r-- | src/H5Psimp.c | 8 |
3 files changed, 17 insertions, 18 deletions
@@ -64,8 +64,7 @@ static char RcsId[] = "@(#)$Revision$"; /* * Define the default file creation template. */ -const H5F_create_t H5F_create_dflt = -{ +const H5F_create_t H5F_create_dflt = { 0, /* Default user-block size */ 4, /* Default 1/2 rank for symtab leaf nodes */ { /* Default 1/2 rank for btree intern nodes */ @@ -78,8 +77,8 @@ const H5F_create_t H5F_create_dflt = 0, /* unused */ 0, /* unused */ }, - 4, /* Default offset size */ - 4, /* Default length size */ + sizeof(size_t), /* Default offset size */ + sizeof(size_t), /* Default length size */ HDF5_BOOTBLOCK_VERSION, /* Current Boot-Block version # */ HDF5_SMALLOBJECT_VERSION, /* Current Small-Object heap version # */ HDF5_FREESPACE_VERSION, /* Current Free-Space info version # */ diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h index b64711e..d91dfc4 100644 --- a/src/H5Pprivate.h +++ b/src/H5Pprivate.h @@ -70,23 +70,23 @@ typedef struct H5P_tconv_t { /* Gather elements from disk to type conversion buffer */ size_t (*fgath)(H5F_t *f, const struct H5O_layout_t *layout, size_t elmt_size, const H5P_t *file_space, - const H5P_number_t *numbering, intn start, intn nelmts, + const H5P_number_t *numbering, size_t start, size_t nelmts, void *tconv_buf/*out*/); /* Scatter elements from type conversion buffer to application buffer */ herr_t (*mscat)(const void *tconv_buf, size_t elmt_size, const H5P_t *mem_space, const H5P_number_t *numbering, - intn start, intn nelmts, void *buf/*out*/); + size_t start, size_t nelmts, void *buf/*out*/); /* Gather elements from app buffer to type conversion buffer */ size_t (*mgath)(const void *buf, size_t elmt_size, const H5P_t *mem_space, const H5P_number_t *numbering, - intn start, intn nelmts, void *tconv_buf/*out*/); + size_t start, size_t nelmts, void *tconv_buf/*out*/); /* Scatter elements from type conversion buffer to disk */ herr_t (*fscat)(H5F_t *f, const struct H5O_layout_t *layout, size_t elmt_size, const H5P_t *file_space, - const H5P_number_t *numbering, intn start, intn nelmts, + const H5P_number_t *numbering, size_t start, size_t nelmts, const void *tconv_buf); } H5P_conv_t; @@ -111,16 +111,16 @@ size_t H5P_simp_init (const struct H5O_layout_t *layout, H5P_number_t *numbering/*out*/); size_t H5P_simp_fgath (H5F_t *f, const struct H5O_layout_t *layout, size_t elmt_size, const H5P_t *file_space, - const H5P_number_t *numbering, intn start, - intn nelmts, void *tconv_buf/*out*/); + const H5P_number_t *numbering, size_t start, + size_t nelmts, void *tconv_buf/*out*/); herr_t H5P_simp_mscat (const void *tconv_buf, size_t elmt_size, const H5P_t *mem_space, const H5P_number_t *numbering, - intn start, intn nelmts, void *buf/*out*/); + size_t start, size_t nelmts, void *buf/*out*/); size_t H5P_simp_mgath (const void *buf, size_t elmt_size, const H5P_t *mem_space, const H5P_number_t *numbering, - intn start, intn nelmts, void *tconv_buf/*out*/); + size_t start, size_t nelmts, void *tconv_buf/*out*/); herr_t H5P_simp_fscat (H5F_t *f, const struct H5O_layout_t *layout, size_t elmt_size, const H5P_t *file_space, - const H5P_number_t *numbering, intn start, - intn nelmts, const void *tconv_buf); + const H5P_number_t *numbering, size_t start, + size_t nelmts, const void *tconv_buf); #endif diff --git a/src/H5Psimp.c b/src/H5Psimp.c index f9caccd..7f78236 100644 --- a/src/H5Psimp.c +++ b/src/H5Psimp.c @@ -86,7 +86,7 @@ H5P_simp_init (const struct H5O_layout_t *layout, const H5P_t *mem_space, size_t H5P_simp_fgath (H5F_t *f, const struct H5O_layout_t *layout, size_t elmt_size, const H5P_t *file_space, - const H5P_number_t *numbering, intn start, intn nelmts, + const H5P_number_t *numbering, size_t start, size_t nelmts, void *buf/*out*/) { size_t file_offset[H5O_LAYOUT_NDIMS]; /*offset of slab in file*/ @@ -185,7 +185,7 @@ H5P_simp_fgath (H5F_t *f, const struct H5O_layout_t *layout, herr_t H5P_simp_mscat (const void *tconv_buf, size_t elmt_size, const H5P_t *mem_space, const H5P_number_t *numbering, - intn start, intn nelmts, void *buf/*out*/) + size_t start, size_t nelmts, void *buf/*out*/) { size_t mem_offset[H5O_LAYOUT_NDIMS]; /*slab offset in app buf*/ size_t mem_size[H5O_LAYOUT_NDIMS]; /*total size of app buf */ @@ -290,7 +290,7 @@ H5P_simp_mscat (const void *tconv_buf, size_t elmt_size, size_t H5P_simp_mgath (const void *buf, size_t elmt_size, const H5P_t *mem_space, const H5P_number_t *numbering, - intn start, intn nelmts, void *tconv_buf/*out*/) + size_t start, size_t nelmts, void *tconv_buf/*out*/) { size_t mem_offset[H5O_LAYOUT_NDIMS]; /*slab offset in app buf*/ size_t mem_size[H5O_LAYOUT_NDIMS]; /*total size of app buf */ @@ -394,7 +394,7 @@ H5P_simp_mgath (const void *buf, size_t elmt_size, herr_t H5P_simp_fscat (H5F_t *f, const struct H5O_layout_t *layout, size_t elmt_size, const H5P_t *file_space, - const H5P_number_t *numbering, intn start, intn nelmts, + const H5P_number_t *numbering, size_t start, size_t nelmts, const void *buf) { size_t file_offset[H5O_LAYOUT_NDIMS]; /*offset of hyperslab */ |