[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.
This commit is contained in:
20
src/H5Flow.c
20
src/H5Flow.c
@@ -79,7 +79,7 @@ H5F_low_open (const H5F_low_class_t *type, const char *name, uintn flags,
|
||||
assert (name && *name);
|
||||
|
||||
if (NULL==(lf=(type->open)(name, flags, key))) {
|
||||
HRETURN_ERROR (H5E_IO, H5E_CANTOPENFILE, NULL);/*open failed*/
|
||||
HRETURN_ERROR (H5E_IO, H5E_CANTOPENFILE, NULL, "open failed");
|
||||
}
|
||||
lf->type = type;
|
||||
|
||||
@@ -123,7 +123,7 @@ H5F_low_close (H5F_low_t *lf)
|
||||
if (lf) {
|
||||
if ((lf->type->close)(lf)<0) {
|
||||
H5MM_xfree (lf);
|
||||
HRETURN_ERROR (H5E_IO, H5E_CLOSEERROR, NULL); /*close failed*/
|
||||
HRETURN_ERROR (H5E_IO, H5E_CLOSEERROR, NULL, "close failed");
|
||||
}
|
||||
H5MM_xfree (lf);
|
||||
}
|
||||
@@ -172,10 +172,10 @@ H5F_low_read (H5F_low_t *lf, const haddr_t *addr, size_t size,
|
||||
|
||||
if (lf->type->read) {
|
||||
if ((ret_value = (lf->type->read)(lf, addr, size, buf))<0) {
|
||||
HRETURN_ERROR (H5E_IO, H5E_READERROR, ret_value);/*read failed*/
|
||||
HRETURN_ERROR (H5E_IO, H5E_READERROR, ret_value, "read failed");
|
||||
}
|
||||
} else {
|
||||
HRETURN_ERROR (H5E_IO, H5E_UNSUPPORTED, FAIL);/*no read method*/
|
||||
HRETURN_ERROR (H5E_IO, H5E_UNSUPPORTED, FAIL, "no read method");
|
||||
}
|
||||
|
||||
FUNC_LEAVE (ret_value);
|
||||
@@ -231,10 +231,10 @@ H5F_low_write (H5F_low_t *lf, const haddr_t *addr, size_t size,
|
||||
/* Write the data */
|
||||
if (lf->type->write) {
|
||||
if ((ret_value = (lf->type->write)(lf, addr, size, buf))<0) {
|
||||
HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, ret_value);/*write failed*/
|
||||
HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, ret_value, "write failed");
|
||||
}
|
||||
} else {
|
||||
HRETURN_ERROR (H5E_IO, H5E_UNSUPPORTED, FAIL);/*no write method*/
|
||||
HRETURN_ERROR (H5E_IO, H5E_UNSUPPORTED, FAIL, "no write method");
|
||||
}
|
||||
|
||||
FUNC_LEAVE (ret_value);
|
||||
@@ -288,8 +288,8 @@ H5F_low_flush (H5F_low_t *lf)
|
||||
/* Invoke the subclass the flush method */
|
||||
if (lf->type->flush) {
|
||||
if ((lf->type->flush)(lf)<0) {
|
||||
/* Low level flush failed */
|
||||
HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL);
|
||||
HRETURN_ERROR (H5E_IO, H5E_WRITEERROR, FAIL,
|
||||
"low level flush failed");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -438,8 +438,8 @@ H5F_low_extend (H5F_low_t *lf, intn op, size_t size, haddr_t *addr/*out*/)
|
||||
|
||||
if (lf->type->extend) {
|
||||
if ((lf->type->extend)(lf, op, size, addr/*out*/)<0) {
|
||||
/* Unable to extend file */
|
||||
HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL);
|
||||
HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL,
|
||||
"unable to extend file");
|
||||
}
|
||||
} else {
|
||||
*addr = lf->eof;
|
||||
|
||||
Reference in New Issue
Block a user