diff options
| author | Robb Matzke <matzke@llnl.gov> | 1999-07-28 19:37:35 (GMT) |
|---|---|---|
| committer | Robb Matzke <matzke@llnl.gov> | 1999-07-28 19:37:35 (GMT) |
| commit | 2681ce4a86ca3c6400ba242bc336d23c77753ff5 (patch) | |
| tree | f4cb88dcd07675a7a4c76141a080148cee1eabc7 /src/H5Farray.c | |
| parent | e4834c43ce6528308ebd5375bd4c7a0df88af427 (diff) | |
| download | hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.zip hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.tar.gz hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.tar.bz2 | |
[svn-r1549] Changes since 19990728
----------------------
./src/H5B.c [1.3]
./src/H5D.c [1.3]
./src/H5F.c [1.3]
./src/H5Farray.c [1.3]
./src/H5Fcore.c [1.3]
./src/H5Ffamily.c [1.3]
./src/H5Fistore.c [1.3]
./src/H5Flow.c [1.3]
./src/H5Fmpio.c [1.3]
./src/H5Fprivate.h [1.3]
./src/H5Fsplit.c [1.3]
./src/H5Fstdio.c [1.3]
./src/H5G.c [1.3]
./src/H5HG.c [1.3]
./src/H5HL.c [1.3]
./src/H5MF.c [1.3]
./src/H5O.c [1.3]
./src/H5Odtype.c [1.3]
./src/H5Oefl.c [1.3]
./src/H5P.c [1.3]
./src/H5Smpio.c [1.3]
./src/H5T.c [1.3]
./src/H5detect.c [1.3]
./tools/h5debug.c [1.3]
Some of the H5F_addr_* functions were optimized away.
./src/H5D.c [1.3]
Fixed the return values from NULL to FAIL on one MPI-IO
function.
Diffstat (limited to 'src/H5Farray.c')
| -rw-r--r-- | src/H5Farray.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Farray.c b/src/H5Farray.c index b2c9551..67c0446 100644 --- a/src/H5Farray.c +++ b/src/H5Farray.c @@ -51,7 +51,7 @@ H5F_arr_create (H5F_t *f, struct H5O_layout_t *layout/*in,out*/) /* check args */ assert (f); assert (layout); - H5F_addr_undef(&(layout->addr)); /*just in case we fail*/ + layout->addr = H5F_ADDR_UNDEF; /*just in case we fail*/ switch (layout->type) { case H5D_CONTIGUOUS: @@ -211,11 +211,11 @@ H5F_arr_read (H5F_t *f, const H5F_xfer_t *xfer, H5V_vector_cpy (ndims, idx, hslab_size); nelmts = H5V_vector_reduce_product (ndims, hslab_size); if (efl && efl->nused>0) { - H5F_addr_reset (&addr); + addr = 0; } else { addr = layout->addr; } - H5F_addr_inc (&addr, file_start); + addr += file_start; buf += mem_start; /* @@ -262,7 +262,7 @@ H5F_arr_read (H5F_t *f, const H5F_xfer_t *xfer, /* Decrement indices and advance pointers */ for (j=ndims-1, carray=TRUE; j>=0 && carray; --j) { - H5F_addr_adj(&addr, file_stride[j]); + addr += file_stride[j]; buf += mem_stride[j]; if (--idx[j]) carray = FALSE; @@ -437,11 +437,11 @@ H5F_arr_write (H5F_t *f, const H5F_xfer_t *xfer, H5V_vector_cpy (ndims, idx, hslab_size); nelmts = H5V_vector_reduce_product (ndims, hslab_size); if (efl && efl->nused>0) { - H5F_addr_reset (&addr); + addr = 0; } else { addr = layout->addr; } - H5F_addr_inc (&addr, file_start); + addr += file_start; buf += mem_start; /* @@ -489,7 +489,7 @@ H5F_arr_write (H5F_t *f, const H5F_xfer_t *xfer, /* Decrement indices and advance pointers */ for (j=ndims-1, carray=TRUE; j>=0 && carray; --j) { - H5F_addr_adj (&addr, file_stride[j]); + addr += file_stride[j]; buf += mem_stride[j]; if (--idx[j]) carray = FALSE; |