[svn-r2722] Purpose:

    Feature symmetry
Description:
    A while ago I needed to get the 'type' of data being accessed during writes
    to the VFL driver, so I put in code to get the information down there.
    Albert asked for the same information during reads, so I've added that in.
Tested:
    FreeBSD 4.1.1 (hawkwind)

1 files changed, 8 insertions, 8 deletions

diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index b4f4ab1..fa01acd 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -43,7 +43,7 @@ static intn		interface_initialize_g = 0;
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_contig_read(H5F_t *f, haddr_t addr, hsize_t size, hid_t dxpl_id,
+H5F_contig_read(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size, hid_t dxpl_id,
 	       void *_buf/*out*/)
 {
     uint8_t	*buf = (uint8_t*)_buf;		/*cast for arithmetic	*/
@@ -87,7 +87,7 @@ H5F_contig_read(H5F_t *f, haddr_t addr, hsize_t size, hid_t dxpl_id,
                     } /* end if */
 
                     /* Read directly into the user's buffer */
-                    if (H5F_block_read(f, addr, size, dxpl_id, buf)<0) {
+                    if (H5F_block_read(f, type, addr, size, dxpl_id, buf)<0) {
                         HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
                                   "block read failed");
                     }
@@ -117,7 +117,7 @@ H5F_contig_read(H5F_t *f, haddr_t addr, hsize_t size, hid_t dxpl_id,
                     f->shared->sieve_size=MIN(eoa-addr,f->shared->sieve_buf_size);
 
                     /* Read the new sieve buffer */
-                    if (H5F_block_read(f, f->shared->sieve_loc, f->shared->sieve_size, dxpl_id, f->shared->sieve_buf)<0) {
+                    if (H5F_block_read(f, type, f->shared->sieve_loc, f->shared->sieve_size, dxpl_id, f->shared->sieve_buf)<0) {
                         HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
                                   "block read failed");
                     }
@@ -134,7 +134,7 @@ H5F_contig_read(H5F_t *f, haddr_t addr, hsize_t size, hid_t dxpl_id,
         else {
             /* Check if we can actually hold the I/O request in the sieve buffer */
             if(size>f->shared->sieve_buf_size) {
-                if (H5F_block_read(f, addr, size, dxpl_id, buf)<0) {
+                if (H5F_block_read(f, type, addr, size, dxpl_id, buf)<0) {
                     HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
                               "block read failed");
                 }
@@ -157,7 +157,7 @@ H5F_contig_read(H5F_t *f, haddr_t addr, hsize_t size, hid_t dxpl_id,
                 f->shared->sieve_size=MIN(eoa-addr,f->shared->sieve_buf_size);
 
                 /* Read the new sieve buffer */
-                if (H5F_block_read(f, f->shared->sieve_loc, f->shared->sieve_size, dxpl_id, f->shared->sieve_buf)<0) {
+                if (H5F_block_read(f, type, f->shared->sieve_loc, f->shared->sieve_size, dxpl_id, f->shared->sieve_buf)<0) {
                     HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
                               "block read failed");
                 }
@@ -171,7 +171,7 @@ H5F_contig_read(H5F_t *f, haddr_t addr, hsize_t size, hid_t dxpl_id,
         } /* end else */
     } /* end if */
     else {
-        if (H5F_block_read(f, addr, size, dxpl_id, buf)<0) {
+        if (H5F_block_read(f, type, addr, size, dxpl_id, buf)<0) {
             HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
                       "block read failed");
         }
@@ -278,7 +278,7 @@ H5F_contig_write(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size,
                     f->shared->sieve_size=MIN(eoa-addr,f->shared->sieve_buf_size);
 
                     /* Read the new sieve buffer */
-                    if (H5F_block_read(f, f->shared->sieve_loc, f->shared->sieve_size, dxpl_id, f->shared->sieve_buf)<0) {
+                    if (H5F_block_read(f, type, f->shared->sieve_loc, f->shared->sieve_size, dxpl_id, f->shared->sieve_buf)<0) {
                         HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
                                   "block read failed");
                     }
@@ -319,7 +319,7 @@ H5F_contig_write(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size,
                 f->shared->sieve_size=MIN(eoa-addr,f->shared->sieve_buf_size);
 
                 /* Read the new sieve buffer */
-                if (H5F_block_read(f, f->shared->sieve_loc, f->shared->sieve_size, dxpl_id, f->shared->sieve_buf)<0) {
+                if (H5F_block_read(f, type, f->shared->sieve_loc, f->shared->sieve_size, dxpl_id, f->shared->sieve_buf)<0) {
                     HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL,
                               "block read failed");
                 }