diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-01-22 15:27:29 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-01-22 15:27:29 (GMT) |
commit | fdfb6dfd26410b931b4452f832b5a4aedec283e0 (patch) | |
tree | 052c551e3cb4f99b2c77af519dce3d3d6ae7429c /src/H5P.c | |
parent | 851b17c87ad6f841efb5a5ba1b90b8c6636a2ffd (diff) | |
download | hdf5-fdfb6dfd26410b931b4452f832b5a4aedec283e0.zip hdf5-fdfb6dfd26410b931b4452f832b5a4aedec283e0.tar.gz hdf5-fdfb6dfd26410b931b4452f832b5a4aedec283e0.tar.bz2 |
[svn-r163] Changes since 19980121
----------------------
./Makefile.in
Added more dependencies to .PHONY.
./src/H5D.c
The write side of the I/O pipeline is implemented now too.
Things are looking good for the prototype and it's just a
matter of populating the library with the data type and data
space conversion functions.
./src/H5Farray.c
./src/H5Fprivate.h
./test/istore.c
Changed the order of the arguments for H5F_arr_read() and
H5F_arr_write().
./src/H5P.c
./src/H5Pprivate.h
Changed the names of the arguments of H5P_find(). Fleshed out
the mgath and fscat callback types.
./src/H5Psimp.c
Added stubs for H5P_simp_mgath() and H5P_simp_fscat() that
operate on the entire data space. Quincey, once you have the
data space hyperslab stuff in place let me know and I'll
finish the H5P_simp_*() functions to do partial I/O. Or you
can take a look at it too if you like; there's some comments
in there for you.
./src/H5V.c
./src/H5Vprivate.h
Changed dimensionality arguments from `size_t' to `intn' to be
consistent with the rest of the library and to get rid of
warnings on 64-bit Irix.
Diffstat (limited to 'src/H5P.c')
-rw-r--r-- | src/H5P.c | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -896,9 +896,10 @@ H5Pset_space(hid_t sid, intn rank, const size_t *dims) /*------------------------------------------------------------------------- * Function: H5P_find * - * Purpose: Given source and destination data spaces (SRC and DST) this + * Purpose: Given two data spaces (MEM_SPACE and FILE_SPACE) this * function locates the data space conversion functions and - * initializes CONV to point to them. + * initializes CONV to point to them. The CONV contains + * function pointers for converting in either direction. * * Return: Success: Pointer to a data space conversion callback * list. @@ -913,7 +914,7 @@ H5Pset_space(hid_t sid, intn rank, const size_t *dims) *------------------------------------------------------------------------- */ const H5P_conv_t * -H5P_find (const H5P_t *src, const H5P_t *dst) +H5P_find (const H5P_t *mem_space, const H5P_t *file_space) { static H5P_conv_t _conv; static const H5P_conv_t *conv = NULL; @@ -921,16 +922,16 @@ H5P_find (const H5P_t *src, const H5P_t *dst) FUNC_ENTER (H5P_find, NULL); /* Check args */ - assert (src && H5P_SIMPLE==src->type); - assert (dst && H5P_SIMPLE==dst->type); + assert (mem_space && H5P_SIMPLE==mem_space->type); + assert (file_space && H5P_SIMPLE==file_space->type); /* * We can't do conversion if the source and destination select a * different number of data points. */ - if (H5P_get_npoints (src) != H5P_get_npoints (dst)) { + if (H5P_get_npoints (mem_space) != H5P_get_npoints (file_space)) { HRETURN_ERROR (H5E_DATASPACE, H5E_BADRANGE, NULL, - "src and dest data spaces are different sizes"); + "memory and file data spaces are different sizes"); } /* |