summaryrefslogtreecommitdiffstats
path: root/src/H5RA.c
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-01-07 11:41:25 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-01-07 11:41:25 (GMT)
commit504aa95bd92511ccb80e6321dd79f7dc525310d5 (patch)
tree43b1c89316ea8ef44db0fe05a6f33cba0006d4b0 /src/H5RA.c
parent04bec43fa2e962fc4bf5deef67879b5ebf573c8f (diff)
downloadhdf5-504aa95bd92511ccb80e6321dd79f7dc525310d5.zip
hdf5-504aa95bd92511ccb80e6321dd79f7dc525310d5.tar.gz
hdf5-504aa95bd92511ccb80e6321dd79f7dc525310d5.tar.bz2
[svn-r1010] Changes since 19981217
---------------------- ./src/H5.c ./src/H5private.h Renamed `library_initialize_g' to `H5_libinit_g' to make it conform to our naming scheme. ./src/H5I.c Fixed a bug in H5I_dec_ref() that caused the return value to always be zero instead of the new reference count. ./src/H5.c ./src/H5Odtype.c ./src/H5T.c ./src/H5Tconv.c ./src/H5Tpkg.h ./src/H5Tprivate.h ./src/H5Tpublic.h Added support for enumeration data types. ./src/H5RA.c Renamed H5T_insert() to H5T_struct_insert() and added H5T_enum_insert(). ./src/H5RA.c ./src/H5Shyper.c Added casts to size_t for the third argument of memcpy() to shut up a warning message from insure++. ./src/H5T.c Changed "can't" to "unable to" in some error messages to be more consistent. ./src/H5detect.c If fork() or waitpid() are unavailable then we assume no alignment constraints. Hopefully this is the case only on NT and Intel CPU's don't have alignment constraints. ./src/H5public.h Include <limits.h> because the H5T_NATIVE_CHAR macro needs the definition for CHAR_MIN.
Diffstat (limited to 'src/H5RA.c')
-rw-r--r--src/H5RA.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5RA.c b/src/H5RA.c
index 5585b84..6849201 100644
--- a/src/H5RA.c
+++ b/src/H5RA.c
@@ -86,12 +86,12 @@ H5RA_init_interface(void)
/* The meta dataset type */
if (NULL==(type=H5T_create(H5T_COMPOUND, sizeof(H5RA_meta_t))) ||
- H5T_insert(type, "nelmts", HOFFSET(H5RA_meta_t, nelmts),
- 0, NULL, NULL, H5I_object(H5T_NATIVE_HSIZE_g))<0 ||
- H5T_insert(type, "offset", HOFFSET(H5RA_meta_t, offset),
- 0, NULL, NULL, H5I_object(H5T_NATIVE_HSSIZE_g))<0 ||
- H5T_insert(type, "nover", HOFFSET(H5RA_meta_t, nover),
- 0, NULL, NULL, H5I_object(H5T_NATIVE_HSIZE_g))) {
+ H5T_struct_insert(type, "nelmts", HOFFSET(H5RA_meta_t, nelmts),
+ 0, NULL, NULL, H5I_object(H5T_NATIVE_HSIZE_g))<0 ||
+ H5T_struct_insert(type, "offset", HOFFSET(H5RA_meta_t, offset),
+ 0, NULL, NULL, H5I_object(H5T_NATIVE_HSSIZE_g))<0 ||
+ H5T_struct_insert(type, "nover", HOFFSET(H5RA_meta_t, nover),
+ 0, NULL, NULL, H5I_object(H5T_NATIVE_HSIZE_g))) {
HRETURN_ERROR(H5E_RAGGED, H5E_CANTINIT, FAIL,
"unable to define ragged array meta type");
}
@@ -1154,7 +1154,7 @@ H5RA_read(H5RA_t *ra, hssize_t start_row, hsize_t nrows, H5T_t *type,
/* Copy the part of the row from the raw dataset */
HDmemcpy(buf_out[i], raw_buf+i*raw_read_size[1]*type_size,
- MIN(size[i], raw_read_size[1])*type_size);
+ (size_t)(MIN(size[i], raw_read_size[1])*type_size));
/* Copy the part of the row from the overflow dataset */
if (size[i]>raw_read_size[1]) {