[svn-r4181] Purpose:

    Bug Fix, Code Cleanup, Code Optimization, etc.
Description:
    Fold in the hyperslab speedups, clean up compile warnings and change a
    few things from using 'unsigned' or 'hsize_t' to use 'size_t' instead.
Platforms tested:
    FreeBSD 4.3 (hawkwind), Solaris 2.7 (arabica), Irix64 6.5 (modi4)

1 files changed, 16 insertions, 10 deletions

diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index 763a592..ebb667c 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -69,7 +69,7 @@ typedef struct H5F_rdcc_t {
     uintn		nmisses;/* Number of cache misses		*/
     uintn		nflushes;/* Number of cache flushes		*/
     size_t		nbytes;	/* Current cached raw data in bytes	*/
-    intn		nslots;	/* Number of chunk slots allocated	*/
+    size_t		nslots;	/* Number of chunk slots allocated	*/
     struct H5F_rdcc_ent_t *head; /* Head of doubly linked list		*/
     struct H5F_rdcc_ent_t *tail; /* Tail of doubly linked list		*/
     intn		nused;	/* Number of chunk slots in use		*/
@@ -100,7 +100,7 @@ typedef struct H5F_file_t {
                             /* a H5F_create_t until we pass it back to */
                             /* H5P_close to release it - QAK */
     intn	mdc_nelmts;	/* Size of meta data cache (elements)	*/
-    intn	rdcc_nelmts;	/* Size of raw data chunk cache (elmts)	*/
+    size_t	rdcc_nelmts;	/* Size of raw data chunk cache (elmts)	*/
     size_t	rdcc_nbytes;	/* Size of raw data chunk cache	(bytes)	*/
     double	rdcc_w0;	/* Preempt read chunks first? [0.0..1.0]*/
     hsize_t	threshold;	/* Threshold for alignment		*/
@@ -111,11 +111,11 @@ typedef struct H5F_file_t {
     struct H5HG_heap_t **cwfs;	/* Global heap cache			*/
 
     /* Data Sieve Buffering fields */
-    unsigned char *sieve_buf;  /* Buffer to hold data sieve buffer */
-    haddr_t sieve_loc;      /* File location (offset) of the data sieve buffer */
-    hsize_t sieve_size;     /* Size of the data sieve buffer used (in bytes) */
-    hsize_t sieve_buf_size; /* Size of the data sieve buffer allocated (in bytes) */
-    unsigned sieve_dirty;   /* Flag to indicate that the data sieve buffer is dirty */
+    unsigned char *sieve_buf;   /* Buffer to hold data sieve buffer */
+    haddr_t sieve_loc;          /* File location (offset) of the data sieve buffer */
+    size_t sieve_size;          /* Size of the data sieve buffer used (in bytes) */
+    size_t sieve_buf_size;      /* Size of the data sieve buffer allocated (in bytes) */
+    unsigned sieve_dirty;       /* Flag to indicate that the data sieve buffer is dirty */
 
     H5F_rdcc_t	rdcc;		/* Raw data chunk cache			*/
 } H5F_file_t;
@@ -199,10 +199,16 @@ __DLL__ herr_t H5F_istore_allocate (H5F_t *f, hid_t dxpl_id,
 				    const struct H5O_fill_t *fill);
 
 /* Functions that operate on contiguous storage wrt boot block */
-__DLL__ herr_t H5F_contig_read(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, hsize_t size,
-                hid_t dxpl_id, void *_buf/*out*/);
+__DLL__ herr_t H5F_contig_read(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr,
+        size_t size, hid_t dxpl_id, void *_buf/*out*/);
 __DLL__ herr_t H5F_contig_write(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr,
-                  hsize_t size, hid_t dxpl_id, const void *buf);
+        size_t size, hid_t dxpl_id, const void *buf);
+
+/* Functions that operate on contiguous storage wrt boot block */
+__DLL__ herr_t H5F_contig_readv(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr,
+        size_t nseq, size_t size[], hsize_t offset[], hid_t dxpl_id, void *_buf/*out*/);
+__DLL__ herr_t H5F_contig_writev(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr,
+        size_t nseq, size_t size[], hsize_t offset[], hid_t dxpl_id, const void *buf);
 
 #endif