mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-12 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r641] Changed function names for beta release.

Browse Source
This commit is contained in:
Quincey Koziol 1998-08-31 22:35:23 -05:00
parent 5aa61b6fcf
commit 4aa79bb211
27 changed files with 1007 additions and 1002 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
examples/h5_attribute.c
View File

@ -10,6 +10,7 @@
* of the array attribute.
*/
#include <stdlib.h>
#include <hdf5.h>
#define FILE "Attributes.h5"
@ -220,8 +221,8 @@ herr_t attr_info(hid_t loc_id, const char *name, void *opdata)
*/
atype = H5Aget_type(attr);
aspace = H5Aget_space(attr);
rank = H5Sextent_ndims(aspace);
ret = H5Sextent_dims(aspace, sdim, NULL);
rank = H5Sget_simple_extent_ndims(aspace);
ret = H5Sget_simple_extent_dims(aspace, sdim, NULL);
/*
* Display rank and dimension sizes for the array attribute.
*/
@ -239,11 +240,11 @@ herr_t attr_info(hid_t loc_id, const char *name, void *opdata)
if (H5T_FLOAT == H5Tget_class(atype)) {
printf("Type : FLOAT \n");
npoints = H5Sextent_npoints(aspace);
npoints = H5Sget_simple_extent_npoints(aspace);
float_array = (float *)malloc(sizeof(float)*(int)npoints);
ret = H5Aread(attr, atype, float_array);
printf("Values : ");
for( i = 0; i < npoints; i++) printf("%f ", float_array[i]);
for( i = 0; i < (int)npoints; i++) printf("%f ", float_array[i]);
printf("\n");
free(float_array);
}

4
examples/h5_chunk_read.c
View File

@ -47,8 +47,8 @@ main (void)
*/
filespace = H5Dget_space(dataset); /* Get filespace handle first. */
rank = H5Sextent_ndims(filespace);
status_n = H5Sextent_dims(filespace, dims, NULL);
rank = H5Sget_simple_extent_ndims(filespace);
status_n = H5Sget_simple_extent_dims(filespace, dims, NULL);
printf("dataset rank %d, dimensions %lu x %lu\n",
rank, (unsigned long)(dims[0]), (unsigned long)(dims[1]));

4
examples/h5_read.c
View File

@ -68,8 +68,8 @@ main (void)
printf(" Data size is %d \n", size);
dataspace = H5Dget_space(dataset); /* dataspace handle */
rank = H5Sextent_ndims(dataspace);
status_n = H5Sextent_dims(dataspace, dims_out, NULL);
rank = H5Sget_simple_extent_ndims(dataspace);
status_n = H5Sget_simple_extent_dims(dataspace, dims_out, NULL);
printf("rank %d, dimensions %lu x %lu \n", rank,
(unsigned long)(dims_out[0]), (unsigned long)(dims_out[1]));

1194
src/.distdep
View File

File diff suppressed because it is too large Load Diff

12
src/H5.c
View File

@ -24,7 +24,7 @@ static char RcsId[] = "@(#)$Revision$";
EXPORTED ROUTINES
H5dont_atexit -- Indicate that an 'atexit' routine is _not_ to be installed
H5version -- Check the version of the library
H5get_libversion -- Check the version of the library
LIBRARY-SCOPED ROUTINES
H5_init_library -- initialize the HDF5 library
@ -402,7 +402,7 @@ H5_debug_mask(const char *s)
/*-------------------------------------------------------------------------
* Function: H5version
* Function: H5get_libversion
*
* Purpose: Returns the library version numbers through arguments. MAJNUM
* will be the major revision number of the library, MINNUM the
@ -427,11 +427,11 @@ H5_debug_mask(const char *s)
*-------------------------------------------------------------------------
*/
herr_t
H5version(unsigned *majnum, unsigned *minnum, unsigned *relnum)
H5get_libversion(unsigned *majnum, unsigned *minnum, unsigned *relnum)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER(H5version, FAIL);
FUNC_ENTER(H5get_libversion, FAIL);
/* Set the version information */
if (majnum) *majnum = H5_VERS_MAJOR;
@ -443,7 +443,7 @@ H5version(unsigned *majnum, unsigned *minnum, unsigned *relnum)
/*-------------------------------------------------------------------------
* Function: H5vers_check
* Function: H5check_version
*
* Purpose: Verifies that the arguments match the version numbers
* compiled into the library. This function is intended to be
@ -463,7 +463,7 @@ H5version(unsigned *majnum, unsigned *minnum, unsigned *relnum)
*-------------------------------------------------------------------------
*/
herr_t
H5vers_check (unsigned majnum, unsigned minnum, unsigned relnum)
H5check_version (unsigned majnum, unsigned minnum, unsigned relnum)
{
/* Don't initialize the library quite yet */

10
src/H5A.c
View File

@ -1040,11 +1040,11 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf)
/*--------------------------------------------------------------------------
NAME
H5Anum_attrs
H5Aget_num_attrs
PURPOSE
Determines the number of attributes attached to an object
USAGE
int H5Anum_attrs (loc_id)
int H5Aget_num_attrs (loc_id)
hid_t loc_id; IN: Object (dataset or group) to be queried
RETURNS
Number of attributes on success, negative on failure
@ -1060,13 +1060,13 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf)
* The LOC_ID can also be a named (committed) data type.
--------------------------------------------------------------------------*/
int
H5Anum_attrs(hid_t loc_id)
H5Aget_num_attrs(hid_t loc_id)
{
H5G_entry_t *ent = NULL; /*symtab ent of object to attribute */
void *obj = NULL;
int ret_value = 0;
FUNC_ENTER(H5Anum_attrs, FAIL);
FUNC_ENTER(H5Aget_num_attrs, FAIL);
H5TRACE1("Is","i",loc_id);
/* check arguments */
@ -1100,7 +1100,7 @@ H5Anum_attrs(hid_t loc_id)
ret_value=H5O_count(ent, H5O_ATTR);
FUNC_LEAVE(ret_value);
} /* H5Anum_attrs() */
} /* H5Aget_num_attrs() */
/*--------------------------------------------------------------------------

2
src/H5Apublic.h
View File

@ -37,7 +37,7 @@ herr_t H5Aclose(hid_t attr_id);
hid_t H5Aget_space(hid_t attr_id);
hid_t H5Aget_type(hid_t attr_id);
size_t H5Aget_name(hid_t attr_id, size_t buf_size, char *buf);
int H5Anum_attrs(hid_t loc_id);
int H5Aget_num_attrs(hid_t loc_id);
int H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op,
void *op_data);
herr_t H5Adelete(hid_t loc_id, const char *name);

2
src/H5Epublic.h
View File

@ -25,7 +25,7 @@
/*
* One often needs to temporarily disable automatic error reporting when
* trying something that's likely or expected to fail. For instance, to
* determine if an object exists one can call H5Gstat() which will fail if
* determine if an object exists one can call H5Gget_stat() which will fail if
* the object doesn't exist. The code to try can be nested between calls to
* H5Eget_auto() and H5Eset_auto(), but it's easier just to use this macro
* like:

6
src/H5G.c
View File

@ -631,7 +631,7 @@ H5Gunlink(hid_t __unused__ loc_id, const char __unused__ *name)
/*-------------------------------------------------------------------------
* Function: H5Gstat
* Function: H5Gget_stat
*
* Purpose: Returns information about an object. If FOLLOW_LINK is
* non-zero then all symbolic links are followed; otherwise all
@ -650,12 +650,12 @@ H5Gunlink(hid_t __unused__ loc_id, const char __unused__ *name)
*-------------------------------------------------------------------------
*/
herr_t
H5Gstat(hid_t loc_id, const char *name, hbool_t follow_link,
H5Gget_stat(hid_t loc_id, const char *name, hbool_t follow_link,
H5G_stat_t *statbuf/*out*/)
{
H5G_entry_t *loc = NULL;
FUNC_ENTER (H5Gstat, FAIL);
FUNC_ENTER (H5Gget_stat, FAIL);
H5TRACE4("e","isbx",loc_id,name,follow_link,statbuf);
/* Check arguments */

2
src/H5Gpublic.h
View File

@ -68,7 +68,7 @@ herr_t H5Gmove (hid_t loc_id, const char *src, const char *dst);
herr_t H5Glink (hid_t loc_id, H5G_link_t type, const char *cur_name,
const char *new_name);
herr_t H5Gunlink (hid_t loc_id, const char *name);
herr_t H5Gstat (hid_t loc_id, const char *name, hbool_t follow_link,
herr_t H5Gget_stat (hid_t loc_id, const char *name, hbool_t follow_link,
H5G_stat_t *statbuf/*out*/);
herr_t H5Gget_linkval (hid_t loc_id, const char *name, size_t size,
char *buf/*out*/);

2
src/H5Omtime.c
View File

@ -136,7 +136,7 @@ H5O_mtime_decode(H5F_t __unused__ *f, const uint8 *p,
* The catch-all. If we can't convert a character string universal
* coordinated time to a time_t value reliably then we can't decode the
* modification time message. This really isn't as bad as it sounds --
* the only way a user can get the modification time is from H5Gstat()
* the only way a user can get the modification time is from H5Gget_stat()
* and H5G_stat() can gracefully recover.
*/

26
src/H5S.c
View File

@ -729,7 +729,7 @@ H5S_extent_npoints(const H5S_t *ds)
/*-------------------------------------------------------------------------
* Function: H5Sextent_npoints
* Function: H5Sget_simple_extent_npoints
*
* Purpose: Determines how many data points a dataset extent has.
*
@ -746,12 +746,12 @@ H5S_extent_npoints(const H5S_t *ds)
*-------------------------------------------------------------------------
*/
hsize_t
H5Sextent_npoints(hid_t space_id)
H5Sget_simple_extent_npoints(hid_t space_id)
{
H5S_t *ds = NULL;
hsize_t ret_value = 0;
FUNC_ENTER(H5Sextent_npoints, 0);
FUNC_ENTER(H5Sget_simple_extent_npoints, 0);
H5TRACE1("h","i",space_id);
/* Check args */
@ -832,7 +832,7 @@ H5S_get_npoints_max(const H5S_t *ds)
/*-------------------------------------------------------------------------
* Function: H5Sextent_ndims
* Function: H5Sget_simple_extent_ndims
*
* Purpose: Determines the dimensionality of a data space.
*
@ -848,12 +848,12 @@ H5S_get_npoints_max(const H5S_t *ds)
*-------------------------------------------------------------------------
*/
int
H5Sextent_ndims(hid_t space_id)
H5Sget_simple_extent_ndims(hid_t space_id)
{
H5S_t *ds = NULL;
intn ret_value = 0;
FUNC_ENTER(H5Sextent_ndims, FAIL);
FUNC_ENTER(H5Sget_simple_extent_ndims, FAIL);
H5TRACE1("Is","i",space_id);
/* Check args */
@ -916,13 +916,13 @@ H5S_extent_ndims(const H5S_t *ds)
}
/*-------------------------------------------------------------------------
* Function: H5Sextent_dims
* Function: H5Sget_simple_extent_dims
*
* Purpose: Returns the size and maximum sizes in each dimension of
* a data space DS through the DIMS and MAXDIMS arguments.
*
* Return: Success: Number of dimensions, the same value as
* returned by H5Sextent_ndims().
* returned by H5Sget_simple_extent_ndims().
*
* Failure: FAIL
*
@ -938,13 +938,13 @@ H5S_extent_ndims(const H5S_t *ds)
*-------------------------------------------------------------------------
*/
int
H5Sextent_dims(hid_t space_id, hsize_t dims[]/*out*/,
H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[]/*out*/,
hsize_t maxdims[]/*out*/)
{
H5S_t *ds = NULL;
intn ret_value = 0;
FUNC_ENTER(H5Sextent_dims, FAIL);
FUNC_ENTER(H5Sget_simple_extent_dims, FAIL);
H5TRACE3("Is","ixx",space_id,dims,maxdims);
/* Check args */
@ -1644,7 +1644,7 @@ H5Screate_simple(int rank, const hsize_t dims[/*rank*/],
}
/*-------------------------------------------------------------------------
* Function: H5Sextent_class
* Function: H5Sget_simple_extent_type
*
* Purpose: Retrieves the type of extent for a dataspace object
*
@ -1662,12 +1662,12 @@ H5Screate_simple(int rank, const hsize_t dims[/*rank*/],
*-------------------------------------------------------------------------
*/
H5S_class_t
H5Sextent_class(hid_t sid)
H5Sget_simple_extent_type(hid_t sid)
{
H5S_class_t ret_value = H5S_NO_CLASS;
H5S_t *space = NULL;
FUNC_ENTER(H5Sextent_class, FAIL);
FUNC_ENTER(H5Sget_simple_extent_type, FAIL);
H5TRACE1("Sc","i",sid);
/* Check arguments */

10
src/H5Spublic.h
View File

@ -50,18 +50,18 @@ herr_t H5Sset_extent_simple (hid_t space_id, int rank, const hsize_t dims[],
const hsize_t max[]);
hid_t H5Scopy (hid_t space_id);
herr_t H5Sclose (hid_t space_id);
hsize_t H5Sextent_npoints (hid_t space_id);
int H5Sextent_ndims (hid_t space_id);
int H5Sextent_dims (hid_t space_id, hsize_t dims[], hsize_t maxdims[]);
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[]);
hbool_t H5Sis_simple (hid_t space_id);
herr_t H5Sset_space (hid_t space_id, int rank, const hsize_t *dims);
hsize_t H5Sselect_npoints (hid_t spaceid);
hsize_t H5Sget_select_npoints (hid_t spaceid);
herr_t H5Sselect_hyperslab (hid_t space_id, H5S_seloper_t op,
const hssize_t start[], const hsize_t _stride[],
const hsize_t count[], const hsize_t _block[]);
herr_t H5Sselect_elements (hid_t space_id, H5S_seloper_t op, size_t num_elemn,
const hssize_t **coord);
H5S_class_t H5Sextent_class (hid_t space_id);
H5S_class_t H5Sget_simple_extent_type (hid_t space_id);
herr_t H5Sset_extent_none (hid_t space_id);
herr_t H5Sextent_copy (hid_t dst_id,hid_t src_id);
herr_t H5Sselect_all (hid_t spaceid);

12
src/H5Sselect.c
View File

@ -641,11 +641,11 @@ done:
/*--------------------------------------------------------------------------
NAME
H5Sselect_npoints
H5Sget_select_npoints
PURPOSE
Get the number of elements in current selection
USAGE
hsize_t H5Sselect_npoints(dsid)
hsize_t H5Sget_select_npoints(dsid)
hid_t dsid; IN: Dataspace ID of selection to query
RETURNS
The number of elements in selection on success, 0 on failure
@ -657,12 +657,12 @@ done:
REVISION LOG
--------------------------------------------------------------------------*/
hsize_t
H5Sselect_npoints(hid_t spaceid)
H5Sget_select_npoints(hid_t spaceid)
{
H5S_t *space = NULL; /* Dataspace to modify selection of */
hsize_t ret_value=0; /* return value */
FUNC_ENTER (H5Sselect_npoints, 0);
FUNC_ENTER (H5Sget_select_npoints, 0);
H5TRACE1("h","i",spaceid);
/* Check args */
@ -674,7 +674,7 @@ H5Sselect_npoints(hid_t spaceid)
ret_value = H5S_select_npoints(space);
FUNC_LEAVE (ret_value);
} /* H5Sselect_npoints() */
} /* H5Sget_select_npoints() */
/*--------------------------------------------------------------------------
NAME
@ -725,7 +725,7 @@ H5S_select_npoints (const H5S_t *space)
}
FUNC_LEAVE (ret_value);
} /* H5Sselect_npoints() */
} /* H5S_select_npoints() */
/*--------------------------------------------------------------------------
NAME

6
src/H5public.h
View File

@ -29,7 +29,7 @@
#define H5_VERS_MINOR 0 /* For minor interface/format changes */
#define H5_VERS_RELEASE 75 /* For tweaks, bug-fixes, or development */
#define H5check() H5vers_check(H5_VERS_MAJOR,H5_VERS_MINOR, \
#define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \
H5_VERS_RELEASE)
/*
@ -82,8 +82,8 @@ extern "C" {
herr_t H5open (void);
herr_t H5close (void);
herr_t H5dont_atexit (void);
herr_t H5version (unsigned *majnum, unsigned *minnum, unsigned *relnum);
herr_t H5vers_check (unsigned majnum, unsigned minnum, unsigned relnum);
herr_t H5get_libversion (unsigned *majnum, unsigned *minnum, unsigned *relnum);
herr_t H5check_version (unsigned majnum, unsigned minnum, unsigned relnum);
#ifdef __cplusplus
}

445
test/.distdep
View File

@ -178,166 +178,6 @@ th5s.o: \
../src/H5Tpublic.h \
../src/H5Zprivate.h \
../src/H5Zpublic.h
external.o: \
external.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
shtype.o: \
shtype.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Spublic.h
big.o: \
big.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5private.h
chunk.o: \
chunk.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
iopipe.o: \
iopipe.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
hyperslab.o: \
hyperslab.c \
../src/H5private.h \
../src/H5public.h \
../src/H5config.h \
../src/H5MMprivate.h \
../src/H5MMpublic.h
extend.o: \
extend.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Spublic.h
links.o: \
links.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
dtypes.o: \
dtypes.c \
../src/hdf5.h \
@ -358,6 +198,7 @@ dtypes.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5Tpkg.h \
@ -365,67 +206,13 @@ dtypes.o: \
../src/H5Fprivate.h \
../src/H5private.h \
../src/H5Tprivate.h
dsets.o: \
dsets.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
cmpd_dset.o: \
cmpd_dset.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
bittests.o: \
bittests.c \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5HGpublic.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Fprivate.h \
../src/H5Fpublic.h \
../src/H5Ipublic.h \
hyperslab.o: \
hyperslab.c \
../src/H5private.h \
../src/H5Dpublic.h \
../src/H5Tprivate.h \
../src/H5Tpublic.h \
../src/H5Gprivate.h \
../src/H5Gpublic.h
../src/H5public.h \
../src/H5config.h \
../src/H5MMprivate.h \
../src/H5MMpublic.h
istore.o: \
istore.c \
../src/H5private.h \
@ -454,6 +241,119 @@ istore.o: \
../src/H5Sprivate.h \
../src/H5Spublic.h \
../src/H5Zprivate.h
dsets.o: \
dsets.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
cmpd_dset.o: \
cmpd_dset.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
extend.o: \
extend.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h
external.o: \
external.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
iopipe.o: \
iopipe.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
gheap.o: \
gheap.c \
../src/H5private.h \
@ -473,6 +373,111 @@ gheap.o: \
../src/H5HGpublic.h \
../src/H5Pprivate.h \
../src/H5Ppublic.h
shtype.o: \
shtype.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h
big.o: \
big.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h \
../src/H5private.h
links.o: \
links.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5Spublic.h
chunk.o: \
chunk.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Ipublic.h \
../src/H5Apublic.h \
../src/H5ACpublic.h \
../src/H5Bpublic.h \
../src/H5Dpublic.h \
../src/H5Epublic.h \
../src/H5Fpublic.h \
../src/H5Gpublic.h \
../src/H5HGpublic.h \
../src/H5HLpublic.h \
../src/H5MFpublic.h \
../src/H5MMpublic.h \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
../src/H5Rpublic.h \
../src/H5Spublic.h
bittests.o: \
bittests.c \
../src/H5Tpkg.h \
../src/H5HGprivate.h \
../src/H5HGpublic.h \
../src/H5public.h \
../src/H5config.h \
../src/H5Fprivate.h \
../src/H5Fpublic.h \
../src/H5Ipublic.h \
../src/H5private.h \
../src/H5Dpublic.h \
../src/H5Tprivate.h \
../src/H5Tpublic.h \
../src/H5Gprivate.h \
../src/H5Gpublic.h
mtime.o: \
mtime.c \
../src/hdf5.h \

2
test/dsets.c
View File

@ -712,7 +712,7 @@ test_multiopen (hid_t file)
/* Get the size from the second handle */
if ((space = H5Dget_space (dset2))<0) goto error;
if (H5Sextent_dims (space, tmp_size, NULL)<0) goto error;
if (H5Sget_simple_extent_dims (space, tmp_size, NULL)<0) goto error;
if (cur_size[0]!=tmp_size[0]) {
puts ("*FAILED*");
printf (" Got %d instead of %d!\n",

18
test/links.c
View File

@ -176,8 +176,8 @@ cklinks(void)
}
/* Hard link */
if (H5Gstat(file, "d1", TRUE, &sb1)<0) goto error;
if (H5Gstat(file, "grp1/hard", TRUE, &sb2)<0) goto error;
if (H5Gget_stat(file, "d1", TRUE, &sb1)<0) goto error;
if (H5Gget_stat(file, "grp1/hard", TRUE, &sb2)<0) goto error;
if (H5G_DATASET!=sb2.type) {
puts("*FAILED*");
puts(" Unexpected object type should have been a dataset");
@ -191,7 +191,7 @@ cklinks(void)
}
/* Symbolic link */
if (H5Gstat(file, "grp1/soft", TRUE, &sb2)<0) goto error;
if (H5Gget_stat(file, "grp1/soft", TRUE, &sb2)<0) goto error;
if (H5G_DATASET!=sb2.type) {
puts("*FAILED*");
puts(" Unexpected object type should have been a dataset");
@ -214,14 +214,14 @@ cklinks(void)
/* Dangling link */
H5E_BEGIN_TRY {
status = H5Gstat(file, "grp1/dangle", TRUE, &sb2);
status = H5Gget_stat(file, "grp1/dangle", TRUE, &sb2);
} H5E_END_TRY;
if (status>=0) {
puts("*FAILED*");
puts(" H5Gstat() should have failed for a dangling link.");
puts(" H5Gget_stat() should have failed for a dangling link.");
goto error;
}
if (H5Gstat(file, "grp1/dangle", FALSE, &sb2)<0) goto error;
if (H5Gget_stat(file, "grp1/dangle", FALSE, &sb2)<0) goto error;
if (H5G_LINK!=sb2.type) {
puts("*FAILED*");
puts(" Unexpected object type should have been a symbolic link");
@ -238,14 +238,14 @@ cklinks(void)
/* Recursive link */
H5E_BEGIN_TRY {
status = H5Gstat(file, "grp1/recursive", TRUE, &sb2);
status = H5Gget_stat(file, "grp1/recursive", TRUE, &sb2);
} H5E_END_TRY;
if (status>=0) {
puts("*FAILED*");
puts(" H5Gstat() should have failed for a recursive link.");
puts(" H5Gget_stat() should have failed for a recursive link.");
goto error;
}
if (H5Gstat(file, "grp1/recursive", FALSE, &sb2)<0) goto error;
if (H5Gget_stat(file, "grp1/recursive", FALSE, &sb2)<0) goto error;
if (H5G_LINK!=sb2.type) {
puts("*FAILED*");
puts(" Unexpected object type should have been a symbolic link");

10
test/mtime.c
View File

@ -120,21 +120,21 @@ main(void)
/*
* Open the file and get the modification time. We'll test the new
* H5Gstat() arguments too: being able to stat something without knowing
* H5Gget_stat() arguments too: being able to stat something without knowing
* its name.
*/
if ((file = H5Fopen(FILE_NAME_1, H5F_ACC_RDONLY, H5P_DEFAULT))<0) return 1;
if (H5Gstat(file, "dset", TRUE, &sb1)<0) return 1;
if (H5Gget_stat(file, "dset", TRUE, &sb1)<0) return 1;
if ((dset=H5Dopen(file, "dset"))<0) return 1;
if (H5Gstat(dset, ".", TRUE, &sb2)<0) return 1;
if (H5Gget_stat(dset, ".", TRUE, &sb2)<0) return 1;
if (H5Dclose(dset)<0) return 1;
if (H5Fclose(file)<0) return 1;
/* Compare times from the two ways of calling H5Gstat() */
/* Compare times from the two ways of calling H5Gget_stat() */
if (sb1.objno[0]!=sb2.objno[0] || sb1.objno[1]!=sb2.objno[1] ||
sb1.mtime!=sb2.mtime) {
puts("*FAILED*");
puts(" Calling H5Gstat() with the dataset ID returned different");
puts(" Calling H5Gget_stat() with the dataset ID returned different");
puts(" values than calling it with a file and dataset name.");
return 1;
}

76
test/tattr.c
View File

@ -216,8 +216,8 @@ test_attr_basic_read(void)
CHECK(dataset, FAIL, "H5Dopen");
/* Verify the correct number of attributes */
ret=H5Anum_attrs(dataset);
VERIFY(ret, 1, "H5Anum_attrs");
ret=H5Aget_num_attrs(dataset);
VERIFY(ret, 1, "H5Aget_num_attrs");
/* Open an attribute for the dataset */
attr=H5Aopen_name(dataset,ATTR1_NAME);
@ -245,8 +245,8 @@ test_attr_basic_read(void)
group=H5Gopen(fid1,GROUP1_NAME);
/* Verify the correct number of attributes */
ret=H5Anum_attrs(group);
VERIFY(ret, 1, "H5Anum_attrs");
ret=H5Aget_num_attrs(group);
VERIFY(ret, 1, "H5Aget_num_attrs");
/* Open an attribute for the dataset */
attr=H5Aopen_name(group,ATTR2_NAME);
@ -402,8 +402,8 @@ test_attr_compound_read(void)
dataset=H5Dopen(fid1,"Dataset1");
/* Verify the correct number of attributes */
ret=H5Anum_attrs(dataset);
VERIFY(ret, 1, "H5Anum_attrs");
ret=H5Aget_num_attrs(dataset);
VERIFY(ret, 1, "H5Aget_num_attrs");
/* Open 1st attribute for the dataset */
attr=H5Aopen_idx(dataset,0);
@ -412,10 +412,10 @@ test_attr_compound_read(void)
/* Verify Dataspace */
space=H5Aget_space(attr);
CHECK(space, FAIL, "H5Aget_space");
rank=H5Sextent_ndims(space);
VERIFY(rank, ATTR4_RANK, "H5Sextent_ndims");
ret=H5Sextent_dims(space,dims, NULL);
CHECK(ret, FAIL, "H5Sextent_dims");
rank=H5Sget_simple_extent_ndims(space);
VERIFY(rank, ATTR4_RANK, "H5Sget_simple_extent_ndims");
ret=H5Sget_simple_extent_dims(space,dims, NULL);
CHECK(ret, FAIL, "H5Sget_simple_extent_dims");
if(dims[0]!=ATTR4_DIM1) {
printf("attribute dimensions different: dims[0]=%d, should be %d\n",(int)dims[0],ATTR4_DIM1);
num_errs++;
@ -607,8 +607,8 @@ test_attr_scalar_read(void)
CHECK(dataset, FAIL, "H5Dopen");
/* Verify the correct number of attributes */
ret=H5Anum_attrs(dataset);
VERIFY(ret, 1, "H5Anum_attrs");
ret=H5Aget_num_attrs(dataset);
VERIFY(ret, 1, "H5Aget_num_attrs");
/* Open an attribute for the dataset */
attr=H5Aopen_name(dataset,ATTR5_NAME);
@ -787,8 +787,8 @@ test_attr_mult_read(void)
dataset=H5Dopen(fid1,"Dataset1");
/* Verify the correct number of attributes */
ret=H5Anum_attrs(dataset);
VERIFY(ret, 3, "H5Anum_attrs");
ret=H5Aget_num_attrs(dataset);
VERIFY(ret, 3, "H5Aget_num_attrs");
/* Open 1st attribute for the dataset */
attr=H5Aopen_idx(dataset,0);
@ -797,10 +797,10 @@ test_attr_mult_read(void)
/* Verify Dataspace */
space=H5Aget_space(attr);
CHECK(space, FAIL, "H5Aget_space");
rank=H5Sextent_ndims(space);
VERIFY(rank, ATTR1_RANK, "H5Sextent_ndims");
ret=H5Sextent_dims(space,dims, NULL);
CHECK(ret, FAIL, "H5Sextent_dims");
rank=H5Sget_simple_extent_ndims(space);
VERIFY(rank, ATTR1_RANK, "H5Sget_simple_extent_ndims");
ret=H5Sget_simple_extent_dims(space,dims, NULL);
CHECK(ret, FAIL, "H5Sget_simple_extent_dims");
if(dims[0]!=ATTR1_DIM1) {
printf("attribute dimensions different: dims[0]=%d, should be %d\n",(int)dims[0],ATTR1_DIM1);
num_errs++;
@ -858,10 +858,10 @@ test_attr_mult_read(void)
/* Verify Dataspace */
space=H5Aget_space(attr);
CHECK(space, FAIL, "H5Aget_space");
rank=H5Sextent_ndims(space);
VERIFY(rank, ATTR2_RANK, "H5Sextent_ndims");
ret=H5Sextent_dims(space,dims, NULL);
CHECK(ret, FAIL, "H5Sextent_dims");
rank=H5Sget_simple_extent_ndims(space);
VERIFY(rank, ATTR2_RANK, "H5Sget_simple_extent_ndims");
ret=H5Sget_simple_extent_dims(space,dims, NULL);
CHECK(ret, FAIL, "H5Sget_simple_extent_dims");
if(dims[0]!=ATTR2_DIM1) {
printf("attribute dimensions different: dims[0]=%d, should be %d\n",(int)dims[0],ATTR2_DIM1);
num_errs++;
@ -924,10 +924,10 @@ test_attr_mult_read(void)
/* Verify Dataspace */
space=H5Aget_space(attr);
CHECK(space, FAIL, "H5Aget_space");
rank=H5Sextent_ndims(space);
VERIFY(rank, ATTR3_RANK, "H5Sextent_ndims");
ret=H5Sextent_dims(space,dims, NULL);
CHECK(ret, FAIL, "H5Sextent_dims");
rank=H5Sget_simple_extent_ndims(space);
VERIFY(rank, ATTR3_RANK, "H5Sget_simple_extent_ndims");
ret=H5Sget_simple_extent_dims(space,dims, NULL);
CHECK(ret, FAIL, "H5Sget_simple_extent_dims");
if(dims[0]!=ATTR3_DIM1) {
printf("attribute dimensions different: dims[0]=%d, should be %d\n",(int)dims[0],ATTR3_DIM1);
num_errs++;
@ -1065,8 +1065,8 @@ test_attr_iterate(void)
dataset=H5Dopen(file,"Dataset1");
/* Verify the correct number of attributes */
ret=H5Anum_attrs(dataset);
VERIFY(ret, 3, "H5Anum_attrs");
ret=H5Aget_num_attrs(dataset);
VERIFY(ret, 3, "H5Aget_num_attrs");
/* Close dataset */
start=0;
@ -1109,24 +1109,24 @@ test_attr_delete(void)
dataset=H5Dopen(fid1,"Dataset1");
/* Verify the correct number of attributes */
ret=H5Anum_attrs(dataset);
VERIFY(ret, 3, "H5Anum_attrs");
ret=H5Aget_num_attrs(dataset);
VERIFY(ret, 3, "H5Aget_num_attrs");
/* Try to delete bogus attribute */
ret=H5Adelete(dataset,"Bogus");
VERIFY(ret, FAIL, "H5Adelete");
/* Verify the correct number of attributes */
ret=H5Anum_attrs(dataset);
VERIFY(ret, 3, "H5Anum_attrs");
ret=H5Aget_num_attrs(dataset);
VERIFY(ret, 3, "H5Aget_num_attrs");
/* Delete middle (2nd) attribute */
ret=H5Adelete(dataset,ATTR2_NAME);
CHECK(ret, FAIL, "H5Adelete");
/* Verify the correct number of attributes */
ret=H5Anum_attrs(dataset);
VERIFY(ret, 2, "H5Anum_attrs");
ret=H5Aget_num_attrs(dataset);
VERIFY(ret, 2, "H5Aget_num_attrs");
/* Open 1st attribute for the dataset */
attr=H5Aopen_idx(dataset,0);
@ -1165,8 +1165,8 @@ test_attr_delete(void)
CHECK(ret, FAIL, "H5Adelete");
/* Verify the correct number of attributes */
ret=H5Anum_attrs(dataset);
VERIFY(ret, 1, "H5Anum_attrs");
ret=H5Aget_num_attrs(dataset);
VERIFY(ret, 1, "H5Aget_num_attrs");
/* Open last (formally 3rd) attribute for the dataset */
attr=H5Aopen_idx(dataset,0);
@ -1189,8 +1189,8 @@ test_attr_delete(void)
CHECK(ret, FAIL, "H5Adelete");
/* Verify the correct number of attributes */
ret=H5Anum_attrs(dataset);
VERIFY(ret, 0, "H5Anum_attrs");
ret=H5Aget_num_attrs(dataset);
VERIFY(ret, 0, "H5Aget_num_attrs");
/* Close dataset */
ret = H5Dclose(dataset);

2
test/testhdf5.c
View File

@ -172,7 +172,7 @@ main(int argc, char *argv[])
InitTest("select", test_select, cleanup_select, "Selections");
Verbosity = 4; /* Default Verbosity is Low */
H5version(&major, &minor, &release);
H5get_libversion(&major, &minor, &release);
print_func("\nFor help use: testhdf5 -help\n");
print_func("Linked with hdf5 version %u.%u release %u\n",

106
test/th5s.c
View File

@ -104,37 +104,37 @@ test_h5s_basic(void)
sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
CHECK(sid1, FAIL, "H5Screate_simple");
n = H5Sextent_npoints(sid1);
CHECK(n, UFAIL, "H5Sextent_npoints");
VERIFY(n, SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3, "H5Sextent_npoints");
n = H5Sget_simple_extent_npoints(sid1);
CHECK(n, UFAIL, "H5Sget_simple_extent_npoints");
VERIFY(n, SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3, "H5Sget_simple_extent_npoints");
rank = H5Sextent_ndims(sid1);
CHECK(rank, UFAIL, "H5Sextent_ndims");
VERIFY(rank, SPACE1_RANK, "H5Sextent_ndims");
rank = H5Sget_simple_extent_ndims(sid1);
CHECK(rank, UFAIL, "H5Sget_simple_extent_ndims");
VERIFY(rank, SPACE1_RANK, "H5Sget_simple_extent_ndims");
ret = H5Sextent_dims(sid1, tdims, NULL);
CHECK(ret, FAIL, "H5Sextent_dims");
ret = H5Sget_simple_extent_dims(sid1, tdims, NULL);
CHECK(ret, FAIL, "H5Sget_simple_extent_dims");
VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(unsigned)), 0,
"H5Sextent_dims");
"H5Sget_simple_extent_dims");
sid2 = H5Screate_simple(SPACE2_RANK, dims2, max2);
CHECK(sid2, FAIL, "H5Screate_simple");
n = H5Sextent_npoints(sid2);
CHECK(n, UFAIL, "H5Sextent_npoints");
n = H5Sget_simple_extent_npoints(sid2);
CHECK(n, UFAIL, "H5Sget_simple_extent_npoints");
VERIFY(n, SPACE2_DIM1 * SPACE2_DIM2 * SPACE2_DIM3 * SPACE2_DIM4,
"H5Sextent_npoints");
"H5Sget_simple_extent_npoints");
rank = H5Sextent_ndims(sid2);
CHECK(rank, UFAIL, "H5Sextent_ndims");
VERIFY(rank, SPACE2_RANK, "H5Sextent_ndims");
rank = H5Sget_simple_extent_ndims(sid2);
CHECK(rank, UFAIL, "H5Sget_simple_extent_ndims");
VERIFY(rank, SPACE2_RANK, "H5Sget_simple_extent_ndims");
ret = H5Sextent_dims(sid2, tdims, tmax);
CHECK(ret, FAIL, "H5Sextent_dims");
ret = H5Sget_simple_extent_dims(sid2, tdims, tmax);
CHECK(ret, FAIL, "H5Sget_simple_extent_dims");
VERIFY(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(unsigned)), 0,
"H5Sextent_dims");
"H5Sget_simple_extent_dims");
VERIFY(HDmemcmp(tmax, max2, SPACE2_RANK * sizeof(unsigned)), 0,
"H5Sextent_dims");
"H5Sget_simple_extent_dims");
ret = H5Sclose(sid1);
CHECK(ret, FAIL, "H5Sclose");
@ -175,20 +175,20 @@ test_h5s_scalar_write(void)
sid1 = H5Screate_simple(SPACE3_RANK, NULL, NULL);
CHECK(sid1, FAIL, "H5Screate_simple");
n = H5Sextent_npoints(sid1);
CHECK(n, UFAIL, "H5Sextent_npoints");
VERIFY(n, 1, "H5Sextent_npoints");
n = H5Sget_simple_extent_npoints(sid1);
CHECK(n, UFAIL, "H5Sget_simple_extent_npoints");
VERIFY(n, 1, "H5Sget_simple_extent_npoints");
rank = H5Sextent_ndims(sid1);
CHECK(rank, UFAIL, "H5Sextent_ndims");
VERIFY(rank, SPACE3_RANK, "H5Sextent_ndims");
rank = H5Sget_simple_extent_ndims(sid1);
CHECK(rank, UFAIL, "H5Sget_simple_extent_ndims");
VERIFY(rank, SPACE3_RANK, "H5Sget_simple_extent_ndims");
ret = H5Sextent_dims(sid1, tdims, NULL);
VERIFY(ret, 0, "H5Sextent_dims");
ret = H5Sget_simple_extent_dims(sid1, tdims, NULL);
VERIFY(ret, 0, "H5Sget_simple_extent_dims");
/* Verify extent type */
ext_type = H5Sextent_class(sid1);
VERIFY(ext_type, H5S_SCALAR, "H5Sextent_class");
ext_type = H5Sget_simple_extent_type(sid1);
VERIFY(ext_type, H5S_SCALAR, "H5Sget_simple_extent_type");
/* Create a dataset */
dataset=H5Dcreate(fid1,"Dataset1",H5T_NATIVE_UINT,sid1,H5P_DEFAULT);
@ -241,16 +241,16 @@ test_h5s_scalar_read(void)
sid1=H5Dget_space(dataset);
CHECK(sid1, FAIL, "H5Dget_space");
n = H5Sextent_npoints(sid1);
CHECK(n, UFAIL, "H5Sextent_npoints");
VERIFY(n, 1, "H5Sextent_npoints");
n = H5Sget_simple_extent_npoints(sid1);
CHECK(n, UFAIL, "H5Sget_simple_extent_npoints");
VERIFY(n, 1, "H5Sget_simple_extent_npoints");
rank = H5Sextent_ndims(sid1);
CHECK(rank, UFAIL, "H5Sextent_ndims");
VERIFY(rank, SPACE3_RANK, "H5Sextent_ndims");
rank = H5Sget_simple_extent_ndims(sid1);
CHECK(rank, UFAIL, "H5Sget_simple_extent_ndims");
VERIFY(rank, SPACE3_RANK, "H5Sget_simple_extent_ndims");
ret = H5Sextent_dims(sid1, tdims, NULL);
VERIFY(ret, 0, "H5Sextent_dims");
ret = H5Sget_simple_extent_dims(sid1, tdims, NULL);
VERIFY(ret, 0, "H5Sget_simple_extent_dims");
ret = H5Dread(dataset, H5T_NATIVE_UINT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata);
CHECK(ret, FAIL, "H5Dread");
@ -318,16 +318,16 @@ test_h5s_compound_scalar_write(void)
sid1 = H5Screate_simple(SPACE3_RANK, NULL, NULL);
CHECK(sid1, FAIL, "H5Screate_simple");
n = H5Sextent_npoints(sid1);
CHECK(n, UFAIL, "H5Sextent_npoints");
VERIFY(n, 1, "H5Sextent_npoints");
n = H5Sget_simple_extent_npoints(sid1);
CHECK(n, UFAIL, "H5Sget_simple_extent_npoints");
VERIFY(n, 1, "H5Sget_simple_extent_npoints");
rank = H5Sextent_ndims(sid1);
CHECK(rank, UFAIL, "H5Sextent_ndims");
VERIFY(rank, SPACE3_RANK, "H5Sextent_ndims");
rank = H5Sget_simple_extent_ndims(sid1);
CHECK(rank, UFAIL, "H5Sget_simple_extent_ndims");
VERIFY(rank, SPACE3_RANK, "H5Sget_simple_extent_ndims");
ret = H5Sextent_dims(sid1, tdims, NULL);
VERIFY(ret, 0, "H5Sextent_dims");
ret = H5Sget_simple_extent_dims(sid1, tdims, NULL);
VERIFY(ret, 0, "H5Sget_simple_extent_dims");
/* Create a dataset */
dataset=H5Dcreate(fid1,"Dataset1",tid1,sid1,H5P_DEFAULT);
@ -382,16 +382,16 @@ test_h5s_compound_scalar_read(void)
sid1=H5Dget_space(dataset);
CHECK(sid1, FAIL, "H5Dget_space");
n = H5Sextent_npoints(sid1);
CHECK(n, UFAIL, "H5Sextent_npoints");
VERIFY(n, 1, "H5Sextent_npoints");
n = H5Sget_simple_extent_npoints(sid1);
CHECK(n, UFAIL, "H5Sget_simple_extent_npoints");
VERIFY(n, 1, "H5Sget_simple_extent_npoints");
rank = H5Sextent_ndims(sid1);
CHECK(rank, UFAIL, "H5Sextent_ndims");
VERIFY(rank, SPACE3_RANK, "H5Sextent_ndims");
rank = H5Sget_simple_extent_ndims(sid1);
CHECK(rank, UFAIL, "H5Sget_simple_extent_ndims");
VERIFY(rank, SPACE3_RANK, "H5Sget_simple_extent_ndims");
ret = H5Sextent_dims(sid1, tdims, NULL);
VERIFY(ret, 0, "H5Sextent_dims");
ret = H5Sget_simple_extent_dims(sid1, tdims, NULL);
VERIFY(ret, 0, "H5Sget_simple_extent_dims");
type=H5Dget_type(dataset);
CHECK(type, FAIL, "H5Dget_type");

12
test/tselect.c
View File

@ -107,8 +107,8 @@ test_select_hyper(void)
CHECK(sid2, FAIL, "H5Screate_simple");
/* Verify extent type */
ext_type = H5Sextent_class(sid1);
VERIFY(ext_type, H5S_SIMPLE, "H5Sextent_class");
ext_type = H5Sget_simple_extent_type(sid1);
VERIFY(ext_type, H5S_SIMPLE, "H5Sget_simple_extent_type");
/* Select 2x15x13 hyperslab for disk dataset */
start[0]=1; start[1]=0; start[2]=0;
@ -378,8 +378,8 @@ test_select_all(void)
CHECK(sid2, FAIL, "H5Screate_simple");
/* Verify extent type */
ext_type = H5Sextent_class(sid1);
VERIFY(ext_type, H5S_SIMPLE, "H5Sextent_class");
ext_type = H5Sget_simple_extent_type(sid1);
VERIFY(ext_type, H5S_SIMPLE, "H5Sget_simple_extent_type");
/* Select entire 15x26 extent for disk dataset */
ret = H5Sselect_all(sid1);
@ -1137,8 +1137,8 @@ test_select_hyper_offset(void)
CHECK(sid2, FAIL, "H5Screate_simple");
/* Verify extent type */
ext_type = H5Sextent_class(sid1);
VERIFY(ext_type, H5S_SIMPLE, "H5Sextent_class");
ext_type = H5Sget_simple_extent_type(sid1);
VERIFY(ext_type, H5S_SIMPLE, "H5Sget_simple_extent_type");
/* Select 2x15x13 hyperslab for disk dataset */
start[0]=1; start[1]=0; start[2]=0;

23
tools/h5dump.c
View File

@ -267,11 +267,12 @@ const char *pt;
*
*-----------------------------------------------------------------------*/
static void
dump_dataspace (hid_t space) {
hsize_t size[64];
hsize_t maxsize[64]; /* check max dims size */
int ndims = H5Sextent_dims(space, size, maxsize);
int i;
dump_dataspace (hid_t space)
{
hsize_t size[64];
hsize_t maxsize[64]; /* check max dims size */
int ndims = H5Sget_simple_extent_dims(space, size, maxsize);
int i;
indent += col;
@ -374,18 +375,18 @@ hid_t attr_id, type, space;
static herr_t
dump_all (hid_t group, const char *name, void __unused__ *op_data)
{
hid_t obj;
hid_t (*func)(void*);
void *edata;
char *buf;
H5G_stat_t statbuf;
hid_t obj;
hid_t (*func)(void*);
void *edata;
char *buf;
H5G_stat_t statbuf;
/* Disable error reporting */
H5Eget_auto (&func, &edata);
H5Eset_auto (NULL, NULL);
H5Gstat(group, name, FALSE, &statbuf);
H5Gget_stat(group, name, FALSE, &statbuf);
switch (statbuf.type) {
case H5G_LINK:

4
tools/h5dumputil.c
View File

@ -266,12 +266,12 @@ h5dump_simple(FILE *stream, const h5dump_t *info, hid_t dset, hid_t p_type, int
f_space = H5Aget_space(dset);
ndims = H5Sextent_ndims(f_space);
ndims = H5Sget_simple_extent_ndims(f_space);
if ((size_t)ndims>NELMTS(sm_size)) return -1;
/* Assume entire data space to be printed */
for (i=0; i<(hsize_t)ndims; i++) p_min_idx[i] = 0;
H5Sextent_dims(f_space, p_max_idx, NULL);
H5Sget_simple_extent_dims(f_space, p_max_idx, NULL);
for (i=0, p_nelmts=1; i<(hsize_t)ndims; i++) {
p_nelmts *= p_max_idx[i]-p_min_idx[i];
}

6
tools/h5ls.c
View File

@ -157,7 +157,7 @@ list_attr (hid_t obj, const char *attr_name, void __unused__ *op_data)
if ((attr = H5Aopen_name (obj, attr_name))) {
hid_t space = H5Aget_space (attr);
hsize_t size[64];
int ndims = H5Sextent_dims (space, size, NULL);
int ndims = H5Sget_simple_extent_dims (space, size, NULL);
H5Sclose (space);
printf (" {");
for (i=0; i<ndims; i++) {
@ -205,7 +205,7 @@ dataset_list1(hid_t dset)
* already been printed.
*/
space = H5Dget_space(dset);
ndims = H5Sextent_dims(space, cur_size, max_size);
ndims = H5Sget_simple_extent_dims(space, cur_size, max_size);
printf (" {");
for (i=0; i<ndims; i++) {
HDfprintf (stdout, "%s%Hu", i?", ":"", cur_size[i]);
@ -345,7 +345,7 @@ list (hid_t group, const char *name, void __unused__ *cd)
/* Get object information */
H5E_BEGIN_TRY {
status = H5Gstat(group, name, FALSE, &sb);
status = H5Gget_stat(group, name, FALSE, &sb);
} H5E_END_TRY;
if (status<0) {
puts("**NOT FOUND**");

4
tools/h5tools.c
View File

@ -273,12 +273,12 @@ h5dump_simple(FILE *stream, const h5dump_t *info, hid_t dset, hid_t p_type)
* match the dimensionality of the dataset.
*/
f_space = H5Dget_space(dset);
ndims = H5Sextent_ndims(f_space);
ndims = H5Sget_simple_extent_ndims(f_space);
if ((size_t)ndims>NELMTS(sm_size)) return -1;
/* Assume entire data space to be printed */
for (i=0; i<(hsize_t)ndims; i++) p_min_idx[i] = 0;
H5Sextent_dims(f_space, p_max_idx, NULL);
H5Sget_simple_extent_dims(f_space, p_max_idx, NULL);
for (i=0, p_nelmts=1; i<(hsize_t)ndims; i++) {
p_nelmts *= p_max_idx[i]-p_min_idx[i];
}