diff options
| -rw-r--r-- | src/H5Eprivate.h | 8 | ||||
| -rw-r--r-- | src/H5Eproto.h | 10 | ||||
| -rw-r--r-- | src/H5F.c | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h index 9de9d69..6ccefb1 100644 --- a/src/H5Eprivate.h +++ b/src/H5Eprivate.h @@ -72,7 +72,7 @@ static const hdf_min_error_messages_t hdf_min_error_messages[] = {H5E_UNINITIALIZED, "Information is uninitialized"}, {H5E_UNSUPPORTED, "Feature is unsupported"}, {H5E_BADTYPE, "Incorrect type found"}, - {H5E_BADRANGE, "Incorrect range of argument"}, + {H5E_BADRANGE, "Argument out of range"}, {H5E_NOSPACE, "No space available for allocation"}, {H5E_FILEEXISTS, "File already exists"}, {H5E_FILEOPEN, "File already open"}, @@ -80,9 +80,9 @@ static const hdf_min_error_messages_t hdf_min_error_messages[] = {H5E_CANTOPEN, "Can't open file"}, {H5E_NOTHDF5, "Not an HDF5 format file"}, {H5E_BADFILE, "Bad file ID accessed"}, - {H5E_SEEKERROR, "File seek failed"}, - {H5E_READERROR, "File read failed"}, - {H5E_WRITEERROR, "File write failed"}, + {H5E_SEEKERROR, "Seek failed"}, + {H5E_READERROR, "Read failed"}, + {H5E_WRITEERROR, "Write failed"}, {H5E_CANTINIT, "Can't initialize interface"}, {H5E_ALREADYINIT, "Object already initialized"}, {H5E_BADATOM, "Can't find atom information"}, diff --git a/src/H5Eproto.h b/src/H5Eproto.h index b97d0c0..d6e1ccd 100644 --- a/src/H5Eproto.h +++ b/src/H5Eproto.h @@ -30,7 +30,7 @@ same assumptions as HERROR. IN ADDITION, this macro causes a return from the calling routine */ -#define HRETURN_ERROR(maj, min, ret_val) {HERROR(maj, min); return(ret_val);} +#define HRETURN_ERROR(pablo_mask, pablo_func_id, maj, min, ret_val) {HERROR(maj, min); PABLO_TRACE_OFF(pablo_mask,pablo_func_id); return(ret_val);} /* HGOTO_ERROR macro, used to facilitate error reporting. Makes same assumptions as HERROR. IN ADDITION, this macro causes @@ -75,7 +75,7 @@ typedef enum H5E_UNINITIALIZED, /* Information is unitialized */ H5E_UNSUPPORTED, /* Feature is unsupported */ H5E_BADTYPE, /* Incorrect type found */ - H5E_BADRANGE, /* Incorrect range of argument */ + H5E_BADRANGE, /* Argument out of range */ /* Resource errors */ H5E_NOSPACE, /* No space available for allocation */ @@ -89,9 +89,9 @@ typedef enum H5E_BADFILE, /* Bad file ID accessed */ /* Generic low-level file I/O errors */ - H5E_SEEKERROR, /* File seek failed */ - H5E_READERROR, /* File read failed */ - H5E_WRITEERROR, /* File write failed */ + H5E_SEEKERROR, /* Seek failed */ + H5E_READERROR, /* Read failed */ + H5E_WRITEERROR, /* Write failed */ /* Function entry/exit interface errors */ H5E_CANTINIT, /* Can't initialize interface */ @@ -807,9 +807,9 @@ H5F_block_read (hdf5_file_t *f, haddr_t addr, size_t size, void *buf) addr += f->file_create_parms.userblock_size; if (H5F_SEEK (f->file_handle, addr)<0) - HRETURN_ERROR(H5E_IO, H5E_SEEKERROR, FAIL); + HRETURN_ERROR(H5F_mask, ID_H5F_block_read, H5E_IO, H5E_SEEKERROR, FAIL); if (H5F_READ (f->file_handle, buf, size)<0) - HRETURN_ERROR(H5E_IO, H5E_READERROR, FAIL); + HRETURN_ERROR(H5F_mask, ID_H5F_block_read, H5E_IO, H5E_READERROR, FAIL); PABLO_TRACE_OFF(H5F_mask, ID_H5F_block_read); return SUCCEED; } @@ -844,9 +844,9 @@ H5F_block_write (hdf5_file_t *f, haddr_t addr, size_t size, void *buf) addr += f->file_create_parms.userblock_size; if (H5F_SEEK (f->file_handle, addr)<0) - HRETURN_ERROR(H5E_IO, H5E_SEEKERROR, FAIL); + HRETURN_ERROR(H5F_mask, ID_H5F_block_write, H5E_IO, H5E_SEEKERROR, FAIL); if (H5F_WRITE (f->file_handle, buf, size)<0) - HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL); + HRETURN_ERROR(H5F_mask, ID_H5F_block_write, H5E_IO, H5E_WRITEERROR, FAIL); PABLO_TRACE_OFF(H5F_mask, ID_H5F_block_write); return SUCCEED; } |