[svn-r601] Changes since 19980814

----------------------

./src/H5Fistore.c
        Fixed a bug that caused the wrong number of chunk offsets to
        be read or written from the file.

./src/H5Z.c
        Fixed a memory bug.

./test/dtypes.c
        Removed redundant tests.

./bin/snapshot
        Removed Perl code from a shell script. Oops :-)

./src/H5D.c
        Removed cvs merge conflicts.

./src/H5Omtime.c
        Fixed a typo in the Irix5.3 code.

./src/H5S.c
        Fixed a memory leak.

./src/H5Shyper.c
        Fixed a bad call to malloc() that didn't allocate enough
        memory. Reordered a comparison to eliminate an array bounds
        read error.

14 files changed, 331 insertions, 321 deletions

diff --git a/README b/README
index aa37e7f..28a612d 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is hdf5-1.0.68 released on Mon Aug 10 04:13:45 CDT 1998
+This is hdf5-1.0.69 released on Mon Aug 17 18:26:29 CDT 1998
 Please refer to the INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/bin/snapshot b/bin/snapshot
index 4f03da6..0b0edd4 100755
--- a/bin/snapshot
+++ b/bin/snapshot
@@ -11,7 +11,7 @@ date
 
 # The path isn't properly initialized on hawkwind -- /usr/local/bin is
 # either missing or is after /usr/bin when it should be before.
-$ENV{PATH} = "/usr/local/bin:" . $ENV{PATH};
+PATH="/usr/local/bin:$PATH"
 
 # Where are the snapshots stored?
 ARCHIVES=/hdf3/ftp/pub/outgoing/hdf5/snapshots
diff --git a/src/.distdep b/src/.distdep
index b402f5a..2adfc73 100644
--- a/src/.distdep
+++ b/src/.distdep
@@ -50,34 +50,6 @@ H5Ffamily.o: \
    H5Eprivate.h \
    H5Epublic.h \
    H5Ipublic.h
-H5Fmpio.o: \
-   H5Fmpio.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Dprivate.h \
-   H5Dpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h
 H5Fsec2.o: \
    H5Fsec2.c \
    H5private.h \
@@ -331,29 +303,6 @@ H5Olayout.o: \
    H5Sprivate.h \
    H5Spublic.h \
    H5Zprivate.h
-H5Omtime.o: \
-   H5Omtime.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h
 H5Oname.o: \
    H5Oname.c \
    H5private.h \
@@ -613,29 +562,6 @@ H5O.o: \
    H5Tprivate.h \
    H5Tpublic.h \
    H5Sprivate.h
-H5Ocomp.o: \
-   H5Ocomp.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h
 H5Oefl.o: \
    H5Oefl.c \
    H5private.h \
@@ -664,34 +590,6 @@ H5Oefl.o: \
    H5Sprivate.h \
    H5Spublic.h \
    H5Zprivate.h
-H5Sselect.o: \
-   H5Sselect.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Iprivate.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h
 H5P.o: \
    H5P.c \
    H5private.h \
@@ -720,19 +618,6 @@ H5P.o: \
    H5Eprivate.h \
    H5Epublic.h \
    H5MMprivate.h
-H5Flow.o: \
-   H5Flow.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h
 H5A.o: \
    H5A.c \
    H5private.h \
@@ -766,39 +651,6 @@ H5A.o: \
    H5Ppublic.h \
    H5Apkg.h \
    H5Aprivate.h
-H5F.o: \
-   H5F.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Aprivate.h \
-   H5Apublic.h \
-   H5Ipublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Dprivate.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Iprivate.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h
 H5Tconv.o: \
    H5Tconv.c \
    H5Iprivate.h \
@@ -899,29 +751,6 @@ H5Sall.o: \
    H5HGpublic.h \
    H5Tprivate.h \
    H5Tpublic.h
-H5Shyper.o: \
-   H5Shyper.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h
 H5Spoint.o: \
    H5Spoint.c \
    H5private.h \
@@ -973,25 +802,22 @@ H5T.o: \
    H5Eprivate.h \
    H5Epublic.h \
    H5MMprivate.h
-H5Z.o: \
-   H5Z.c \
+H5G.o: \
+   H5G.c \
    H5private.h \
    H5public.h \
    H5config.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
    H5Fprivate.h \
    H5Fpublic.h \
+   H5Ipublic.h \
    H5Dpublic.h \
+   H5Dprivate.h \
    H5Gprivate.h \
    H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
    H5HGprivate.h \
    H5HGpublic.h \
    H5Tprivate.h \
@@ -999,17 +825,29 @@ H5Z.o: \
    H5Sprivate.h \
    H5Spublic.h \
    H5Zprivate.h \
-   H5Zpublic.h
-H5Fistore.o: \
-   H5Fistore.c \
+   H5Zpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Gpkg.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5HLprivate.h \
+   H5HLpublic.h \
+   H5Iprivate.h \
+   H5MMprivate.h
+H5D.o: \
+   H5D.c \
    H5private.h \
    H5public.h \
    H5config.h \
-   H5Dprivate.h \
-   H5Dpublic.h \
+   H5Iprivate.h \
    H5Ipublic.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
    H5Fprivate.h \
    H5Fpublic.h \
+   H5Dpublic.h \
+   H5Dprivate.h \
    H5Gprivate.h \
    H5Gpublic.h \
    H5Bprivate.h \
@@ -1026,21 +864,53 @@ H5Fistore.o: \
    H5Zpublic.h \
    H5Eprivate.h \
    H5Epublic.h \
+   H5HLprivate.h \
+   H5HLpublic.h \
    H5MFprivate.h \
    H5MFpublic.h
-H5D.o: \
-   H5D.c \
+H5F.o: \
+   H5F.c \
    H5private.h \
    H5public.h \
    H5config.h \
-   H5Iprivate.h \
+   H5Aprivate.h \
+   H5Apublic.h \
    H5Ipublic.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
    H5Fprivate.h \
    H5Fpublic.h \
    H5Dpublic.h \
    H5Dprivate.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h \
+   H5Iprivate.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h
+H5Fistore.o: \
+   H5Fistore.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Dprivate.h \
+   H5Dpublic.h \
+   H5Ipublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
    H5Gprivate.h \
    H5Gpublic.h \
    H5Bprivate.h \
@@ -1057,24 +927,37 @@ H5D.o: \
    H5Zpublic.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5HLprivate.h \
-   H5HLpublic.h \
    H5MFprivate.h \
    H5MFpublic.h
-H5G.o: \
-   H5G.c \
+H5Flow.o: \
+   H5Flow.c \
    H5private.h \
    H5public.h \
    H5config.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h \
    H5Fprivate.h \
    H5Fpublic.h \
-   H5Ipublic.h \
    H5Dpublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h
+H5Fmpio.o: \
+   H5Fmpio.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h \
    H5Dprivate.h \
+   H5Dpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
    H5Gprivate.h \
    H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
    H5Oprivate.h \
    H5Opublic.h \
    H5HGprivate.h \
@@ -1085,15 +968,31 @@ H5G.o: \
    H5Spublic.h \
    H5Zprivate.h \
    H5Zpublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h
+H5Omtime.o: \
+   H5Omtime.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5Gpkg.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
-   H5HLprivate.h \
-   H5HLpublic.h \
-   H5Iprivate.h \
-   H5MMprivate.h
+   H5Ipublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h
 H5S.o: \
    H5S.c \
    H5private.h \
@@ -1117,3 +1016,104 @@ H5S.o: \
    H5HGprivate.h \
    H5HGpublic.h \
    H5Tprivate.h
+H5Shyper.o: \
+   H5Shyper.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h
+H5Sselect.o: \
+   H5Sselect.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h \
+   H5Iprivate.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h
+H5Ocomp.o: \
+   H5Ocomp.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h
+H5Z.o: \
+   H5Z.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h
diff --git a/src/H5D.c b/src/H5D.c
index b96b900..e033e93 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -1340,11 +1340,6 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
         HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
 		     "unable to convert from file to memory data space");
     }
-<<<<<<< H5D.c
-#ifdef QAK
-    printf("%s: check 1.0\n",FUNC);
-#endif /* QAK */
-	
 #ifdef HAVE_PARALLEL
     /* rky 980813 This is a temporary KLUGE.
      * The sconv functions should be set by H5S_find,
@@ -1353,12 +1348,9 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
      * (the latter in case the arguments to sconv_funcs
      * turn out to be inappropriate for MPI-IO).  */
     if (dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO) {
-	sconv_func.read = H5S_mpio_spaces_read;
+	sconv->read = H5S_mpio_spaces_read;
     }
 #endif /*HAVE_PARALLEL*/
-    
-=======
->>>>>>> 1.113
 
     /*
      * If there is no type conversion then try reading directly into the
@@ -1694,11 +1686,6 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
 	HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
 		     "unable to convert from memory to file data space");
     }
-<<<<<<< H5D.c
-#ifdef QAK
-    printf("%s: check 1.0\n",FUNC);
-#endif /* QAK */
-    
 #ifdef HAVE_PARALLEL
     /* rky 980813 This is a temporary KLUGE.
      * The sconv functions should be set by H5S_find,
@@ -1707,13 +1694,10 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
      * (the latter in case the arguments to sconv_funcs
      * turn out to be inappropriate for MPI-IO).  */
     if (dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO) {
-	sconv_func.write = H5S_mpio_spaces_write;
+	sconv->write = H5S_mpio_spaces_write;
     }
 #endif /*HAVE_PARALLEL*/
     
-=======
-
->>>>>>> 1.113
     /*
      * If there is no type conversion then try writing directly from
      * application buffer to file.
diff --git a/src/H5Distore.c b/src/H5Distore.c
index 3c858bd..dcea323 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -171,7 +171,7 @@ H5F_istore_decode_key(H5F_t __unused__ *f, H5B_t *bt, uint8 *raw, void *_key)
 {
     H5F_istore_key_t	*key = (H5F_istore_key_t *) _key;
     intn		i;
-    intn		ndims = (intn)((bt->sizeof_rkey-4)/4);
+    intn		ndims = (intn)((bt->sizeof_rkey-8)/4);
 
     FUNC_ENTER(H5F_istore_decode_key, FAIL);
 
@@ -213,7 +213,7 @@ static herr_t
 H5F_istore_encode_key(H5F_t __unused__ *f, H5B_t *bt, uint8 *raw, void *_key)
 {
     H5F_istore_key_t	*key = (H5F_istore_key_t *) _key;
-    intn		ndims = (intn)((bt->sizeof_rkey-4) / 4);
+    intn		ndims = (intn)((bt->sizeof_rkey-8) / 4);
     intn		i;
 
     FUNC_ENTER(H5F_istore_encode_key, FAIL);
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 3c858bd..dcea323 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -171,7 +171,7 @@ H5F_istore_decode_key(H5F_t __unused__ *f, H5B_t *bt, uint8 *raw, void *_key)
 {
     H5F_istore_key_t	*key = (H5F_istore_key_t *) _key;
     intn		i;
-    intn		ndims = (intn)((bt->sizeof_rkey-4)/4);
+    intn		ndims = (intn)((bt->sizeof_rkey-8)/4);
 
     FUNC_ENTER(H5F_istore_decode_key, FAIL);
 
@@ -213,7 +213,7 @@ static herr_t
 H5F_istore_encode_key(H5F_t __unused__ *f, H5B_t *bt, uint8 *raw, void *_key)
 {
     H5F_istore_key_t	*key = (H5F_istore_key_t *) _key;
-    intn		ndims = (intn)((bt->sizeof_rkey-4) / 4);
+    intn		ndims = (intn)((bt->sizeof_rkey-8) / 4);
     intn		i;
 
     FUNC_ENTER(H5F_istore_encode_key, FAIL);
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index 5601550..0a6ebea 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -120,7 +120,7 @@ H5O_mtime_decode(H5F_t __unused__ *f, const uint8 *p,
 	    HRETURN_ERROR(H5E_OHDR, H5E_CANTINIT, NULL,
 			  "unable to obtain local timezone information");
 	}
-	the_time -= tz.tz_minuteswest*60 - (tm.tm_idst?3600:0);
+	the_time -= tz.tz_minuteswest*60 - (tm.tm_isdst?3600:0);
     }
 #elif defined(HAVE_GETTIMEOFDAY) && defined(HAVE_STRUCT_TIMEZONE)
     {
diff --git a/src/H5S.c b/src/H5S.c
index 3649e21..7fb1088 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -183,6 +183,7 @@ H5S_term_interface(void)
     /* Clear/free conversion table */
     HDmemset(H5S_fconv_g, 0, sizeof(H5S_fconv_g));
     HDmemset(H5S_mconv_g, 0, sizeof(H5S_mconv_g));
+    for (i=0; i<H5S_nconv_g; i++) H5MM_xfree(H5S_conv_g[i]);
     H5S_conv_g = H5MM_xfree(H5S_conv_g);
     H5S_nconv_g = H5S_aconv_g = 0;
 }
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 7797ad7..fcfb171 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -300,8 +300,9 @@ H5S_hyper_get_regions (size_t *num_regions, intn dim, size_t bound_count,
 	printf("%s: check 2.0.5, lo_bounds[%d][%d].bound=%d\n",FUNC,
         (int)dim,(int)i,(int)lo_bounds[dim][i].bound);
 #endif /* QAK */
-        for(; pos[dim]>=(lo_bounds[dim][i].bound+offset[dim]) && i<bound_count; i++) {
-
+        for (/*void*/;
+             i<bound_count && pos[dim]>=lo_bounds[dim][i].bound+offset[dim];
+	     i++) {
 #ifdef QAK
 	    printf("%s: check 2.1, i=%d, num_reg=%d, pos[%d]=%d\n",
 		   FUNC,i,(int)num_reg,dim,(int)pos[dim]);
@@ -1875,7 +1876,8 @@ H5S_hyper_copy (H5S_t *dst, const H5S_t *src)
     printf("%s: check 3.0\n", FUNC);
 #endif /* QAK */
     /* Create the per-dimension selection info */
-    if((new_diminfo = H5MM_malloc(sizeof(H5S_hyper_dim_t *)*src->extent.u.simple.rank))==NULL)
+    if((new_diminfo = H5MM_malloc(sizeof(H5S_hyper_dim_t)*
+				  src->extent.u.simple.rank))==NULL)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
             "can't allocate per-dimension array");
 
diff --git a/src/H5Z.c b/src/H5Z.c
index e2059ee..b6d44f8 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -117,8 +117,8 @@ H5Z_term_interface (void)
 
 	    /* Print the statistics */
 	    HDfprintf (stderr,
-		       "   %c%-15s %10Hd %10Hd %8.2f %8.2f %8.2f "
-		       "%10s\n", dir?'<':'>', comment, 
+		       "   %s%-15s %10Hd %10Hd %8.2f %8.2f %8.2f "
+		       "%10s\n", dir?"<":">", comment, 
 		       H5Z_table_g[i].stats[dir].total,
 		       H5Z_table_g[i].stats[dir].errors,
 		       H5Z_table_g[i].stats[dir].timer.utime,
@@ -310,6 +310,8 @@ H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, uintn flags,
 	for (i=0; i<cd_nelmts; i++) {
 	    pline->filter[idx].cd_values[i] = cd_values[i];
 	}
+    } else {
+       pline->filter[idx].cd_values = NULL;
     }
     pline->nfilters++;
 
diff --git a/test/.distdep b/test/.distdep
index 7881eb1..c16495f 100644
--- a/test/.distdep
+++ b/test/.distdep
@@ -178,13 +178,6 @@ th5s.o: \
    ../src/H5Tpublic.h \
    ../src/H5Zprivate.h \
    ../src/H5Zpublic.h
-hyperslab.o: \
-   hyperslab.c \
-   ../src/H5private.h \
-   ../src/H5public.h \
-   ../src/H5config.h \
-   ../src/H5MMprivate.h \
-   ../src/H5MMpublic.h
 istore.o: \
    istore.c \
    ../src/H5private.h \
@@ -213,8 +206,8 @@ istore.o: \
    ../src/H5Sprivate.h \
    ../src/H5Spublic.h \
    ../src/H5Zprivate.h
-dsets.o: \
-   dsets.c \
+external.o: \
+   external.c \
    ../src/hdf5.h \
    ../src/H5public.h \
    ../src/H5config.h \
@@ -235,8 +228,27 @@ dsets.o: \
    ../src/H5Zpublic.h \
    ../src/H5Spublic.h \
    ../src/H5Tpublic.h
-extend.o: \
-   extend.c \
+gheap.o: \
+   gheap.c \
+   ../src/H5private.h \
+   ../src/H5public.h \
+   ../src/H5config.h \
+   ../src/H5Eprivate.h \
+   ../src/H5Epublic.h \
+   ../src/H5Ipublic.h \
+   ../src/H5Fprivate.h \
+   ../src/H5Fpublic.h \
+   ../src/H5Dpublic.h \
+   ../src/H5Gprivate.h \
+   ../src/H5Gpublic.h \
+   ../src/H5Bprivate.h \
+   ../src/H5Bpublic.h \
+   ../src/H5HGprivate.h \
+   ../src/H5HGpublic.h \
+   ../src/H5Pprivate.h \
+   ../src/H5Ppublic.h
+shtype.o: \
+   shtype.c \
    ../src/hdf5.h \
    ../src/H5public.h \
    ../src/H5config.h \
@@ -256,8 +268,24 @@ extend.o: \
    ../src/H5Ppublic.h \
    ../src/H5Zpublic.h \
    ../src/H5Spublic.h
-external.o: \
-   external.c \
+bittests.o: \
+   bittests.c \
+   ../src/H5Tpkg.h \
+   ../src/H5HGprivate.h \
+   ../src/H5HGpublic.h \
+   ../src/H5public.h \
+   ../src/H5config.h \
+   ../src/H5Fprivate.h \
+   ../src/H5Fpublic.h \
+   ../src/H5Ipublic.h \
+   ../src/H5private.h \
+   ../src/H5Dpublic.h \
+   ../src/H5Tprivate.h \
+   ../src/H5Tpublic.h \
+   ../src/H5Gprivate.h \
+   ../src/H5Gpublic.h
+big.o: \
+   big.c \
    ../src/hdf5.h \
    ../src/H5public.h \
    ../src/H5config.h \
@@ -277,28 +305,10 @@ external.o: \
    ../src/H5Ppublic.h \
    ../src/H5Zpublic.h \
    ../src/H5Spublic.h \
-   ../src/H5Tpublic.h
-gheap.o: \
-   gheap.c \
-   ../src/H5private.h \
-   ../src/H5public.h \
-   ../src/H5config.h \
-   ../src/H5Eprivate.h \
-   ../src/H5Epublic.h \
-   ../src/H5Ipublic.h \
-   ../src/H5Fprivate.h \
-   ../src/H5Fpublic.h \
-   ../src/H5Dpublic.h \
-   ../src/H5Gprivate.h \
-   ../src/H5Gpublic.h \
-   ../src/H5Bprivate.h \
-   ../src/H5Bpublic.h \
-   ../src/H5HGprivate.h \
-   ../src/H5HGpublic.h \
-   ../src/H5Pprivate.h \
-   ../src/H5Ppublic.h
-shtype.o: \
-   shtype.c \
+   ../src/H5Tpublic.h \
+   ../src/H5private.h
+chunk.o: \
+   chunk.c \
    ../src/hdf5.h \
    ../src/H5public.h \
    ../src/H5config.h \
@@ -317,9 +327,10 @@ shtype.o: \
    ../src/H5Opublic.h \
    ../src/H5Ppublic.h \
    ../src/H5Zpublic.h \
-   ../src/H5Spublic.h
-links.o: \
-   links.c \
+   ../src/H5Spublic.h \
+   ../src/H5Tpublic.h
+cmpd_dset.o: \
+   cmpd_dset.c \
    ../src/hdf5.h \
    ../src/H5public.h \
    ../src/H5config.h \
@@ -338,26 +349,9 @@ links.o: \
    ../src/H5Opublic.h \
    ../src/H5Ppublic.h \
    ../src/H5Zpublic.h \
-   ../src/H5Spublic.h \
-   ../src/H5Tpublic.h
-bittests.o: \
-   bittests.c \
-   ../src/H5Tpkg.h \
-   ../src/H5HGprivate.h \
-   ../src/H5HGpublic.h \
-   ../src/H5public.h \
-   ../src/H5config.h \
-   ../src/H5Fprivate.h \
-   ../src/H5Fpublic.h \
-   ../src/H5Ipublic.h \
-   ../src/H5private.h \
-   ../src/H5Dpublic.h \
-   ../src/H5Tprivate.h \
-   ../src/H5Tpublic.h \
-   ../src/H5Gprivate.h \
-   ../src/H5Gpublic.h
-mtime.o: \
-   mtime.c \
+   ../src/H5Spublic.h
+iopipe.o: \
+   iopipe.c \
    ../src/hdf5.h \
    ../src/H5public.h \
    ../src/H5config.h \
@@ -377,10 +371,16 @@ mtime.o: \
    ../src/H5Ppublic.h \
    ../src/H5Zpublic.h \
    ../src/H5Spublic.h \
-   ../src/H5Tpublic.h \
-   ../src/H5private.h
-big.o: \
-   big.c \
+   ../src/H5Tpublic.h
+hyperslab.o: \
+   hyperslab.c \
+   ../src/H5private.h \
+   ../src/H5public.h \
+   ../src/H5config.h \
+   ../src/H5MMprivate.h \
+   ../src/H5MMpublic.h
+extend.o: \
+   extend.c \
    ../src/hdf5.h \
    ../src/H5public.h \
    ../src/H5config.h \
@@ -399,11 +399,9 @@ big.o: \
    ../src/H5Opublic.h \
    ../src/H5Ppublic.h \
    ../src/H5Zpublic.h \
-   ../src/H5Spublic.h \
-   ../src/H5Tpublic.h \
-   ../src/H5private.h
-dtypes.o: \
-   dtypes.c \
+   ../src/H5Spublic.h
+mtime.o: \
+   mtime.c \
    ../src/hdf5.h \
    ../src/H5public.h \
    ../src/H5config.h \
@@ -424,13 +422,9 @@ dtypes.o: \
    ../src/H5Zpublic.h \
    ../src/H5Spublic.h \
    ../src/H5Tpublic.h \
-   ../src/H5Tpkg.h \
-   ../src/H5HGprivate.h \
-   ../src/H5Fprivate.h \
-   ../src/H5private.h \
-   ../src/H5Tprivate.h
-chunk.o: \
-   chunk.c \
+   ../src/H5private.h
+dsets.o: \
+   dsets.c \
    ../src/hdf5.h \
    ../src/H5public.h \
    ../src/H5config.h \
@@ -451,8 +445,8 @@ chunk.o: \
    ../src/H5Zpublic.h \
    ../src/H5Spublic.h \
    ../src/H5Tpublic.h
-cmpd_dset.o: \
-   cmpd_dset.c \
+links.o: \
+   links.c \
    ../src/hdf5.h \
    ../src/H5public.h \
    ../src/H5config.h \
@@ -471,9 +465,10 @@ cmpd_dset.o: \
    ../src/H5Opublic.h \
    ../src/H5Ppublic.h \
    ../src/H5Zpublic.h \
-   ../src/H5Spublic.h
-iopipe.o: \
-   iopipe.c \
+   ../src/H5Spublic.h \
+   ../src/H5Tpublic.h
+dtypes.o: \
+   dtypes.c \
    ../src/hdf5.h \
    ../src/H5public.h \
    ../src/H5config.h \
@@ -493,4 +488,9 @@ iopipe.o: \
    ../src/H5Ppublic.h \
    ../src/H5Zpublic.h \
    ../src/H5Spublic.h \
-   ../src/H5Tpublic.h
+   ../src/H5Tpublic.h \
+   ../src/H5Tpkg.h \
+   ../src/H5HGprivate.h \
+   ../src/H5Fprivate.h \
+   ../src/H5private.h \
+   ../src/H5Tprivate.h
diff --git a/test/dsets.c b/test/dsets.c
index 1a66600..7171b18 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -372,6 +372,9 @@ bogus(unsigned int __unused__ flags, size_t __unused__ cd_nelmts,
       const unsigned int __unused__ cd_values[], size_t nbytes,
       size_t __unused__ *buf_size, void __unused__ **buf)
 {
+#if 0
+    abort();
+#endif
     return nbytes;
 }
 
@@ -777,9 +780,11 @@ cleanup(void)
 int
 main(void)
 {
-    hid_t		    file, grp;
-    herr_t		    status;
-    int			    nerrors = 0;
+    hid_t		file, grp, fapl;
+    herr_t		status;
+    int			nerrors=0, mdc_nelmts;
+    size_t		rdcc_nbytes;
+    double		rdcc_w0;
 
     status = H5open ();
     assert (status>=0);
@@ -787,9 +792,22 @@ main(void)
     /* Automatic error reporting to standard output */
     H5Eset_auto (display_error_cb, NULL);
 
+    /* Create the file */
+    fapl = H5Pcreate(H5P_FILE_ACCESS);
+    assert(fapl>=0);
+
+#if 1
+    /* Turn off raw data cache */
+    status = H5Pget_cache(fapl, &mdc_nelmts, &rdcc_nbytes, &rdcc_w0);
+    assert(status>=0);
+    status = H5Pset_cache(fapl, mdc_nelmts, 0, rdcc_w0);
+    assert(status>=0);
+#endif
+    
     file = H5Fcreate(TEST_FILE_NAME, H5F_ACC_TRUNC|H5F_ACC_DEBUG,
-		     H5P_DEFAULT, H5P_DEFAULT);
+		     H5P_DEFAULT, fapl);
     assert(file >= 0);
+    H5Pclose(fapl);
 
     /* Cause the library to emit initial messages */
     grp = H5Gcreate (file, "emit diagnostics", 0);
diff --git a/test/dtypes.c b/test/dtypes.c
index 320d440..7c9ba00 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -1666,11 +1666,13 @@ main(void)
     H5Tunregister(H5T_conv_float_double);
     H5Tunregister(H5T_conv_double_float);
     nerrors += test_conv_flt_1("sw", H5T_NATIVE_FLOAT, H5T_NATIVE_DOUBLE);
-    nerrors += test_conv_flt_1("sw", H5T_NATIVE_FLOAT, H5T_NATIVE_LDOUBLE);
     nerrors += test_conv_flt_1("sw", H5T_NATIVE_DOUBLE, H5T_NATIVE_FLOAT);
+#ifdef USE_LDOUBLE
+    nerrors += test_conv_flt_1("sw", H5T_NATIVE_FLOAT, H5T_NATIVE_LDOUBLE);
     nerrors += test_conv_flt_1("sw", H5T_NATIVE_DOUBLE, H5T_NATIVE_LDOUBLE);
     nerrors += test_conv_flt_1("sw", H5T_NATIVE_LDOUBLE, H5T_NATIVE_FLOAT);
     nerrors += test_conv_flt_1("sw", H5T_NATIVE_LDOUBLE, H5T_NATIVE_DOUBLE);
+#endif
     
     if (nerrors) {
         printf("***** %lu FAILURE%s! *****\n",
diff --git a/test/links.c b/test/links.c
index 0a766c7..8fb55a3 100644
--- a/test/links.c
+++ b/test/links.c
@@ -9,6 +9,7 @@
  */
 #include <hdf5.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <H5config.h>
 #ifndef HAVE_ATTRIBUTE