summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2006-12-21 16:05:00 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2006-12-21 16:05:00 (GMT)
commite3fe4f7790d6289c8736a20736448d86686751fa (patch)
tree67c18bfc9018cd4ef494d0ac2401d2d9de1219e5 /src
parent56dae018e20d1810137e61564c4ca47da3d32937 (diff)
downloadhdf5-e3fe4f7790d6289c8736a20736448d86686751fa.zip
hdf5-e3fe4f7790d6289c8736a20736448d86686751fa.tar.gz
hdf5-e3fe4f7790d6289c8736a20736448d86686751fa.tar.bz2
[svn-r13085] Yesterday's checkin wasn't a complete fix for copying filters in DCPLs.
Extended the test so it broke again and then fixed it again. Tested on kagiso.
Diffstat (limited to 'src')
-rw-r--r--src/H5Z.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Z.c b/src/H5Z.c
index dfeb2b5..3e1318d 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -793,12 +793,12 @@ H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
* a separate block of memory.
* For each filter, if cd_values points to the internal array
* _cd_values, the pointer will need to be updated when the
- * filter struct is reallocated. Set these pointers to NULL
+ * filter struct is reallocated. Set these pointers to ~NULL
* so that we can reset them after reallocating the filters array.
*/
for(n=0; n<pline->nalloc; ++n) {
if(pline->filter[n].cd_values == pline->filter[n]._cd_values)
- pline->filter[n].cd_values = NULL;
+ pline->filter[n].cd_values = (void *) ~((size_t)NULL);
}
x.nalloc = MAX(H5Z_MAX_NFILTERS, 2 * pline->nalloc);
@@ -812,7 +812,7 @@ H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
* data.
*/
for(n=0; n<pline->nalloc; ++n) {
- if(NULL == pline->filter[n].cd_values)
+ if(pline->filter[n].cd_values == (void *) ~((size_t) NULL))
pline->filter[n].cd_values = pline->filter[n]._cd_values;
}
} /* end if */