[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, 12 insertions, 12 deletions

diff --git a/src/H5Fstdio.c b/src/H5Fstdio.c
index 46c63b5..b610a7a 100644
--- a/src/H5Fstdio.c
+++ b/src/H5Fstdio.c
@@ -80,13 +80,13 @@ H5F_stdio_open (const char *name, uintn flags, H5F_search_t *key/*out*/)
       if ((flags & H5F_ACC_CREAT) && (flags & H5F_ACC_WRITE)) {
 	 f = fopen (name, "wb+");
       } else {
-	 /* File doesn't exist and CREAT wasn't specified */
-	 HRETURN_ERROR (H5E_IO, H5E_CANTOPENFILE, NULL);
+	 HRETURN_ERROR (H5E_IO, H5E_CANTOPENFILE, NULL,
+			"file doesn't exist and CREAT wasn't specified");
       }
       
    } else if ((flags & H5F_ACC_CREAT) && (flags & H5F_ACC_EXCL)) {
-      /* File exists but CREAT and EXCL were specified */
-      HRETURN_ERROR (H5E_IO, H5E_FILEEXISTS, NULL);
+      HRETURN_ERROR (H5E_IO, H5E_FILEEXISTS, NULL,
+		     "file exists but CREAT and EXCL were specified");
       
    } else if (flags & H5F_ACC_WRITE) {
       if (flags & H5F_ACC_TRUNC) f = fopen (name, "wb+");
@@ -95,7 +95,7 @@ H5F_stdio_open (const char *name, uintn flags, H5F_search_t *key/*out*/)
    } else {
       f = fopen (name, "rb");
    }
-   if (!f) HRETURN_ERROR (H5E_IO, H5E_CANTOPENFILE, NULL); /*fopen failed*/
+   if (!f) HRETURN_ERROR (H5E_IO, H5E_CANTOPENFILE, NULL, "fopen failed");
 
    /* Build the return value */
    lf = H5MM_xcalloc (1, sizeof(H5F_low_t));
@@ -126,7 +126,7 @@ H5F_stdio_open (const char *name, uintn flags, H5F_search_t *key/*out*/)
  * Purpose:	Closes a file.
  *
  * Errors:
- *		IO        CLOSEERROR    Close failed. 
+ *		IO        CLOSEERROR    Fclose failed. 
  *
  * Return:	Success:	SUCCEED
  *
@@ -145,7 +145,7 @@ H5F_stdio_close (H5F_low_t *lf)
    FUNC_ENTER (H5F_stdio_close, FAIL);
 
    if (fclose (lf->u.stdio.f)<0) {
-      HRETURN_ERROR (H5E_IO, H5E_CLOSEERROR, FAIL); /*close failed*/
+      HRETURN_ERROR (H5E_IO, H5E_CLOSEERROR, FAIL, "fclose failed");
    }
    lf->u.stdio.f = NULL;
 
@@ -202,7 +202,7 @@ H5F_stdio_read (H5F_low_t *lf, const haddr_t *addr, size_t size, uint8 *buf)
        lf->u.stdio.op!=H5F_OP_READ ||
        lf->u.stdio.cur!=offset) {
       if (fseek (lf->u.stdio.f, offset, SEEK_SET)<0) {
-	 HRETURN_ERROR (H5E_IO, H5E_SEEKERROR, FAIL); /*fseek failed*/
+	 HRETURN_ERROR (H5E_IO, H5E_SEEKERROR, FAIL, "fseek failed");
       }
       lf->u.stdio.cur = offset;
    }
@@ -224,7 +224,7 @@ H5F_stdio_read (H5F_low_t *lf, const haddr_t *addr, size_t size, uint8 *buf)
    n = fread (buf, 1, size, lf->u.stdio.f);
    if (n<=0 && ferror (lf->u.stdio.f)) {
       lf->u.stdio.op = H5F_OP_UNKNOWN;
-      HRETURN_ERROR (H5E_IO, H5E_READERROR, FAIL); /*fread failed*/
+      HRETURN_ERROR (H5E_IO, H5E_READERROR, FAIL, "fread failed");
    } else if (n<size) {
       HDmemset (buf+n, 0, size-n);
    }
@@ -279,7 +279,7 @@ H5F_stdio_write (H5F_low_t *lf, const haddr_t *addr, size_t size,
        lf->u.stdio.op!=H5F_OP_WRITE ||
        lf->u.stdio.cur!=offset) {
       if (fseek (lf->u.stdio.f, offset, SEEK_SET)<0) {
-	 HRETURN_ERROR (H5E_IO, H5E_SEEKERROR, FAIL); /*fseek failed*/
+	 HRETURN_ERROR (H5E_IO, H5E_SEEKERROR, FAIL, "fseek failed");
       }
       lf->u.stdio.cur = offset;
    }
@@ -291,7 +291,7 @@ H5F_stdio_write (H5F_low_t *lf, const haddr_t *addr, size_t size,
     */
    if (size != fwrite (buf, 1, size, lf->u.stdio.f)) {
       lf->u.stdio.op = H5F_OP_UNKNOWN;
-      HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL); /*fwrite failed*/
+      HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "fwrite failed");
    }
 
    /*
@@ -337,7 +337,7 @@ H5F_stdio_flush (H5F_low_t *lf)
     * Flush
     */
    if (fflush (lf->u.stdio.f)<0) {
-      HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL); /*fflush failed*/
+      HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL, "fflush failed");
    }
    
    FUNC_LEAVE (SUCCEED);