summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-12-29 19:02:05 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-12-29 19:02:05 (GMT)
commit754e7b40b986e53a6060acdedb2d445e2ad1b8b9 (patch)
tree22b08e0d0d10fa3cb5f3f570a2e4f644946d4320
parent51984a99264fdee6bef4ec9eaa9bc065ff40c530 (diff)
downloadhdf5-754e7b40b986e53a6060acdedb2d445e2ad1b8b9.zip
hdf5-754e7b40b986e53a6060acdedb2d445e2ad1b8b9.tar.gz
hdf5-754e7b40b986e53a6060acdedb2d445e2ad1b8b9.tar.bz2
[svn-r7989] Purpose:
Code cleanup Description: Switch 'malloc()' to 'HDmalloc()' in a bunch of places. Platforms tested: FreeBSD 4.9 (sleipnir) too minor to require h5committest
-rw-r--r--test/tvltypes.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/test/tvltypes.c b/test/tvltypes.c
index 36fa524..63c3c8e 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -194,7 +194,7 @@ test_vltypes_vlen_atomic(void)
/* Allocate and initialize VL data to write */
for(i=0; i<SPACE1_DIM1; i++) {
- wdata[i].p=malloc((i+1)*sizeof(unsigned int));
+ wdata[i].p=HDmalloc((i+1)*sizeof(unsigned int));
wdata[i].len=i+1;
for(j=0; j<(i+1); j++)
((unsigned int *)wdata[i].p)[j]=i*10+j;
@@ -509,7 +509,7 @@ rewrite_vltypes_vlen_atomic(void)
/* Allocate and initialize VL data to write */
for(i=0; i<SPACE1_DIM1; i++) {
- wdata[i].p=malloc((i+increment)*sizeof(unsigned int));
+ wdata[i].p=HDmalloc((i+increment)*sizeof(unsigned int));
wdata[i].len=i+increment;
for(j=0; j<(i+increment); j++)
((unsigned int *)wdata[i].p)[j]=i*20+j;
@@ -672,7 +672,7 @@ test_vltypes_vlen_compound(void)
/* Allocate and initialize VL data to write */
for(i=0; i<SPACE1_DIM1; i++) {
- wdata[i].p=malloc((i+1)*sizeof(s1));
+ wdata[i].p=HDmalloc((i+1)*sizeof(s1));
wdata[i].len=i+1;
for(j=0; j<(i+1); j++) {
((s1 *)wdata[i].p)[j].i=i*10+j;
@@ -821,7 +821,7 @@ rewrite_vltypes_vlen_compound(void)
/* Allocate and initialize VL data to write */
for(i=0; i<SPACE1_DIM1; i++) {
- wdata[i].p=malloc((i+increment)*sizeof(s1));
+ wdata[i].p=HDmalloc((i+increment)*sizeof(s1));
wdata[i].len=i+increment;
for(j=0; j<(i+increment); j++) {
((s1 *)wdata[i].p)[j].i=i*40+j;
@@ -974,10 +974,10 @@ test_vltypes_compound_vlen_vlen(void)
for(i=0; i<SPACE3_DIM1; i++) {
wdata[i].i=i*10;
wdata[i].f=(float)((i*20)/3.0);
- wdata[i].v.p=malloc((i+L1_INCM)*sizeof(hvl_t));
+ wdata[i].v.p=HDmalloc((i+L1_INCM)*sizeof(hvl_t));
wdata[i].v.len=i+L1_INCM;
for(t1=(wdata[i].v).p,j=0; j<(i+L1_INCM); j++, t1++) {
- t1->p=malloc((j+L2_INCM)*sizeof(unsigned int));
+ t1->p=HDmalloc((j+L2_INCM)*sizeof(unsigned int));
t1->len=j+L2_INCM;
for(k=0; k<j+L2_INCM; k++)
((unsigned int*)t1->p)[k] = i*100 + j*10 + k;
@@ -1145,7 +1145,7 @@ test_vltypes_compound_vlen_atomic(void)
for(i=0; i<SPACE1_DIM1; i++) {
wdata[i].i=i*10;
wdata[i].f=(float)((i*20)/3.0);
- wdata[i].v.p=malloc((i+1)*sizeof(unsigned int));
+ wdata[i].v.p=HDmalloc((i+1)*sizeof(unsigned int));
wdata[i].v.len=i+1;
for(j=0; j<(i+1); j++)
((unsigned int *)wdata[i].v.p)[j]=i*10+j;
@@ -1374,7 +1374,7 @@ rewrite_vltypes_compound_vlen_atomic(void)
for(i=0; i<SPACE1_DIM1; i++) {
wdata[i].i=i*40;
wdata[i].f=(float)((i*50)/3.0);
- wdata[i].v.p=malloc((i+increment)*sizeof(unsigned int));
+ wdata[i].v.p=HDmalloc((i+increment)*sizeof(unsigned int));
wdata[i].v.len=i+increment;
for(j=0; j<(i+increment); j++)
((unsigned int *)wdata[i].v.p)[j]=i*60+j;
@@ -1545,7 +1545,7 @@ test_vltypes_vlen_vlen_atomic(void)
/* Allocate and initialize VL data to write */
for(i=0; i<SPACE1_DIM1; i++) {
- wdata[i].p=malloc((i+1)*sizeof(hvl_t));
+ wdata[i].p=HDmalloc((i+1)*sizeof(hvl_t));
if(wdata[i].p==NULL) {
printf("Cannot allocate memory for VL data! i=%u\n",i);
num_errs++;
@@ -1553,7 +1553,7 @@ test_vltypes_vlen_vlen_atomic(void)
} /* end if */
wdata[i].len=i+1;
for(t1=wdata[i].p,j=0; j<(i+1); j++, t1++) {
- t1->p=malloc((j+1)*sizeof(unsigned int));
+ t1->p=HDmalloc((j+1)*sizeof(unsigned int));
if(t1->p==NULL) {
printf("Cannot allocate memory for VL data! i=%u, j=%u\n",i,j);
num_errs++;
@@ -1741,7 +1741,7 @@ rewrite_longer_vltypes_vlen_vlen_atomic(void)
/* Allocate and initialize VL data to write */
for(i=0; i<SPACE1_DIM1; i++) {
- wdata[i].p=malloc((i+increment)*sizeof(hvl_t));
+ wdata[i].p=HDmalloc((i+increment)*sizeof(hvl_t));
if(wdata[i].p==NULL) {
printf("Cannot allocate memory for VL data! i=%u\n",i);
num_errs++;
@@ -1749,7 +1749,7 @@ rewrite_longer_vltypes_vlen_vlen_atomic(void)
} /* end if */
wdata[i].len=i+increment;
for(t1=wdata[i].p,j=0; j<(i+increment); j++, t1++) {
- t1->p=malloc((j+1)*sizeof(unsigned int));
+ t1->p=HDmalloc((j+1)*sizeof(unsigned int));
if(t1->p==NULL) {
printf("Cannot allocate memory for VL data! i=%u, j=%u\n",i,j);
num_errs++;
@@ -1922,7 +1922,7 @@ rewrite_shorter_vltypes_vlen_vlen_atomic(void)
/* Allocate and initialize VL data to write */
for(i=0; i<SPACE1_DIM1; i++) {
- wdata[i].p=malloc((i+increment)*sizeof(hvl_t));
+ wdata[i].p=HDmalloc((i+increment)*sizeof(hvl_t));
if(wdata[i].p==NULL) {
printf("Cannot allocate memory for VL data! i=%u\n",i);
num_errs++;
@@ -1930,7 +1930,7 @@ rewrite_shorter_vltypes_vlen_vlen_atomic(void)
} /* end if */
wdata[i].len=i+increment;
for(t1=wdata[i].p,j=0; j<(i+increment); j++, t1++) {
- t1->p=malloc((j+1)*sizeof(unsigned int));
+ t1->p=HDmalloc((j+1)*sizeof(unsigned int));
if(t1->p==NULL) {
printf("Cannot allocate memory for VL data! i=%u, j=%u\n",i,j);
num_errs++;