[svn-r430] Changes since 19980617

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

./src/H5T.c
	Fixed a potential division by zero error.

./src/H5Fistore.c
	Fixed an assertion failure that I accidently introduced with
	the previous changes.

3 files changed, 10 insertions, 5 deletions

diff --git a/src/H5Distore.c b/src/H5Distore.c
index 9634457..de6a1cb 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -1052,7 +1052,7 @@ H5F_istore_lock (H5F_t *f, const H5O_layout_t *layout,
 	}
     }
 
-    assert (chunk_size>0);
+    assert (found>=0 || chunk_size>0);
     if (found<0 && chunk_size<=f->shared->access_parms->rdcc_nbytes) {
 	/*
 	 * Add the chunk to the beginning of the cache after pruning the cache
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 9634457..de6a1cb 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -1052,7 +1052,7 @@ H5F_istore_lock (H5F_t *f, const H5O_layout_t *layout,
 	}
     }
 
-    assert (chunk_size>0);
+    assert (found>=0 || chunk_size>0);
     if (found<0 && chunk_size<=f->shared->access_parms->rdcc_nbytes) {
 	/*
 	 * Add the chunk to the beginning of the cache after pruning the cache
diff --git a/src/H5T.c b/src/H5T.c
index 3f24960..9690176 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -595,14 +595,19 @@ H5T_term_interface(void)
 			      H5T_get_size (path->dst));
 		nbytes *= path->cdata.stats->nelmts;
 		HDfprintf (stderr,
-			   "   %-*s %8Hd/%-5d %8.2f %8.2f %8.2f %15g\n",
+			   "   %-*s %8Hd/%-5d %8.2f %8.2f %8.2f",
 			   H5T_NAMELEN-1, path->name,
 			   path->cdata.stats->nelmts,
 			   path->cdata.stats->ncalls,
 			   path->cdata.stats->timer.utime, 
 			   path->cdata.stats->timer.stime, 
-			   path->cdata.stats->timer.etime,
-			   nbytes / path->cdata.stats->timer.etime);
+			   path->cdata.stats->timer.etime);
+		if (path->cdata.stats->timer.etime>0) {
+		    HDfprintf (stderr, " %15g\n", 
+			       nbytes / path->cdata.stats->timer.etime);
+		} else {
+		    HDfprintf (stderr, " %15s\n", "Inf");
+		}
 	    }
 #endif
 	    H5T_close (path->src);