[svn-r9729] Purpose:

    Bug Fix/Code Cleanup/Doc Cleanup/Optimization/Branch Sync :-)

Description:
    Generally speaking, this is the "signed->unsigned" change to selections.
However, in the process of merging code back, things got stickier and stickier
until I ended up doing a big "sync the two branches up" operation.  So... I
brought back all the "infrastructure" fixes from the development branch to the
release branch (which I think were actually making some improvement in
performance) as well as fixed several bugs which had been fixed in one branch,
but not the other.

    I've also tagged the repository before making this checkin with the label
"before_signed_unsigned_changes".

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel & fphdf5
    FreeBSD 4.10 (sleipnir) w/threadsafe
    FreeBSD 4.10 (sleipnir) w/backward compatibility
    Solaris 2.7 (arabica) w/"purify options"
    Solaris 2.8 (sol) w/FORTRAN & C++
    AIX 5.x (copper) w/parallel & FORTRAN
    IRIX64 6.5 (modi4) w/FORTRAN
    Linux 2.4 (heping) w/FORTRAN & C++


Misc. update:

7 files changed, 9 insertions, 12 deletions

diff --git a/perform/Makefile.in b/perform/Makefile.in
index 55a1d48..7228919 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -1,4 +1,3 @@
-## HDF5 Library Performance Makefile(.in)
 ##
 ## Copyright by the Board of Trustees of the University of Illinois.
 ## All rights reserved.
@@ -12,6 +11,8 @@
 ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have
 ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu.
 ##
+## HDF5 Library Performance Makefile(.in)
+##
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
diff --git a/perform/chunk.c b/perform/chunk.c
index 0348e6d..3600bdb 100644
--- a/perform/chunk.c
+++ b/perform/chunk.c
@@ -197,7 +197,7 @@ test_rowmaj (int op, size_t cache_size, size_t io_size)
     hid_t	file, dset, mem_space, file_space;
     signed char	*buf = calloc (1, (size_t)(SQUARE(io_size)));
     hsize_t	i, j, hs_size[2];
-    hssize_t	hs_offset[2];
+    hsize_t	hs_offset[2];
 #ifdef H5_WANT_H5_V1_4_COMPAT
     int		mdc_nelmts, rdcc_nelmts;
 #else /* H5_WANT_H5_V1_4_COMPAT */
@@ -277,7 +277,7 @@ test_diag (int op, size_t cache_size, size_t io_size, size_t offset)
     hid_t	file, dset, mem_space, file_space;
     hsize_t	i, hs_size[2];
     hsize_t	nio = 0;
-    hssize_t	hs_offset[2];
+    hsize_t	hs_offset[2];
     signed char	*buf = calloc (1, (size_t)(SQUARE (io_size)));
 #ifdef H5_WANT_H5_V1_4_COMPAT
     int		mdc_nelmts, rdcc_nelmts;
diff --git a/perform/iopipe.c b/perform/iopipe.c
index aa1ac77..92c85c3 100644
--- a/perform/iopipe.c
+++ b/perform/iopipe.c
@@ -203,7 +203,7 @@ main (void)
     int			i, fd;
     hssize_t		n;
     off_t		offset;
-    hssize_t		start[2];
+    hsize_t		start[2];
     hsize_t		count[2];
 
 
diff --git a/perform/overhead.c b/perform/overhead.c
index 0066255..31211cb 100644
--- a/perform/overhead.c
+++ b/perform/overhead.c
@@ -194,7 +194,7 @@ test(fill_t fill_style, const double splits[],
     hsize_t	ch_size[1] = {1};		/*chunk size		*/
     hsize_t	cur_size[1] = {1000};		/*current dataset size	*/
     hsize_t	max_size[1] = {H5S_UNLIMITED};	/*maximum dataset size	*/
-    hssize_t	hs_start[1];			/*hyperslab start offset*/
+    hsize_t	hs_start[1];			/*hyperslab start offset*/
     hsize_t	hs_count[1] = {1};		/*hyperslab nelmts	*/
     int		fd = (-1);			/*h5 file direct	*/
     static int	*had = NULL;			/*for random filling	*/
diff --git a/perform/perf_meta.c b/perform/perf_meta.c
index 55adc57..97775a8 100644
--- a/perform/perf_meta.c
+++ b/perform/perf_meta.c
@@ -170,10 +170,8 @@ parse_options(int argc, char **argv)
     } /*while*/
 
     /* Check valid values */
+#ifndef H5_HAVE_PARALLEL
     if(facc_type == FACC_MPIO || facc_type == FACC_MPIPOSIX)
-#ifdef H5_HAVE_PARALLEL
-        ;
-#else
     {
         nerrors++;
         return(1);
diff --git a/perform/pio_engine.c b/perform/pio_engine.c
index 74e5f02..8a14f88 100644
--- a/perform/pio_engine.c
+++ b/perform/pio_engine.c
@@ -520,7 +520,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets,
     hsize_t	h5block[1];		/*dataspace selection           */
     hsize_t	h5stride[1];
     hsize_t	h5count[1];
-    hssize_t	h5start[1];
+    hsize_t	h5start[1];
     hssize_t	h5offset[1];            /* Selection offset within dataspace */
     hid_t       h5dcpl = -1;            /* Dataset creation property list */
     hid_t       h5dxpl = -1;            /* Dataset transfer property list */
@@ -1001,7 +1001,7 @@ do_read(results *res, file_descr *fd, parameters *parms, long ndsets,
     hsize_t	h5block[1];		/*dataspace selection           */
     hsize_t	h5stride[1];
     hsize_t	h5count[1];
-    hssize_t	h5start[1];
+    hsize_t	h5start[1];
     hssize_t	h5offset[1];            /* Selection offset within dataspace */
     hid_t       h5dxpl = -1;            /* Dataset transfer property list */
 
diff --git a/perform/zip_perf.c b/perform/zip_perf.c
index 37f264a..321d6e6 100644
--- a/perform/zip_perf.c
+++ b/perform/zip_perf.c
@@ -12,8 +12,6 @@
  * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-/* @(#) $Id$ */
-
 /* ===========================================================================
  * Usage:  zip_perf [-d] [-f] [-h] [-1 to -9] [files...]
  *   -d : decompress