[svn-r9342] Purpose:

    Bug fix/code cleanup

Description:
    Clean up raw data I/O code to bundle the I/O parameters (dataset, DXPL ID,
etc) into a single struct to pass around through the dataset I/O routines,
since they are always passed together, until very near the bottom of the I/O
stack.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel
    Solaris 2.7 (arabica)
    IRIX64 6.5 (modi4)
    h5committest

1 files changed, 12 insertions, 12 deletions

diff --git a/src/H5Sprivate.h b/src/H5Sprivate.h
index efa9b30..4879bfd 100644
--- a/src/H5Sprivate.h
+++ b/src/H5Sprivate.h
@@ -117,16 +117,16 @@ typedef struct H5S_conv_t {
      */
     
     /* Read from file to application w/o intermediate scratch buffer */
-    herr_t (*read)(H5F_t *f, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
-           H5D_t *dset, const H5D_storage_t *store,
+    herr_t (*read)(H5D_io_info_t *io_info,
+           H5O_layout_readvv_func_t op,
            size_t nelmts, size_t elmt_size,
            const H5S_t *file_space, const H5S_t *mem_space,
            void *buf/*out*/);
 
 
     /* Write directly from app buffer to file */
-    herr_t (*write)(H5F_t *f, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
-           H5D_t *dset, const H5D_storage_t *store,
+    herr_t (*write)(H5D_io_info_t *io_info,
+           H5O_layout_writevv_func_t op,
            size_t nelmts, size_t elmt_size,
            const H5S_t *file_space, const H5S_t *mem_space,
            const void *buf);
@@ -234,12 +234,12 @@ H5_DLL herr_t H5S_select_iterate(void *buf, hid_t type_id, const H5S_t *space,
 				H5D_operator_t op, void *operator_data);
 H5_DLL herr_t H5S_select_fill(void *fill, size_t fill_size,
                                 const H5S_t *space, void *buf);
-H5_DLL herr_t H5S_select_fscat (H5F_t *f, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
-    H5D_t *dset, const H5D_storage_t *store,
+H5_DLL herr_t H5S_select_fscat (H5D_io_info_t *io_info,
+    H5O_layout_writevv_func_t op,
     const H5S_t *file_space, H5S_sel_iter_t *file_iter, size_t nelmts,
     const void *_buf);
-H5_DLL size_t H5S_select_fgath (H5F_t *f, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
-    H5D_t *dset, const H5D_storage_t *store,
+H5_DLL size_t H5S_select_fgath (H5D_io_info_t *io_info,
+    H5O_layout_readvv_func_t op,
     const H5S_t *file_space, H5S_sel_iter_t *file_iter, size_t nelmts,
     void *buf);
 H5_DLL herr_t H5S_select_mscat (const void *_tscat_buf,
@@ -248,13 +248,13 @@ H5_DLL herr_t H5S_select_mscat (const void *_tscat_buf,
 H5_DLL size_t H5S_select_mgath (const void *_buf,
         const H5S_t *space, H5S_sel_iter_t *iter, size_t nelmts,
         const H5D_dxpl_cache_t *dxpl_cache, void *_tgath_buf/*out*/);
-H5_DLL herr_t H5S_select_read(H5F_t *f, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
-        H5D_t *dset, const H5D_storage_t *store,
+H5_DLL herr_t H5S_select_read(H5D_io_info_t *io_info,
+        H5O_layout_readvv_func_t op,
         size_t nelmts, size_t elmt_size,
         const H5S_t *file_space, const H5S_t *mem_space,
         void *buf/*out*/);
-H5_DLL herr_t H5S_select_write(H5F_t *f, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
-        H5D_t *dset, const H5D_storage_t *store,
+H5_DLL herr_t H5S_select_write(H5D_io_info_t *io_info,
+        H5O_layout_writevv_func_t op,
         size_t nelmts, size_t elmt_size,
         const H5S_t *file_space, const H5S_t *mem_space,
         const void *buf/*out*/);