summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1998-06-23 03:41:22 (GMT)
committerRobb Matzke <matzke@llnl.gov>1998-06-23 03:41:22 (GMT)
commit4bf629adc96541fda24bafbdde00fd4ff92be344 (patch)
tree8e6d57995ba50bafdf172df9d480bd99cdb1230e /test
parent62607debf74800472572e65517ed284aef19a63c (diff)
downloadhdf5-4bf629adc96541fda24bafbdde00fd4ff92be344.zip
hdf5-4bf629adc96541fda24bafbdde00fd4ff92be344.tar.gz
hdf5-4bf629adc96541fda24bafbdde00fd4ff92be344.tar.bz2
[svn-r435] ./INSTALL
./INSTALL_MAINT ./README ./RELEASE Partially updated for second alpha, but haven't updated version numbers yet. ./src/H5.c ./src/H5A.c ./src/H5AC.c ./src/H5B.c ./src/H5D.c ./src/H5F.c ./src/H5Fcore.c ./src/H5Ffamily.c ./src/H5Fistore.c ./src/H5Fmpio.c ./src/H5Fsec2.c ./src/H5Fsplit.c ./src/H5Fstdio.c ./src/H5G.c ./src/H5Gnode.c ./src/H5HG.c ./src/H5HL.c ./src/H5I.c ./src/H5MM.c ./src/H5MMprivate.h ./src/H5O.c ./src/H5Oattr.c ./src/H5Ocomp.c ./src/H5Ocont.c ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Olayout.c ./src/H5Oname.c ./src/H5Osdspace.c ./src/H5Oshared.c ./src/H5Ostab.c ./src/H5P.c ./src/H5S.c ./src/H5T.c ./src/H5Tconv.c ./src/H5detect.c ./test/hyperslab.c ./test/istore.c Changed memory allocation functions so they fail instead of dumping core. The `x' was removed from the name to remind us of that: H5MM_xmalloc() -> H5MM_malloc(), etc. H5MM_calloc() takes one argument like H5MM_malloc() instead of two like calloc() because we almost always called it with `1' for one of the arguments anyway. The only difference between the two functions is that H5MM_calloc() returns memory which is initialized to zero. ./src/H5Gent.c ./src/H5Gprivate.h Removed H5G_ent_calloc() since it wasn't used. ./src/H5Fistore.c Fixed a bug found by Albert. Thanks, Albert! This fix combined with the changes to memory allocation prevent the library from failing an assertion if the application uses an unreasonable size for chunks (like Alberts 10000x10000x4). ./src/H5MF.c ./src/H5MFprivate.h Changed H5MF_free() to H5MF_xfree() since calling it with an undefined address is allowed.
Diffstat (limited to 'test')
-rw-r--r--test/.distdep108
-rw-r--r--test/hyperslab.c26
-rw-r--r--test/istore.c8
3 files changed, 71 insertions, 71 deletions
diff --git a/test/.distdep b/test/.distdep
index 17b11f1..388026c 100644
--- a/test/.distdep
+++ b/test/.distdep
@@ -106,37 +106,6 @@ tstab.o: \
../src/H5Tpublic.h \
../src/H5Sprivate.h \
../src/H5Spublic.h
-hyperslab.o: \
- hyperslab.c \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h
-istore.o: \
- istore.c \
- ../src/H5private.h \
- ../src/H5public.h \
- ../src/H5config.h \
- ../src/H5Iprivate.h \
- ../src/H5Ipublic.h \
- ../src/H5Pprivate.h \
- ../src/H5Ppublic.h \
- ../src/H5Dpublic.h \
- ../src/H5Fpublic.h \
- ../src/H5Zpublic.h \
- ../src/H5Fprivate.h \
- ../src/H5Gprivate.h \
- ../src/H5Gpublic.h \
- ../src/H5Bprivate.h \
- ../src/H5Bpublic.h \
- ../src/H5MMprivate.h \
- ../src/H5MMpublic.h \
- ../src/H5Oprivate.h \
- ../src/H5Opublic.h \
- ../src/H5HGprivate.h \
- ../src/H5HGpublic.h \
- ../src/H5Tprivate.h \
- ../src/H5Tpublic.h \
- ../src/H5Sprivate.h
extend.o: \
extend.c \
../src/hdf5.h \
@@ -302,20 +271,17 @@ bittests.o: \
../src/H5Gprivate.h \
../src/H5Gpublic.h \
../src/H5Bprivate.h
-tattr.o: \
- tattr.c \
- testhdf5.h \
- ../src/H5private.h \
+dtypes.o: \
+ dtypes.c \
+ ../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
- ../src/H5Eprivate.h \
- ../src/H5Epublic.h \
../src/H5Ipublic.h \
- ../src/hdf5.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 \
@@ -325,9 +291,10 @@ tattr.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Spublic.h
-dtypes.o: \
- dtypes.c \
+ ../src/H5Spublic.h \
+ ../src/H5Tpublic.h
+dsets.o: \
+ dsets.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -348,8 +315,8 @@ dtypes.o: \
../src/H5Zpublic.h \
../src/H5Spublic.h \
../src/H5Tpublic.h
-dsets.o: \
- dsets.c \
+cmpd_dset.o: \
+ cmpd_dset.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -368,10 +335,9 @@ dsets.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Spublic.h \
- ../src/H5Tpublic.h
-cmpd_dset.o: \
- cmpd_dset.c \
+ ../src/H5Spublic.h
+external.o: \
+ external.c \
../src/hdf5.h \
../src/H5public.h \
../src/H5config.h \
@@ -390,18 +356,22 @@ cmpd_dset.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Spublic.h
-external.o: \
- external.c \
- ../src/hdf5.h \
+ ../src/H5Spublic.h \
+ ../src/H5Tpublic.h
+tattr.o: \
+ tattr.c \
+ testhdf5.h \
+ ../src/H5private.h \
../src/H5public.h \
../src/H5config.h \
+ ../src/H5Eprivate.h \
+ ../src/H5Epublic.h \
../src/H5Ipublic.h \
+ ../src/hdf5.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 \
@@ -411,8 +381,7 @@ external.o: \
../src/H5Opublic.h \
../src/H5Ppublic.h \
../src/H5Zpublic.h \
- ../src/H5Spublic.h \
- ../src/H5Tpublic.h
+ ../src/H5Spublic.h
th5s.o: \
th5s.c \
testhdf5.h \
@@ -440,3 +409,34 @@ th5s.o: \
../src/H5Zprivate.h \
../src/H5Zpublic.h \
../src/H5Pprivate.h
+hyperslab.o: \
+ hyperslab.c \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h
+istore.o: \
+ istore.c \
+ ../src/H5private.h \
+ ../src/H5public.h \
+ ../src/H5config.h \
+ ../src/H5Iprivate.h \
+ ../src/H5Ipublic.h \
+ ../src/H5Pprivate.h \
+ ../src/H5Ppublic.h \
+ ../src/H5Dpublic.h \
+ ../src/H5Fpublic.h \
+ ../src/H5Zpublic.h \
+ ../src/H5Fprivate.h \
+ ../src/H5Gprivate.h \
+ ../src/H5Gpublic.h \
+ ../src/H5Bprivate.h \
+ ../src/H5Bpublic.h \
+ ../src/H5MMprivate.h \
+ ../src/H5MMpublic.h \
+ ../src/H5Oprivate.h \
+ ../src/H5Opublic.h \
+ ../src/H5HGprivate.h \
+ ../src/H5HGpublic.h \
+ ../src/H5Tprivate.h \
+ ../src/H5Tpublic.h \
+ ../src/H5Sprivate.h
diff --git a/test/hyperslab.c b/test/hyperslab.c
index b1d3deb..5ca810d 100644
--- a/test/hyperslab.c
+++ b/test/hyperslab.c
@@ -120,7 +120,7 @@ print_ref(size_t nx, size_t ny, size_t nz)
{
uint8 *array;
- array = H5MM_xcalloc((intn)(nx*ny*nz), sizeof(uint8));
+ array = H5MM_calloc(nx*ny*nz*sizeof(uint8));
printf("Reference array:\n");
init_full(array, nx, ny, nz);
@@ -183,7 +183,7 @@ test_fill(size_t nx, size_t ny, size_t nz,
fflush(stdout);
/* Allocate array */
- dst = H5MM_xcalloc(1, nx*ny*nz);
+ dst = H5MM_calloc(nx*ny*nz);
init_full(dst, nx, ny, nz);
for (i = 0; i < nx; i += di) {
@@ -380,8 +380,8 @@ test_copy(int mode,
/*
* Allocate arrays
*/
- src = H5MM_xcalloc(1, nx*ny*nz);
- dst = H5MM_xcalloc(1, nx*ny*nz);
+ src = H5MM_calloc(nx*ny*nz);
+ dst = H5MM_calloc(nx*ny*nz);
init_full(src, nx, ny, nz);
for (i = 0; i < nx; i += di) {
@@ -599,8 +599,8 @@ test_multifill(size_t nx)
fflush(stdout);
/* Initialize the source and destination */
- src = H5MM_xmalloc(nx * sizeof(*src));
- dst = H5MM_xmalloc(nx * sizeof(*dst));
+ src = H5MM_malloc(nx * sizeof(*src));
+ dst = H5MM_malloc(nx * sizeof(*dst));
for (i = 0; i < nx; i++) {
src[i].left = 1111111;
src[i].mid = 12345.6789;
@@ -707,9 +707,9 @@ test_endian(size_t nx)
fflush(stdout);
/* Initialize arrays */
- src = H5MM_xmalloc(nx * 4);
+ src = H5MM_malloc(nx * 4);
init_full(src, nx, 4, 1);
- dst = H5MM_xcalloc(4, nx);
+ dst = H5MM_calloc(nx * 4);
/* Initialize strides */
src_stride[0] = 0;
@@ -789,13 +789,13 @@ test_transpose(size_t nx, size_t ny)
fflush(stdout);
/* Initialize */
- src = H5MM_xmalloc(nx * ny * sizeof(*src));
+ src = H5MM_malloc(nx * ny * sizeof(*src));
for (i = 0; i < nx; i++) {
for (j = 0; j < ny; j++) {
src[i * ny + j] = (intn)(i * ny + j);
}
}
- dst = H5MM_xcalloc((intn)(nx*ny), sizeof(*dst));
+ dst = H5MM_calloc(nx*ny*sizeof(*dst));
/* Build stride info */
size[0] = nx;
@@ -896,10 +896,10 @@ test_sub_super(size_t nx, size_t ny)
fflush(stdout);
/* Initialize */
- full = H5MM_xmalloc(4 * nx * ny);
+ full = H5MM_malloc(4 * nx * ny);
init_full(full, 2 * nx, 2 * ny, 1);
- half = H5MM_xcalloc(1, nx*ny);
- twice = H5MM_xcalloc(1, 4*nx*ny);
+ half = H5MM_calloc(nx*ny);
+ twice = H5MM_calloc(4*nx*ny);
/* Setup */
size[0] = nx;
diff --git a/test/istore.c b/test/istore.c
index 06b13be..24c5cd7 100644
--- a/test/istore.c
+++ b/test/istore.c
@@ -236,9 +236,9 @@ test_extend(H5F_t *f, const char *prefix,
sprintf(s, "Testing istore extend: %s", dims);
printf("%-70s", s);
- buf = H5MM_xmalloc(nx * ny * nz);
- check = H5MM_xmalloc(nx * ny * nz);
- whole = H5MM_xcalloc(1, nx*ny*nz);
+ buf = H5MM_malloc(nx * ny * nz);
+ check = H5MM_malloc(nx * ny * nz);
+ whole = H5MM_calloc(nx*ny*nz);
/* Build the new empty object */
sprintf(name, "%s_%s", prefix, dims);
@@ -460,7 +460,7 @@ test_sparse(H5F_t *f, const char *prefix, size_t nblocks,
sprintf(s, "Testing istore sparse: %s", dims);
printf("%-70s", s);
- buf = H5MM_xmalloc(nx * ny * nz);
+ buf = H5MM_malloc(nx * ny * nz);
/* Build the new empty object */
sprintf(name, "%s_%s", prefix, dims);