diff options
| author | Robb Matzke <matzke@llnl.gov> | 1999-07-16 15:02:04 (GMT) |
|---|---|---|
| committer | Robb Matzke <matzke@llnl.gov> | 1999-07-16 15:02:04 (GMT) |
| commit | d9de869ef78becd3b3d90ce8ca79f8beb83f75f4 (patch) | |
| tree | 8b46385849d4f7f06c8c4b9378c656f57f562bbe | |
| parent | 17fb61e973efe750999180689c6d0b3a1ad45725 (diff) | |
| download | hdf5-d9de869ef78becd3b3d90ce8ca79f8beb83f75f4.zip hdf5-d9de869ef78becd3b3d90ce8ca79f8beb83f75f4.tar.gz hdf5-d9de869ef78becd3b3d90ce8ca79f8beb83f75f4.tar.bz2 | |
[svn-r1486] ./src/H5B.c [1.2, 1.3]
./src/H5Fistore.c [1.2, 1.3]
./src/H5Sall.c [1.2, 1.3]
Replaced second argument of HGOTO_ERROR/HRETURN_ERROR with a
minor error symbol (H5E_INTERNAL is a major error symbol).
| -rw-r--r-- | src/H5B.c | 2 | ||||
| -rw-r--r-- | src/H5Distore.c | 4 | ||||
| -rw-r--r-- | src/H5Fistore.c | 4 | ||||
| -rw-r--r-- | src/H5Sall.c | 4 |
4 files changed, 7 insertions, 7 deletions
@@ -1565,7 +1565,7 @@ H5B_iterate (H5F_t *f, const H5B_class_t *type, const haddr_t *addr, child+i, key+(i+1)*type->sizeof_nkey, udata); if (ret_value<0) { - HGOTO_ERROR(H5E_BTREE, H5E_INTERNAL, FAIL, + HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "iterator function failed"); } } diff --git a/src/H5Distore.c b/src/H5Distore.c index 3fdfd0b..5e60943 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -1977,7 +1977,7 @@ H5F_istore_allocated(H5F_t *f, int ndims, haddr_t *addr) HDmemset(&udata, 0, sizeof udata); udata.mesg.ndims = ndims; if (H5B_iterate(f, H5B_ISTORE, addr, &udata)<0) { - HRETURN_ERROR(H5E_IO, H5E_INTERNAL, 0, + HRETURN_ERROR(H5E_IO, H5E_CANTINIT, 0, "unable to iterate over chunk B-tree"); } FUNC_LEAVE(udata.total_storage); @@ -2011,7 +2011,7 @@ H5F_istore_dump_btree(H5F_t *f, FILE *stream, int ndims, haddr_t *addr) udata.mesg.ndims = ndims; udata.stream = stream; if (H5B_iterate(f, H5B_ISTORE, addr, &udata)<0) { - HRETURN_ERROR(H5E_IO, H5E_INTERNAL, 0, + HRETURN_ERROR(H5E_IO, H5E_CANTINIT, 0, "unable to iterate over chunk B-tree"); } FUNC_LEAVE(SUCCEED); diff --git a/src/H5Fistore.c b/src/H5Fistore.c index 3fdfd0b..5e60943 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -1977,7 +1977,7 @@ H5F_istore_allocated(H5F_t *f, int ndims, haddr_t *addr) HDmemset(&udata, 0, sizeof udata); udata.mesg.ndims = ndims; if (H5B_iterate(f, H5B_ISTORE, addr, &udata)<0) { - HRETURN_ERROR(H5E_IO, H5E_INTERNAL, 0, + HRETURN_ERROR(H5E_IO, H5E_CANTINIT, 0, "unable to iterate over chunk B-tree"); } FUNC_LEAVE(udata.total_storage); @@ -2011,7 +2011,7 @@ H5F_istore_dump_btree(H5F_t *f, FILE *stream, int ndims, haddr_t *addr) udata.mesg.ndims = ndims; udata.stream = stream; if (H5B_iterate(f, H5B_ISTORE, addr, &udata)<0) { - HRETURN_ERROR(H5E_IO, H5E_INTERNAL, 0, + HRETURN_ERROR(H5E_IO, H5E_CANTINIT, 0, "unable to iterate over chunk B-tree"); } FUNC_LEAVE(SUCCEED); diff --git a/src/H5Sall.c b/src/H5Sall.c index 9109589..db27b00 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -613,7 +613,7 @@ H5S_all_read(H5F_t *f, const H5O_layout_t *layout, const H5O_pline_t *pline, /* Read data from the file */ if (H5F_arr_read(f, xfer_parms, layout, pline, NULL, efl, size, size, mem_offset, file_offset, buf/*out*/)<0) { - HRETURN_ERROR(H5E_IO, H5E_INTERNAL, FAIL, + HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to read data from the file"); } *must_convert = FALSE; @@ -715,7 +715,7 @@ H5S_all_write(H5F_t *f, const struct H5O_layout_t *layout, /* Write data to the file */ if (H5F_arr_write(f, xfer_parms, layout, pline, NULL, efl, size, size, mem_offset, file_offset, buf)<0) { - HRETURN_ERROR(H5E_IO, H5E_INTERNAL, FAIL, + HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to write data to the file"); } *must_convert = FALSE; |