summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
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);
generated by cgit v0.12 at 2024-09-03 02:10:00 (GMT)