diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-04-08 21:43:02 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-04-08 21:43:02 (GMT) |
commit | c01750fa740943c0083711b353278143c79d50a3 (patch) | |
tree | fd475b7c7a3639c05b30625b43547850d687b948 /src/H5Sprivate.h | |
parent | 68fa66bf8130d6a6e607e233da8cc61a154bf172 (diff) | |
download | hdf5-c01750fa740943c0083711b353278143c79d50a3.zip hdf5-c01750fa740943c0083711b353278143c79d50a3.tar.gz hdf5-c01750fa740943c0083711b353278143c79d50a3.tar.bz2 |
[svn-r338] Changes since 19980407
----------------------
./src/H5B.c
./src/H5D.c
./src/H5Dprivate.h
./src/H5Dpublic.h
./src/H5F.c
./src/H5Farray.c
./src/H5Fcore.c
./src/H5Ffamily.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fprivate.h
./src/H5Fpublic.h
./src/H5Fsec2.c
./src/H5Fsplit.c
./src/H5Fstdio.c
./src/H5G.c
./src/H5Gent.c
./src/H5Gnode.c
./src/H5HG.c
./src/H5HL.c
./src/H5MF.c
./src/H5MFprivate.h
./src/H5O.c
./src/H5Ocont.c
./src/H5Odtype.c
./src/H5Oefl.c
./src/H5Olayout.c
./src/H5Oname.c
./src/H5Oprivate.h
./src/H5Osdspace.c
./src/H5Oshared.c
./src/H5Ostab.c
./src/H5P.c
./src/H5Ppublic.h
./src/H5S.c
./src/H5Sprivate.h
./src/H5Spublic.h
./src/H5Ssimp.c
./src/H5Tconv.c
./src/H5Tpkg.h
./src/H5V.c
./src/H5Vprivate.h
./src/H5private.h
./src/H5public.h
./src/h5ls.c
./test/cmpd_dset.c
./test/dsets.c
./test/extend.c
./test/external.c
./test/hyperslab.c
./test/iopipe.c
./test/istore.c
./test/shtype.c
./test/tfile.c
./test/th5s.c
Anything having to do with the size of a dataset now uses the
types `hsize_t' and `hssize_t' which must be the same size and
at least as large as `size_t'. This isn't fully tested yet,
so hsize_t and hssize_t are defined as size_t and ssize_t in
H5public.h. Setting them to larger values will trip up gcc
versions less than 2.8.1 on x86 platforms.
Documented unused function formals with `__unused__' before
the formal name. This also has the effect of supressing
warning messages for gcc since it's defined to be
`__attribute__((unused))' in the H5private.h file.
./src/debug.c
./src/h5ls.c
If the file name contains a `%' then the file is opened as a
file family with H5P_DEFAULT for the file member access
property list.
./src/h5ls.c
The group name is optional, defaulting to `/'.
./src/hdf5.h
Added some missing public header files.
Diffstat (limited to 'src/H5Sprivate.h')
-rw-r--r-- | src/H5Sprivate.h | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h index da19695..db6bf9e 100644 --- a/src/H5Sprivate.h +++ b/src/H5Sprivate.h @@ -1,13 +1,13 @@ /**************************************************************************** - * NCSA HDF * - * Software Development Group * - * National Center for Supercomputing Applications * - * University of Illinois at Urbana-Champaign * - * 605 E. Springfield, Champaign IL 61820 * - * * - * For conditions of distribution and use, see the accompanying * - * hdf/COPYING file. * - * * + * NCSA HDF * + * Software Development Group * + * National Center for Supercomputing Applications * + * University of Illinois at Urbana-Champaign * + * 605 E. Springfield, Champaign IL 61820 * + * * + * For conditions of distribution and use, see the accompanying * + * hdf/COPYING file. * + * * ****************************************************************************/ /* @@ -20,35 +20,35 @@ /* Private headers needed by this file */ #include <H5private.h> -#include <H5Gprivate.h> /*for H5G_entry_t */ +#include <H5Gprivate.h> /*for H5G_entry_t */ #include <H5Oprivate.h> #define H5S_RESERVED_ATOMS 2 /* Flags to indicate special dataspace features are active */ -#define H5S_VALID_MAX 0x01 -#define H5S_VALID_PERM 0x02 +#define H5S_VALID_MAX 0x01 +#define H5S_VALID_PERM 0x02 typedef struct H5S_hyperslab_t { - intn *start; /* Location of start of hyperslab */ - size_t *count; /* Number of elements in hyperslab */ - size_t *stride; /* Packing of values of hyperslab */ + hssize_t *start; /* Location of start of hyperslab */ + hsize_t *count; /* Number of elements in hyperslab */ + hsize_t *stride; /* Packing of values of hyperslab */ } H5S_hyperslab_t; typedef struct H5S_simple_t { - intn rank; /*number of dimensions */ - size_t *size; /*dimension sizes */ - size_t *max; /*maximum dimension sizes or NULL */ - intn *perm; /*dimension permutations or NULL */ + intn rank; /*number of dimensions */ + hsize_t *size; /*dimension sizes */ + hsize_t *max; /*maximum dimension sizes or NULL */ + intn *perm; /*dimension permutations or NULL */ } H5S_simple_t; typedef struct H5S_t { - H5S_class_t type; /*type of dimensionality object */ + H5S_class_t type; /*type of dimensionality object */ union { - H5S_simple_t simple; /*simple dimensionality information */ + H5S_simple_t simple; /*simple dimensionality information */ } u; - uintn hslab_def; /* Whether the hyperslab is defined */ - H5S_hyperslab_t h; /* Hyperslab information */ + uintn hslab_def; /* Whether the hyperslab is defined */ + H5S_hyperslab_t h; /* Hyperslab information */ } H5S_t; /* @@ -56,7 +56,7 @@ typedef struct H5S_t { * are numbered. */ typedef struct H5S_number_t { - int _place_holder; /*remove this field! */ + int _place_holder; /*remove this field! */ } H5S_number_t; /* @@ -65,7 +65,7 @@ typedef struct H5S_number_t { typedef struct H5S_tconv_t { /* Initialize element numbering information */ size_t (*init)(const struct H5O_layout_t *layout, const H5S_t *mem_space, - const H5S_t *file_space, size_t desired_nelmts, + const H5S_t *file_space, size_t desired_nelmts, H5S_number_t *numbering/*out*/); /* Gather elements from disk to type conversion buffer */ @@ -76,13 +76,13 @@ typedef struct H5S_tconv_t { /* Scatter elements from type conversion buffer to application buffer */ herr_t (*mscat)(const void *tconv_buf, size_t elmt_size, - const H5S_t *mem_space, const H5S_number_t *numbering, - size_t start, size_t nelmts, void *buf/*out*/); + const H5S_t *mem_space, const H5S_number_t *numbering, + 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 H5S_t *mem_space, const H5S_number_t *numbering, - size_t start, size_t nelmts, void *tconv_buf/*out*/); + const H5S_t *mem_space, const H5S_number_t *numbering, + 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, @@ -105,35 +105,35 @@ typedef struct H5S_tconv_t { H5S_t *H5S_copy (const H5S_t *src); herr_t H5S_close (H5S_t *ds); -size_t H5S_get_npoints (const H5S_t *ds); -size_t H5S_get_npoints_max(const H5S_t *ds); +hsize_t H5S_get_npoints (const H5S_t *ds); +hsize_t H5S_get_npoints_max(const H5S_t *ds); intn H5S_get_ndims (const H5S_t *ds); -intn H5S_get_dims (const H5S_t *ds, size_t dims[]/*out*/, - size_t max_dims[]/*out*/); +intn H5S_get_dims (const H5S_t *ds, hsize_t dims[]/*out*/, + hsize_t max_dims[]/*out*/); herr_t H5S_modify (H5G_entry_t *ent, const H5S_t *space); H5S_t *H5S_read (H5F_t *f, H5G_entry_t *ent); intn H5S_cmp (const H5S_t *ds1, const H5S_t *ds2); hbool_t H5S_is_simple (const H5S_t *sdim); uintn H5S_nelem (const H5S_t *space); const H5S_conv_t *H5S_find (const H5S_t *mem_space, const H5S_t *file_space); -intn H5S_get_hyperslab (const H5S_t *ds, int offset[]/*out*/, - size_t size[]/*out*/, size_t stride[]/*out*/); -intn H5S_extend (H5S_t *space, const size_t *size); +intn H5S_get_hyperslab (const H5S_t *ds, hssize_t offset[]/*out*/, + hsize_t size[]/*out*/, hsize_t stride[]/*out*/); +intn H5S_extend (H5S_t *space, const hsize_t *size); /* Conversion functions for simple data spaces */ size_t H5S_simp_init (const struct H5O_layout_t *layout, - const H5S_t *mem_space, const H5S_t *file_space, - size_t desired_nelmts, H5S_number_t *numbering/*out*/); + const H5S_t *mem_space, const H5S_t *file_space, + size_t desired_nelmts, H5S_number_t *numbering/*out*/); size_t H5S_simp_fgath (H5F_t *f, const struct H5O_layout_t *layout, const struct H5O_efl_t *efl, size_t elmt_size, const H5S_t *file_space, const H5S_number_t *numbering, size_t start, size_t nelmts, void *tconv_buf/*out*/); herr_t H5S_simp_mscat (const void *tconv_buf, size_t elmt_size, - const H5S_t *mem_space, const H5S_number_t *numbering, - size_t start, size_t nelmts, void *buf/*out*/); + const H5S_t *mem_space, const H5S_number_t *numbering, + size_t start, size_t nelmts, void *buf/*out*/); size_t H5S_simp_mgath (const void *buf, size_t elmt_size, - const H5S_t *mem_space, const H5S_number_t *numbering, - size_t start, size_t nelmts, void *tconv_buf/*out*/); + const H5S_t *mem_space, const H5S_number_t *numbering, + size_t start, size_t nelmts, void *tconv_buf/*out*/); herr_t H5S_simp_fscat (H5F_t *f, const struct H5O_layout_t *layout, const struct H5O_efl_t *efl, size_t elmt_size, const H5S_t *file_space, const H5S_number_t *numbering, |