diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-10-26 19:55:54 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-10-26 19:55:54 (GMT) |
commit | f7545efc76fdb4e3fb7e93b93f0e404a3a651081 (patch) | |
tree | 29b59ab23912342bdaf6eaaf75fd2a0f8e1def46 /src/H5Spublic.h | |
parent | ac90ad84f606a9482ee11caf417b017c6a28c1a9 (diff) | |
download | hdf5-f7545efc76fdb4e3fb7e93b93f0e404a3a651081.zip hdf5-f7545efc76fdb4e3fb7e93b93f0e404a3a651081.tar.gz hdf5-f7545efc76fdb4e3fb7e93b93f0e404a3a651081.tar.bz2 |
[svn-r795] Changes since 19981026
----------------------
./MANIFEST
./test/th5s.h5 [NEW]
./test/th5s.c
Added a test to make sure that creating a data space with too
large a rank fails.
Added a test to make sure that reading a file that has a
dataset with a space with too large a rank fails. Actually,
this one is a little weird: the code that reads the data space
message assumes the space is scalar if the message cannot be
read. Fortunately the layout message fails also, preventing
the dataset from being opened. However, since the data type
message is still visible h5ls will report that the object is a
named data type.
./test/space_overflow.c [NEW]
This is the little program that makes the th5s.h5 file.
./src/H5A.c
./src/H5R.c
./src/H5Sselect.c
Updated trace info.
./src/H5Olayout.c
./src/H5Osdspace.c
Added code to fail if the dimensionality is too large when
decoding a layout or simple data space message.
./src/H5Oprivate.h
Redefined H5O_LAYOUT_NDIMS in terms of H5S_MAX_RANK.
./src/H5P.c
./src/H5S.c
Check for ndims>H5S_MAX_RANK in API function calls, added
assert to internal functions.
./src/H5V.c
Changed a `<' to an `<=' in an assert.
./test/flush2.c
Includes stdlib.h for getenv().
./tools/h5tools.c
Able to handle up to H5S_MAX_RANK dimensions during output.
Diffstat (limited to 'src/H5Spublic.h')
-rw-r--r-- | src/H5Spublic.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/H5Spublic.h b/src/H5Spublic.h index 3b6f636..bdf339a 100644 --- a/src/H5Spublic.h +++ b/src/H5Spublic.h @@ -25,7 +25,6 @@ #define H5S_UNLIMITED ((hsize_t)(hssize_t)(-1)) /* Define user-level maximum number of dimensions */ -/* This is not used internally to the library, see H5O_LAYOUT_NDIMS for the internal constant */ #define H5S_MAX_RANK 31 /* Different types of dataspaces */ @@ -39,9 +38,13 @@ typedef enum H5S_class_t { /* Different ways of combining selections */ typedef enum H5S_seloper_t { H5S_SELECT_NOOP = -1, /* error */ - H5S_SELECT_SET = 0, /* Select "set" operation */ - H5S_SELECT_OR, /* Binary "or" operation (add new selection to existing selection) */ - H5S_SELECT_INVALID /* Invalid upper bound on selection operations */ + H5S_SELECT_SET = 0, /* Select "set" operation */ + H5S_SELECT_OR, /* Binary "or" operation (add new selection + * to existing selection) + */ + H5S_SELECT_INVALID /* Invalid upper bound on selection + * operations + */ } H5S_seloper_t; #ifdef __cplusplus @@ -58,7 +61,8 @@ hid_t H5Scopy (hid_t space_id); herr_t H5Sclose (hid_t space_id); hsize_t H5Sget_simple_extent_npoints (hid_t space_id); int H5Sget_simple_extent_ndims (hid_t space_id); -int H5Sget_simple_extent_dims (hid_t space_id, hsize_t dims[], hsize_t maxdims[]); +int H5Sget_simple_extent_dims (hid_t space_id, hsize_t dims[], + hsize_t maxdims[]); hbool_t H5Sis_simple (hid_t space_id); herr_t H5Sset_space (hid_t space_id, int rank, const hsize_t *dims); hssize_t H5Sget_select_npoints (hid_t spaceid); |