[svn-r145] ./src/H5Osdtyp.c -> H5Odtype.c

./src/H5Osdim.c		-> H5Osdspace.c
./src/Makefile.in
	Changed the names of these files to better reflect what they
	actually do.

./src/H5.c
./src/H5AC.c
./src/H5B.c
./src/H5C.c
./src/H5D.c
./src/H5E.c
./src/H5Eprivate.h
./src/H5Epublic.h
./src/H5F.c
./src/H5Fcore.c
./src/H5Ffamily.c
./src/H5Fistore.c
./src/H5Flow.c
./src/H5Fsec2.c
./src/H5Fsplit.c
./src/H5Fstdio.c
./src/H5G.c
./src/H5Gent.c
./src/H5Gnode.c
./src/H5Gshad.c
./src/H5Gstab.c
./src/H5H.c
./src/H5M.c
./src/H5MF.c
./src/H5O.c
./src/H5Osdtyp.c (./src/H5Odtype.c)
./src/H5P.c
./src/H5T.c
./src/H5detect.c
./src/H5private.h
	Added an argument to the HRETURN_ERROR(), HGOTO_ERROR(), and
	HERROR() macros which is a string error message.  This allows
	us to give extra information which can't be represented by the
	major and minor error numbers.  This information was
	previously in comments just before or after the macro call.
	The string isn't currently used, but I'm planning to change
	the test files so they print an error trace when something
	fails.  This should make debugging a little faster since it's
	often obvious what's wrong if we could just see the error
	stack without even having to start a debugger.

1 files changed, 15 insertions, 12 deletions

diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 8684465..15c7d4d 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -370,8 +370,8 @@ H5F_istore_new_node (H5F_t *f, H5B_ins_t op,
    nbytes = H5V_vector_reduce_product (udata->mesg.ndims, udata->key.size);
    assert (nbytes>0);
    if (H5MF_alloc (f, H5MF_RAW, nbytes, addr/*out*/)<0) {
-      /* Couldn't allocate new file storage */
-      HRETURN_ERROR (H5E_IO, H5E_CANTINIT, FAIL);
+      HRETURN_ERROR (H5E_IO, H5E_CANTINIT, FAIL,
+		     "couldn't allocate new file storage");
    }
    udata->addr = *addr;
    udata->key.file_number = 0;
@@ -518,7 +518,7 @@ H5F_istore_insert (H5F_t *f, const haddr_t *addr,
    if (cmp<0) {
       /* Negative indices not supported yet */
       assert ("HDF5 INTERNAL ERROR -- see rpm" && 0);
-      HRETURN_ERROR (H5E_STORAGE, H5E_UNSUPPORTED, FAIL);
+      HRETURN_ERROR (H5E_STORAGE, H5E_UNSUPPORTED, FAIL, "internal error");
       
    } else if (H5V_hyper_eq (udata->mesg.ndims,
 			    udata->key.offset,  udata->key.size, 
@@ -554,7 +554,8 @@ H5F_istore_insert (H5F_t *f, const haddr_t *addr,
        * Allocate storage for the new chunk
        */
       if (H5MF_alloc (f, H5MF_RAW, nbytes, new_node/*out*/)<0) {
-	 HRETURN_ERROR (H5E_IO, H5E_CANTINIT, FAIL);
+	 HRETURN_ERROR (H5E_IO, H5E_CANTINIT, FAIL,
+			"file allocation failed");
       }
       udata->addr = *new_node;
       udata->key.file_number = 0;
@@ -562,7 +563,7 @@ H5F_istore_insert (H5F_t *f, const haddr_t *addr,
       
    } else {
       assert ("HDF5 INTERNAL ERROR -- see rpm" && 0);
-      HRETURN_ERROR (H5E_IO, H5E_UNSUPPORTED, FAIL);
+      HRETURN_ERROR (H5E_IO, H5E_UNSUPPORTED, FAIL, "internal error");
    }
    
    FUNC_LEAVE (ret_value);
@@ -704,7 +705,8 @@ H5F_istore_copy_hyperslab (H5F_t *f, const H5O_istore_t *istore, H5F_isop_t op,
 	 if (status>=0 && H5F_addr_defined (&(udata.addr))) {
 	    assert (0==udata.key.file_number);
 	    if (H5F_block_read (f, &(udata.addr), chunk_size, chunk)<0) {
-	       HGOTO_ERROR (H5E_IO, H5E_READERROR, FAIL);
+	       HGOTO_ERROR (H5E_IO, H5E_READERROR, FAIL,
+			    "unable to read raw storage chunk");
 	    }
 	 } else {
 	    HDmemset (chunk, 0, chunk_size);
@@ -718,7 +720,8 @@ H5F_istore_copy_hyperslab (H5F_t *f, const H5O_istore_t *istore, H5F_isop_t op,
 			 size_m, sub_offset_m, buf);
 	 assert (0==udata.key.file_number);
 	 if (H5F_block_write (f, &(udata.addr), chunk_size, chunk)<0) {
-	    HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL);
+	    HGOTO_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
+			 "unable to write raw storage chunk");
 	 }
       } else {
 	 H5V_hyper_copy (istore->ndims, sub_size,
@@ -774,8 +777,8 @@ H5F_istore_read (H5F_t *f, const H5O_istore_t *istore,
 
    if (H5F_istore_copy_hyperslab (f, istore, H5F_ISTORE_READ,
 				  offset, size, H5V_ZERO, size, buf)<0) {
-      /* hyperslab output failure */
-      HRETURN_ERROR (H5E_IO, H5E_READERROR, FAIL);
+      HRETURN_ERROR (H5E_IO, H5E_READERROR, FAIL,
+		     "hyperslab output failure");
    }
 
    FUNC_LEAVE (SUCCEED);
@@ -815,8 +818,8 @@ H5F_istore_write (H5F_t *f, const H5O_istore_t *istore,
 
    if (H5F_istore_copy_hyperslab (f, istore, H5F_ISTORE_WRITE,
 				  offset, size, H5V_ZERO, size, buf)<0) {
-      /* hyperslab output failure */
-      HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL);
+      HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
+		     "hyperslab output failure");
    }
 
    FUNC_LEAVE (SUCCEED);
@@ -868,7 +871,7 @@ H5F_istore_create (H5F_t *f, struct H5O_istore_t *istore/*out*/,
 
    udata.mesg.ndims = istore->ndims = ndims;
    if (H5B_create (f, H5B_ISTORE, &udata, &(istore->btree_addr)/*out*/)<0) {
-      HRETURN_ERROR (H5E_IO, H5E_CANTINIT, FAIL); /* Can't create B-tree */
+      HRETURN_ERROR (H5E_IO, H5E_CANTINIT, FAIL, "can't create B-tree");
    }
 
    for (i=0; i<ndims; i++) {