[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:
Robb Matzke
186
src/H5Epublic.h
186
src/H5Epublic.h
@@ -1,13 +1,13 @@
|
||||
/****************************************************************************
|
||||
* NCSA HDF *
|
||||
* Software Development Group *
|
||||
* National Center for Supercomputing Applications *
|
||||
* University of Illinois at Urbana-Champaign *
|
||||
* 605 E. Springfield, Champaign IL 61820 *
|
||||
* *
|
||||
* For conditions of distribution and use, see the accompanying *
|
||||
* hdf/COPYING file. *
|
||||
* *
|
||||
* NCSA HDF *
|
||||
* Software Development Group *
|
||||
* National Center for Supercomputing Applications *
|
||||
* University of Illinois at Urbana-Champaign *
|
||||
* 605 E. Springfield, Champaign IL 61820 *
|
||||
* *
|
||||
* For conditions of distribution and use, see the accompanying *
|
||||
* hdf/COPYING file. *
|
||||
* *
|
||||
****************************************************************************/
|
||||
|
||||
/* $Id$ */
|
||||
@@ -22,113 +22,115 @@
|
||||
/* Public headers needed by this file */
|
||||
#include <H5public.h>
|
||||
|
||||
/* Declare an enumerated type which holds all the valid major HDF error codes */
|
||||
typedef enum
|
||||
{
|
||||
H5E_NONE_MAJOR = 0, /* special zero, no error */
|
||||
H5E_ARGS, /* Invalid arguments to routine */
|
||||
H5E_RESOURCE, /* Resource unavailable */
|
||||
H5E_INTERNAL, /* Internal error (too specific to document
|
||||
/*
|
||||
* Declare an enumerated type which holds all the valid major HDF error codes.
|
||||
*/
|
||||
typedef enum H5E_major_t {
|
||||
H5E_NONE_MAJOR = 0, /* special zero, no error */
|
||||
H5E_ARGS, /* Invalid arguments to routine */
|
||||
H5E_RESOURCE, /* Resource unavailable */
|
||||
H5E_INTERNAL, /* Internal error (too specific to document
|
||||
* in detail)
|
||||
*/
|
||||
H5E_FILE, /* File Accessability */
|
||||
H5E_IO, /* Low-level I/O */
|
||||
H5E_FUNC, /* Function Entry/Exit */
|
||||
H5E_ATOM, /* Object Atom */
|
||||
H5E_CACHE, /* Object Cache */
|
||||
H5E_BTREE, /* B-Tree Node */
|
||||
H5E_SYM, /* Symbol Table */
|
||||
H5E_HEAP, /* Heap */
|
||||
H5E_OHDR, /* Object Header */
|
||||
H5E_DATATYPE, /* Datatype */
|
||||
H5E_DATASPACE, /* Dataspace */
|
||||
H5E_DATASET, /* Dataset */
|
||||
H5E_STORAGE, /* Data storage */
|
||||
H5E_TEMPLATE /* Templates */
|
||||
}
|
||||
hdf_maj_err_code_t;
|
||||
H5E_FILE, /* File Accessability */
|
||||
H5E_IO, /* Low-level I/O */
|
||||
H5E_FUNC, /* Function Entry/Exit */
|
||||
H5E_ATOM, /* Object Atom */
|
||||
H5E_CACHE, /* Object Cache */
|
||||
H5E_BTREE, /* B-Tree Node */
|
||||
H5E_SYM, /* Symbol Table */
|
||||
H5E_HEAP, /* Heap */
|
||||
H5E_OHDR, /* Object Header */
|
||||
H5E_DATATYPE, /* Datatype */
|
||||
H5E_DATASPACE, /* Dataspace */
|
||||
H5E_DATASET, /* Dataset */
|
||||
H5E_STORAGE, /* Data storage */
|
||||
H5E_TEMPLATE /* Templates */
|
||||
} H5E_major_t;
|
||||
|
||||
|
||||
/* Declare an enumerated type which holds all the valid minor HDF error codes */
|
||||
typedef enum
|
||||
{
|
||||
H5E_NONE_MINOR = 0, /* special zero, no error */
|
||||
typedef enum H5E_minor_t {
|
||||
H5E_NONE_MINOR = 0, /* special zero, no error */
|
||||
|
||||
/* Argument errors */
|
||||
H5E_UNINITIALIZED, /* Information is unitialized */
|
||||
H5E_UNSUPPORTED, /* Feature is unsupported */
|
||||
H5E_BADTYPE, /* Incorrect type found */
|
||||
H5E_BADRANGE, /* Argument out of range */
|
||||
H5E_BADVALUE, /* Bad value for argument */
|
||||
/* Argument errors */
|
||||
H5E_UNINITIALIZED, /* Information is unitialized */
|
||||
H5E_UNSUPPORTED, /* Feature is unsupported */
|
||||
H5E_BADTYPE, /* Incorrect type found */
|
||||
H5E_BADRANGE, /* Argument out of range */
|
||||
H5E_BADVALUE, /* Bad value for argument */
|
||||
|
||||
/* Resource errors */
|
||||
H5E_NOSPACE, /* No space available for allocation */
|
||||
/* Resource errors */
|
||||
H5E_NOSPACE, /* No space available for allocation */
|
||||
|
||||
/* File accessability errors */
|
||||
H5E_FILEEXISTS, /* File already exists */
|
||||
H5E_FILEOPEN, /* File already open */
|
||||
H5E_CANTCREATE, /* Can't create file */
|
||||
H5E_CANTOPENFILE, /* Can't open file */
|
||||
H5E_NOTHDF5, /* Not an HDF5 format file */
|
||||
H5E_BADFILE, /* Bad file ID accessed */
|
||||
H5E_TRUNCATED, /* File has been truncated */
|
||||
/* File accessability errors */
|
||||
H5E_FILEEXISTS, /* File already exists */
|
||||
H5E_FILEOPEN, /* File already open */
|
||||
H5E_CANTCREATE, /* Can't create file */
|
||||
H5E_CANTOPENFILE, /* Can't open file */
|
||||
H5E_NOTHDF5, /* Not an HDF5 format file */
|
||||
H5E_BADFILE, /* Bad file ID accessed */
|
||||
H5E_TRUNCATED, /* File has been truncated */
|
||||
|
||||
/* Generic low-level file I/O errors */
|
||||
H5E_SEEKERROR, /* Seek failed */
|
||||
H5E_READERROR, /* Read failed */
|
||||
H5E_WRITEERROR, /* Write failed */
|
||||
H5E_CLOSEERROR, /* Close failed */
|
||||
/* Generic low-level file I/O errors */
|
||||
H5E_SEEKERROR, /* Seek failed */
|
||||
H5E_READERROR, /* Read failed */
|
||||
H5E_WRITEERROR, /* Write failed */
|
||||
H5E_CLOSEERROR, /* Close failed */
|
||||
|
||||
/* Function entry/exit interface errors */
|
||||
H5E_CANTINIT, /* Can't initialize interface */
|
||||
H5E_ALREADYINIT, /* Object already initialized */
|
||||
/* Function entry/exit interface errors */
|
||||
H5E_CANTINIT, /* Can't initialize interface */
|
||||
H5E_ALREADYINIT, /* Object already initialized */
|
||||
|
||||
/* Object atom related errors */
|
||||
H5E_BADATOM, /* Can't find atom information */
|
||||
H5E_CANTREGISTER, /* Can't register new atom */
|
||||
/* Object atom related errors */
|
||||
H5E_BADATOM, /* Can't find atom information */
|
||||
H5E_CANTREGISTER, /* Can't register new atom */
|
||||
|
||||
/* Cache related errors */
|
||||
H5E_CANTFLUSH, /* Can't flush object from cache */
|
||||
H5E_CANTLOAD, /* Can't load object into cache */
|
||||
H5E_PROTECT, /* Protected object error */
|
||||
H5E_NOTCACHED, /* Object not currently cached */
|
||||
/* Cache related errors */
|
||||
H5E_CANTFLUSH, /* Can't flush object from cache */
|
||||
H5E_CANTLOAD, /* Can't load object into cache */
|
||||
H5E_PROTECT, /* Protected object error */
|
||||
H5E_NOTCACHED, /* Object not currently cached */
|
||||
|
||||
/* B-tree related errors */
|
||||
H5E_NOTFOUND, /* Object not found */
|
||||
H5E_EXISTS, /* Object already exists */
|
||||
H5E_CANTENCODE, /* Can't encode value */
|
||||
H5E_CANTDECODE, /* Can't decode value */
|
||||
H5E_CANTSPLIT, /* Can't split node */
|
||||
H5E_CANTINSERT, /* Can't insert object */
|
||||
H5E_CANTLIST, /* Can't list node */
|
||||
/* B-tree related errors */
|
||||
H5E_NOTFOUND, /* Object not found */
|
||||
H5E_EXISTS, /* Object already exists */
|
||||
H5E_CANTENCODE, /* Can't encode value */
|
||||
H5E_CANTDECODE, /* Can't decode value */
|
||||
H5E_CANTSPLIT, /* Can't split node */
|
||||
H5E_CANTINSERT, /* Can't insert object */
|
||||
H5E_CANTLIST, /* Can't list node */
|
||||
|
||||
/* Object header related errors */
|
||||
H5E_LINKCOUNT, /* Bad object header link count */
|
||||
H5E_VERSION, /* Wrong version number */
|
||||
H5E_ALIGNMENT, /* Alignment error */
|
||||
H5E_BADMESG, /* Unrecognized message */
|
||||
/* Object header related errors */
|
||||
H5E_LINKCOUNT, /* Bad object header link count */
|
||||
H5E_VERSION, /* Wrong version number */
|
||||
H5E_ALIGNMENT, /* Alignment error */
|
||||
H5E_BADMESG, /* Unrecognized message */
|
||||
|
||||
/* Group related errors */
|
||||
H5E_CANTOPENOBJ, /* Can't open object */
|
||||
H5E_COMPLEN, /* Name component is too long */
|
||||
H5E_CWG, /* Problem with current working group */
|
||||
H5E_LINK /* Link count failure */
|
||||
}
|
||||
hdf_min_err_code_t;
|
||||
/* Group related errors */
|
||||
H5E_CANTOPENOBJ, /* Can't open object */
|
||||
H5E_COMPLEN, /* Name component is too long */
|
||||
H5E_CWG, /* Problem with current working group */
|
||||
H5E_LINK /* Link count failure */
|
||||
} H5E_minor_t;
|
||||
|
||||
/* Function pointer to report errors through */
|
||||
typedef herr_t (*H5E_push_func_t)(int32 errid, hdf_maj_err_code_t maj, hdf_min_err_code_t min, const char *function_name, const char *file_name, intn line);
|
||||
typedef herr_t (*H5E_push_func_t)(int32 errid, H5E_major_t maj,
|
||||
H5E_minor_t min, const char *function_name,
|
||||
const char *file_name, intn line);
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Functions in H5E.c */
|
||||
int32 H5Enew_err_stack(uintn initial_stack_size);
|
||||
intn H5Edelete_err_stack(int32 err_hand);
|
||||
int32 H5Enew_err_stack (uintn initial_stack_size);
|
||||
intn H5Edelete_err_stack (int32 err_hand);
|
||||
#ifdef H5_ERROR_DEBUG
|
||||
H5E_push_func_t H5Eset_push(H5E_push_func_t func);
|
||||
H5E_push_func_t H5Eset_push (H5E_push_func_t func);
|
||||
#endif
|
||||
herr_t H5Epush(hdf_maj_err_code_t maj, hdf_min_err_code_t min, const char *function_name, const char *file_name, intn line);
|
||||
herr_t H5Epush (H5E_major_t maj, H5E_minor_t min, const char *function_name,
|
||||
const char *file_name, intn line);
|
||||
herr_t H5Eclear(int32 err_hand);
|
||||
void H5E_term_interface(void);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user