summaryrefslogtreecommitdiffstats
path: root/src/H5E.c
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2003-07-26 02:55:47 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2003-07-26 02:55:47 (GMT)
commit0d22a663df367ada055cb3695186c669e1dd6d5e (patch)
tree9a3c6588411b63b90ec5d86f65032c0f373eb4e2 /src/H5E.c
parentb4b2b55d33be1c4f1c33aaf58294281a93b7da39 (diff)
downloadhdf5-0d22a663df367ada055cb3695186c669e1dd6d5e.zip
hdf5-0d22a663df367ada055cb3695186c669e1dd6d5e.tar.gz
hdf5-0d22a663df367ada055cb3695186c669e1dd6d5e.tar.bz2
[svn-r7265] *** empty log message ***
Diffstat (limited to 'src/H5E.c')
-rw-r--r--src/H5E.c1299
1 files changed, 269 insertions, 1030 deletions
diff --git a/src/H5E.c b/src/H5E.c
index 536a606..695cfb9 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -46,8 +46,6 @@
#define PABLO_MASK H5E_mask
-#ifndef NEW_ERR
-
/* Major error IDs */
hid_t H5E_NONE_MAJOR_g = FAIL; /*special zero, no error */
hid_t H5E_ARGS_g = FAIL; /*invalid arguments to routine */
@@ -175,161 +173,10 @@ hid_t H5E_CALLBACK_g = FAIL; /*callback failed
hid_t H5E_CANAPPLY_g = FAIL; /*error from filter "can apply" callback */
hid_t H5E_SETLOCAL_g = FAIL; /*error from filter "set local" callback */
-#endif /* NEW_ERR */
-
-
-static const H5E_major_mesg_t H5E_major_mesg_g[] = {
- {H5E_NONE_MAJOR, "No error"},
- {H5E_ARGS, "Function arguments"},
- {H5E_RESOURCE, "Resource unavailable"},
- {H5E_INTERNAL, "Internal HDF5 error"},
- {H5E_FILE, "File interface"},
- {H5E_IO, "Low-level I/O layer"},
- {H5E_FUNC, "Function entry/exit"},
- {H5E_ATOM, "Atom layer"},
- {H5E_CACHE, "Meta data cache layer"},
- {H5E_BTREE, "B-tree layer"},
- {H5E_SYM, "Symbol table layer"},
- {H5E_HEAP, "Heap layer"},
- {H5E_OHDR, "Object header layer"},
- {H5E_DATATYPE, "Datatype interface"},
- {H5E_DATASPACE, "Dataspace interface"},
- {H5E_DATASET, "Dataset interface"},
- {H5E_STORAGE, "Data storage layer"},
- {H5E_PLIST, "Property list interface"},
- {H5E_ATTR, "Attribute layer"},
- {H5E_PLINE, "Data filters layer"},
- {H5E_EFL, "External file list"},
- {H5E_REFERENCE, "References layer"},
- {H5E_VFL, "Virtual File Layer"},
- {H5E_TBBT, "Threaded, Balanced, Binary Trees"},
- {H5E_FPHDF5, "Flexible Parallel HDF5"},
- {H5E_TST, "Ternary Search Trees"},
- {H5E_RS, "Reference Counted Strings"},
- {H5E_ERROR, "Error API"},
-};
-
-static const H5E_minor_mesg_t H5E_minor_mesg_g[] = {
- {H5E_NONE_MINOR, "No error"},
-
- /* Argument errors */
- {H5E_UNINITIALIZED, "Information is uninitialized"},
- {H5E_UNSUPPORTED, "Feature is unsupported"},
- {H5E_BADTYPE, "Inappropriate type"},
- {H5E_BADRANGE, "Out of range"},
- {H5E_BADVALUE, "Bad value"},
-
- /* Resource errors */
- {H5E_NOSPACE, "No space available for allocation"},
- {H5E_CANTCOPY, "Unable to copy object"},
- {H5E_CANTFREE, "Unable to free object"},
- {H5E_ALREADYEXISTS, "Object already exists"},
- {H5E_CANTLOCK, "Unable to lock object"},
- {H5E_CANTUNLOCK, "Unable to unlock object"},
- {H5E_CANTGC, "Unable to garbage collect"},
-
- /* File accessability errors */
- {H5E_FILEEXISTS, "File already exists"},
- {H5E_FILEOPEN, "File already open"},
- {H5E_CANTCREATE, "Unable to create file"},
- {H5E_CANTOPENFILE, "Unable to open file"},
- {H5E_CANTCLOSEFILE, "Unable to close file"},
- {H5E_NOTHDF5, "Not an HDF5 file"},
- {H5E_BADFILE, "Bad file ID accessed"},
- {H5E_TRUNCATED, "File has been truncated"},
- {H5E_MOUNT, "File mount error"},
-
- /* Generic low-level file I/O errors */
- {H5E_SEEKERROR, "Seek failed"},
- {H5E_READERROR, "Read failed"},
- {H5E_WRITEERROR, "Write failed"},
- {H5E_CLOSEERROR, "Close failed"},
- {H5E_OVERFLOW, "Address overflowed"},
- {H5E_FCNTL, "File control (fcntl) failed"},
-
- /* Function entry/exit interface errors */
- {H5E_CANTINIT, "Unable to initialize object"},
- {H5E_ALREADYINIT, "Object already initialized"},
- {H5E_CANTRELEASE, "Unable to release object"},
-
- /* Object atom related errors */
- {H5E_BADATOM, "Unable to find atom information (already closed?)"},
- {H5E_BADGROUP, "Unable to find ID group information"},
- {H5E_CANTREGISTER, "Unable to register new atom"},
- {H5E_CANTINC, "Unable to increment reference count"},
- {H5E_CANTDEC, "Unable to decrement reference count"},
- {H5E_NOIDS, "Out of IDs for group"},
-
- /* Cache related errors */
- {H5E_CANTFLUSH, "Unable to flush data from cache"},
- {H5E_CANTLOAD, "Unable to load meta data into cache"},
- {H5E_PROTECT, "Protected meta data error"},
- {H5E_NOTCACHED, "Meta data not currently cached"},
-
- /* B-tree related errors */
- {H5E_NOTFOUND, "Object not found"},
- {H5E_EXISTS, "Object already exists"},
- {H5E_CANTENCODE, "Unable to encode value"},
- {H5E_CANTDECODE, "Unable to decode value"},
- {H5E_CANTSPLIT, "Unable to split node"},
- {H5E_CANTINSERT, "Unable to insert object"},
- {H5E_CANTLIST, "Unable to 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"},
- {H5E_CANTDELETE, "Can't delete 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"},
- {H5E_SLINK, "Symbolic link error"},
-
- /* Datatype conversion errors */
- {H5E_CANTCONVERT, "Can't convert datatypes"},
- {H5E_BADSIZE, "Bad size for object"},
-
- /* Dataspace errors */
- {H5E_CANTCLIP, "Can't clip hyperslab region"},
- {H5E_CANTCOUNT, "Can't count elements"},
- {H5E_CANTSELECT, "Can't select hyperslab"},
- {H5E_CANTNEXT, "Can't move to next iterator location"},
- {H5E_BADSELECT, "Invalid selection"},
- {H5E_CANTCOMPARE, "Can't compare objects"},
-
- /* Property list errors */
- {H5E_CANTGET, "Can't get value"},
- {H5E_CANTSET, "Can't set value"},
- {H5E_DUPCLASS, "Duplicate class name in parent class"},
-
- /* Parallel MPI errors */
- {H5E_MPI, "Some MPI function failed"},
- {H5E_MPIERRSTR, "MPI Error String"},
-
- /* FPHDF5 errors */
- {H5E_CANTMAKETREE, "Can't create a binary tree node"},
- {H5E_CANTRECV, "Can't receive messages from processes"},
- {H5E_CANTSENDMDATA, "Can't send metadata message"},
- {H5E_CANTCHANGE, "Can't register change with server"},
- {H5E_CANTALLOC, "Can't allocate from file"},
-
- /* I/O pipeline errors */
- {H5E_NOFILTER, "Requested filter is not available"},
- {H5E_CALLBACK, "Callback failed"},
- {H5E_CANAPPLY, "Error from filter \"can apply\" callback"},
- {H5E_SETLOCAL, "Error from filter \"set local\" callback"}
-
-};
-
/* Interface initialization? */
static int interface_initialize_g = 0;
#define INTERFACE_INIT H5E_init_interface
-#ifndef NEW_ERR
/*
* Predefined errors. These are initialized at runtime in H5E_init_interface()
* in this source file.
@@ -338,53 +185,9 @@ static int interface_initialize_g = 0;
* types to reset in H5E_term_interface().
*/
hid_t H5E_ERR_CLS_g = FAIL;
-
-#endif /* NEW_ERR */
-
-#ifndef NEW_ERR
-#ifdef H5_HAVE_THREADSAFE
-/*
- * The per-thread error stack. pthread_once() initializes a special
- * key that will be used by all threads to create a stack specific to
- * each thread individually. The association of stacks to threads will
- * be handled by the pthread library.
- *
- * In order for this macro to work, H5E_get_my_stack() must be preceeded
- * by "H5E_t *estack =".
- */
-H5E_t_new *H5E_get_stack_new(void);
-#define H5E_get_my_stack_new() H5E_get_stack_new()
-#else /* H5_HAVE_THREADSAFE */
-/*
- * The error stack. Eventually we'll have some sort of global table so each
- * thread has it's own stack. The stacks will be created on demand when the
- * thread first calls H5E_push(). */
-H5E_t_new H5E_stack_g_new[1];
-#define H5E_get_my_stack_new() (H5E_stack_g_new+0)
-#endif /* H5_HAVE_THREADSAFE */
-
-#endif /* NEW_ERR */
-
-#ifdef H5_HAVE_THREADSAFE
-/*
- * The per-thread error stack. pthread_once() initializes a special
- * key that will be used by all threads to create a stack specific to
- * each thread individually. The association of stacks to threads will
- * be handled by the pthread library.
- *
- * In order for this macro to work, H5E_get_my_stack() must be preceeded
- * by "H5E_t *estack =".
- */
-H5E_t *H5E_get_stack(void);
-#define H5E_get_my_stack() H5E_get_stack()
-#else
-/*
- * The error stack. Eventually we'll have some sort of global table so each
- * thread has it's own stack. The stacks will be created on demand when the
- * thread first calls H5E_push(). */
+#ifndef H5_HAVE_THREADSAFE
H5E_t H5E_stack_g[1];
-#define H5E_get_my_stack() (H5E_stack_g+0)
-#endif
+#endif /* H5_HAVE_THREADSAFE */
#ifdef H5_HAVE_PARALLEL
/*
@@ -394,23 +197,13 @@ char H5E_mpi_error_str[MPI_MAX_ERROR_STRING];
int H5E_mpi_error_str_len;
#endif
-/*
- * Automatic error stack traversal occurs if the traversal callback function
- * is non null and an API function is about to return an error. These should
- * probably be part of the error stack so they're local to a thread.
- */
-herr_t (*H5E_auto_g)(void*) = (herr_t(*)(void*))H5Eprint;
-void *H5E_auto_data_g = NULL;
-
-
/* Static function declarations */
static herr_t H5E_init_interface (void);
-#ifndef NEW_ERR
static int H5E_close_msg_cb(void *obj_ptr, hid_t obj_id, void *key);
-static herr_t H5E_walk_cb_new(int n, H5E_error_t_new *err_desc, void *client_data);
-#endif /* NEW_ERR */
-static herr_t H5E_walk_cb (int n, H5E_error_t *err_desc, void *client_data);
+static herr_t H5E_walk_cb(int n, H5E_error_t *err_desc, void *client_data);
+
+#ifdef OLD_ERR /* Old codes, commented out */
#ifdef H5_HAVE_THREADSAFE
/*-------------------------------------------------------------------------
@@ -452,8 +245,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value);
}
#endif /* H5_HAVE_THREADSAFE */
-
-#ifndef NEW_ERR
+#endif /* OLD_ERR */
/*--------------------------------------------------------------------------
* Function: H5E_init_interface
@@ -485,143 +277,140 @@ H5E_init_interface(void)
(H5I_free_t)H5E_close_stack);
#ifndef H5_HAVE_THREADSAFE
- H5E_stack_g_new[0].func = &(H5Eprint_new);
- H5E_stack_g_new[0].auto_data = stderr;
+ H5E_stack_g[0].func = (H5E_auto_t)H5Eprint;
+ H5E_stack_g[0].auto_data = stderr;
#endif /* H5_HAVE_THREADSAFE */
H5E_ERR_CLS_g = H5E_register_class(H5E_CLS_NAME, H5E_CLS_LIB_NAME, H5E_CLS_LIB_VERS);
- H5E_NONE_MAJOR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_NONE_MAJOR_MSG_new);
- H5E_ARGS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_ARGS_MSG_new);
- H5E_RESOURCE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_RESOURCE_MSG_new);
- H5E_INTERNAL_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_INTERNAL_MSG_new);
- H5E_FILE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_FILE_MSG_new);
-
- H5E_IO_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_IO_MSG_new);
- H5E_FUNC_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_FUNC_MSG_new);
- H5E_ATOM_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_ATOM_MSG_new);
- H5E_CACHE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_CACHE_MSG_new);
- H5E_BTREE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_BTREE_MSG_new);
-
- H5E_SYM_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_SYM_MSG_new);
- H5E_HEAP_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_HEAP_MSG_new);
- H5E_OHDR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_HEAP_MSG_new);
- H5E_DATATYPE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_DATATYPE_MSG_new);
- H5E_DATASPACE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_DATASPACE_MSG_new);
-
- H5E_DATASET_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_DATASET_MSG_new);
- H5E_STORAGE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_STORAGE_MSG_new);
- H5E_PLIST_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_PLIST_MSG_new);
- H5E_ATTR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_ATTR_MSG_new);
- H5E_PLINE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_PLINE_MSG_new);
-
- H5E_EFL_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_EFL_MSG_new);
- H5E_REFERENCE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_REFERENCE_MSG_new);
- H5E_VFL_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_VFL_MSG_new);
- H5E_TBBT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_TBBT_MSG_new);
- H5E_FPHDF5_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_FPHDF5_MSG_new);
-
- H5E_TST_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_TST_MSG_new);
- H5E_RS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_RS_MSG_new);
- H5E_ERROR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MAJ_ERROR_MSG_new);
+ H5E_NONE_MAJOR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_NONE_MAJOR_MSG);
+ H5E_ARGS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_ARGS_MSG);
+ H5E_RESOURCE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_RESOURCE_MSG);
+ H5E_INTERNAL_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_INTERNAL_MSG);
+ H5E_FILE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_FILE_MSG);
+
+ H5E_IO_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_IO_MSG);
+ H5E_FUNC_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_FUNC_MSG);
+ H5E_ATOM_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_ATOM_MSG);
+ H5E_CACHE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_CACHE_MSG);
+ H5E_BTREE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_BTREE_MSG);
+
+ H5E_SYM_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_SYM_MSG);
+ H5E_HEAP_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_HEAP_MSG);
+ H5E_OHDR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_HEAP_MSG);
+ H5E_DATATYPE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_DATATYPE_MSG);
+ H5E_DATASPACE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_DATASPACE_MSG);
+
+ H5E_DATASET_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_DATASET_MSG);
+ H5E_STORAGE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_STORAGE_MSG);
+ H5E_PLIST_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_PLIST_MSG);
+ H5E_ATTR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_ATTR_MSG);
+ H5E_PLINE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_PLINE_MSG);
+
+ H5E_EFL_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_EFL_MSG);
+ H5E_REFERENCE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_REFERENCE_MSG);
+ H5E_VFL_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_VFL_MSG);
+ H5E_TBBT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_TBBT_MSG);
+ H5E_FPHDF5_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_FPHDF5_MSG);
+
+ H5E_TST_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_TST_MSG);
+ H5E_RS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_RS_MSG);
+ H5E_ERROR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR, H5E_MAJ_ERROR_MSG);
/* Minor errors */
- H5E_NONE_MINOR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR_new, H5E_NONE_MINOR_MSG_new);
- H5E_UNINITIALIZED_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_UNINITIALIZED_MSG_new);
- H5E_UNSUPPORTED_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_UNSUPPORTED_MSG_new);
- H5E_BADTYPE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_BADTYPE_MSG_new);
- H5E_BADRANGE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_BADRANGE_MSG_new);
- H5E_BADVALUE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_BADVALUE_MSG_new);
-
- H5E_NOSPACE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_NOSPACE_MSG_new);
- H5E_CANTCOPY_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTCOPY_MSG_new);
- H5E_CANTFREE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTFREE_MSG_new);
- H5E_ALREADYEXISTS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_ALREADYEXISTS_MSG_new);
- H5E_CANTLOCK_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTLOCK_MSG_new);
- H5E_CANTUNLOCK_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTUNLOCK_MSG_new);
- H5E_CANTGC_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTGC_MSG_new);
-
- H5E_FILEEXISTS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_FILEEXISTS_MSG_new);
- H5E_FILEOPEN_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_FILEOPEN_MSG_new);
- H5E_CANTCREATE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTCREATE_MSG_new);
- H5E_CANTOPENFILE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTOPENFILE_MSG_new);
- H5E_CANTCLOSEFILE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTCLOSEFILE_MSG_new);
- H5E_NOTHDF5_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_NOTHDF5_MSG_new);
- H5E_BADFILE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_BADFILE_MSG_new);
- H5E_TRUNCATED_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_TRUNCATED_MSG_new);
- H5E_MOUNT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_MOUNT_MSG_new);
-
- H5E_SEEKERROR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_SEEKERROR_MSG_new);
- H5E_READERROR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_READERROR_MSG_new);
- H5E_WRITEERROR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_WRITEERROR_MSG_new);
- H5E_CLOSEERROR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CLOSEERROR_MSG_new);
-
- H5E_CANTINIT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTINIT_MSG_new);
- H5E_ALREADYINIT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_ALREADYINIT_MSG_new);
- H5E_CANTRELEASE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTRELEASE_MSG_new);
-
- H5E_BADATOM_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_BADATOM_MSG_new);
- H5E_BADGROUP_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_BADGROUP_MSG_new);
- H5E_CANTREGISTER_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTREGISTER_MSG_new);
- H5E_CANTINC_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTINC_MSG_new);
- H5E_CANTDEC_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTDEC_MSG_new);
- H5E_NOIDS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_NOIDS_MSG_new);
-
- H5E_CANTFLUSH_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTFLUSH_MSG_new);
- H5E_CANTLOAD_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTLOAD_MSG_new);
- H5E_PROTECT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_PROTECT_MSG_new);
- H5E_NOTCACHED_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_NOTCACHED_MSG_new);
-
- H5E_NOTFOUND_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_NOTFOUND_MSG_new);
- H5E_EXISTS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_EXISTS_MSG_new);
- H5E_CANTENCODE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTENCODE_MSG_new);
- H5E_CANTDECODE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTDECODE_MSG_new);
- H5E_CANTSPLIT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTSPLIT_MSG_new);
- H5E_CANTINSERT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTINSERT_MSG_new);
- H5E_CANTLIST_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTLIST_MSG_new);
-
- H5E_LINKCOUNT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_LINKCOUNT_MSG_new);
- H5E_VERSION_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_VERSION_MSG_new);
- H5E_ALIGNMENT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_ALIGNMENT_MSG_new);
- H5E_BADMESG_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_BADMESG_MSG_new);
- H5E_CANTDELETE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTDELETE_MSG_new);
-
- H5E_CANTOPENOBJ_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTOPENOBJ_MSG_new);
- H5E_COMPLEN_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_COMPLEN_MSG_new);
- H5E_CWG_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CWG_MSG_new);
- H5E_LINK_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_LINK_MSG_new);
- H5E_SLINK_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_SLINK_MSG_new);
-
- H5E_CANTCONVERT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTCONVERT_MSG_new);
- H5E_BADSIZE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_BADSIZE_MSG_new);
-
- H5E_CANTCLIP_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTCLIP_MSG_new);
- H5E_CANTCOUNT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTCOUNT_MSG_new);
- H5E_CANTSELECT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTSELECT_MSG_new);
- H5E_CANTNEXT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTNEXT_MSG_new);
- H5E_BADSELECT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_BADSELECT_MSG_new);
- H5E_CANTCOMPARE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTCOMPARE_MSG_new);
-
- H5E_CANTGET_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTGET_MSG_new);
- H5E_CANTSET_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTSET_MSG_new);
- H5E_DUPCLASS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_DUPCLASS_MSG_new);
-
- H5E_MPI_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_MPI_MSG_new);
- H5E_MPIERRSTR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_MPIERRSTR_MSG_new);
-
- H5E_CANTMAKETREE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTMAKETREE_MSG_new);
- H5E_CANTRECV_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTRECV_MSG_new);
- H5E_CANTSENDMDATA_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTSENDMDATA_MSG_new);
- H5E_CANTCHANGE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTCHANGE_MSG_new);
- H5E_CANTALLOC_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANTALLOC_MSG_new);
-
- H5E_NOFILTER_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_NOFILTER_MSG_new);
- H5E_CALLBACK_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CALLBACK_MSG_new);
- H5E_CANAPPLY_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_CANAPPLY_MSG_new);
- H5E_SETLOCAL_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MAJOR_new, H5E_MIN_SETLOCAL_MSG_new);
-
- /* From the old function; take out later */
- H5E_auto_data_g = stderr;
+ H5E_NONE_MINOR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_NONE_MINOR_MSG);
+ H5E_UNINITIALIZED_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_UNINITIALIZED_MSG);
+ H5E_UNSUPPORTED_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_UNSUPPORTED_MSG);
+ H5E_BADTYPE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_BADTYPE_MSG);
+ H5E_BADRANGE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_BADRANGE_MSG);
+ H5E_BADVALUE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_BADVALUE_MSG);
+
+ H5E_NOSPACE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_NOSPACE_MSG);
+ H5E_CANTCOPY_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTCOPY_MSG);
+ H5E_CANTFREE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTFREE_MSG);
+ H5E_ALREADYEXISTS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_ALREADYEXISTS_MSG);
+ H5E_CANTLOCK_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTLOCK_MSG);
+ H5E_CANTUNLOCK_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTUNLOCK_MSG);
+ H5E_CANTGC_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTGC_MSG);
+
+ H5E_FILEEXISTS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_FILEEXISTS_MSG);
+ H5E_FILEOPEN_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_FILEOPEN_MSG);
+ H5E_CANTCREATE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTCREATE_MSG);
+ H5E_CANTOPENFILE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTOPENFILE_MSG);
+ H5E_CANTCLOSEFILE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTCLOSEFILE_MSG);
+ H5E_NOTHDF5_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_NOTHDF5_MSG);
+ H5E_BADFILE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_BADFILE_MSG);
+ H5E_TRUNCATED_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_TRUNCATED_MSG);
+ H5E_MOUNT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_MOUNT_MSG);
+
+ H5E_SEEKERROR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_SEEKERROR_MSG);
+ H5E_READERROR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_READERROR_MSG);
+ H5E_WRITEERROR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_WRITEERROR_MSG);
+ H5E_CLOSEERROR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CLOSEERROR_MSG);
+
+ H5E_CANTINIT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTINIT_MSG);
+ H5E_ALREADYINIT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_ALREADYINIT_MSG);
+ H5E_CANTRELEASE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTRELEASE_MSG);
+
+ H5E_BADATOM_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_BADATOM_MSG);
+ H5E_BADGROUP_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_BADGROUP_MSG);
+ H5E_CANTREGISTER_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTREGISTER_MSG);
+ H5E_CANTINC_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTINC_MSG);
+ H5E_CANTDEC_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTDEC_MSG);
+ H5E_NOIDS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_NOIDS_MSG);
+
+ H5E_CANTFLUSH_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTFLUSH_MSG);
+ H5E_CANTLOAD_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTLOAD_MSG);
+ H5E_PROTECT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_PROTECT_MSG);
+ H5E_NOTCACHED_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_NOTCACHED_MSG);
+
+ H5E_NOTFOUND_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_NOTFOUND_MSG);
+ H5E_EXISTS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_EXISTS_MSG);
+ H5E_CANTENCODE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTENCODE_MSG);
+ H5E_CANTDECODE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTDECODE_MSG);
+ H5E_CANTSPLIT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTSPLIT_MSG);
+ H5E_CANTINSERT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTINSERT_MSG);
+ H5E_CANTLIST_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTLIST_MSG);
+
+ H5E_LINKCOUNT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_LINKCOUNT_MSG);
+ H5E_VERSION_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_VERSION_MSG);
+ H5E_ALIGNMENT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_ALIGNMENT_MSG);
+ H5E_BADMESG_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_BADMESG_MSG);
+ H5E_CANTDELETE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTDELETE_MSG);
+
+ H5E_CANTOPENOBJ_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTOPENOBJ_MSG);
+ H5E_COMPLEN_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_COMPLEN_MSG);
+ H5E_CWG_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CWG_MSG);
+ H5E_LINK_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_LINK_MSG);
+ H5E_SLINK_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_SLINK_MSG);
+
+ H5E_CANTCONVERT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTCONVERT_MSG);
+ H5E_BADSIZE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_BADSIZE_MSG);
+
+ H5E_CANTCLIP_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTCLIP_MSG);
+ H5E_CANTCOUNT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTCOUNT_MSG);
+ H5E_CANTSELECT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTSELECT_MSG);
+ H5E_CANTNEXT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTNEXT_MSG);
+ H5E_BADSELECT_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_BADSELECT_MSG);
+ H5E_CANTCOMPARE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTCOMPARE_MSG);
+
+ H5E_CANTGET_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTGET_MSG);
+ H5E_CANTSET_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTSET_MSG);
+ H5E_DUPCLASS_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_DUPCLASS_MSG);
+
+ H5E_MPI_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_MPI_MSG);
+ H5E_MPIERRSTR_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_MPIERRSTR_MSG);
+
+ H5E_CANTMAKETREE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTMAKETREE_MSG);
+ H5E_CANTRECV_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTRECV_MSG);
+ H5E_CANTSENDMDATA_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTSENDMDATA_MSG);
+ H5E_CANTCHANGE_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTCHANGE_MSG);
+ H5E_CANTALLOC_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANTALLOC_MSG);
+
+ H5E_NOFILTER_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_NOFILTER_MSG);
+ H5E_CALLBACK_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CALLBACK_MSG);
+ H5E_CANAPPLY_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_CANAPPLY_MSG);
+ H5E_SETLOCAL_g = H5E_create_msg(H5E_ERR_CLS_g, H5E_MINOR, H5E_MIN_SETLOCAL_MSG);
done:
FUNC_LEAVE_NOAPI(ret_value);
@@ -649,10 +438,19 @@ int
H5E_term_interface(void)
{
int ncls, nmsg, nstk, n=0;
+ H5E_t *estack;
FUNC_ENTER_NOINIT(H5E_term_interface);
if (interface_initialize_g) {
+#ifdef H5_HAVE_THREADSAFE
+ /* Free default error stack here? */
+ estack = pthread_getspecific(H5TS_errstk_key_g);
+ if (estack) {
+ H5MM_free(estack);
+ }
+#endif
+
/* Check if there are any open property list classes or lists */
ncls = H5I_nmembers(H5I_ERROR_CLASS);
nmsg = H5I_nmembers(H5I_ERROR_MSG);
@@ -670,6 +468,7 @@ H5E_term_interface(void)
if(H5I_nmembers(H5I_ERROR_CLASS)==0)
H5E_ERR_CLS_g = -1;
}
+
if (nstk>0)
H5I_clear_group(H5I_ERROR_STACK, FALSE);
@@ -688,38 +487,6 @@ H5E_term_interface(void)
FUNC_LEAVE_NOAPI(n);
}
-#else /* NEW_ERR */
-
-/*-------------------------------------------------------------------------
- * Function: H5E_init_interface
- *
- * Purpose: Initialize the H5E interface. `stderr' is an extern or
- * function on some systems so we can't initialize
- * H5E_auto_data_g statically.
- *
- * Return: Success: Non-negative
- *
- * Failure: Negative
- *
- * Programmer: Robb Matzke
- * Friday, June 11, 1999
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5E_init_interface (void)
-{
- FUNC_ENTER_NOINIT(H5E_init_interface);
-
- H5E_auto_data_g = stderr;
-
- FUNC_LEAVE_NOAPI(SUCCEED);
-}
-#endif /* NEW_ERR */
-
-#ifndef NEW_ERR
/*-------------------------------------------------------------------------
* Function: H5Eregister_class
@@ -928,7 +695,7 @@ H5E_get_class_name(H5E_cls_t *cls, char *name, size_t size)
FUNC_ENTER_NOAPI(H5E_get_class_name, FAIL);
if(cls->cls_name)
- len = HDstrlen(cls->cls_name);
+ len = (ssize_t)HDstrlen(cls->cls_name);
else
len = 0;
@@ -1189,7 +956,7 @@ done:
#ifdef H5_HAVE_THREADSAFE
/*-------------------------------------------------------------------------
- * Function: H5E_get_stack_new
+ * Function: H5E_get_stack
*
* Purpose: Support function for H5E_get_my_stack() to initialize and
* acquire per-thread error stack.
@@ -1205,22 +972,23 @@ done:
*
*-------------------------------------------------------------------------
*/
-H5E_t_new *
-H5E_get_stack_new(void)
+H5E_t *
+H5E_get_stack(void)
{
- H5E_t_new *estack;
+ H5E_t *estack, *tmp;
H5E_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5E_get_stack_new,NULL);
+ FUNC_ENTER_NOAPI(H5E_get_stack,NULL);
- estack = pthread_getspecific(H5TS_errstk_key_g_new);
+ estack = pthread_getspecific(H5TS_errstk_key_g);
if (!estack) {
/* no associated value with current thread - create one */
- estack = (H5E_t_new *)H5MM_calloc(sizeof(H5E_t_new));
- estack->func = H5Eprint_new;
+ /* Where is it freed? */
+ estack = (H5E_t *)H5MM_calloc(sizeof(H5E_t));
+ estack->func = H5Eprint;
estack->auto_data = stderr;
- pthread_setspecific(H5TS_errstk_key_g_new, (void *)estack);
+ pthread_setspecific(H5TS_errstk_key_g, (void *)estack);
}
/* Set return value */
@@ -1281,9 +1049,9 @@ hid_t
H5E_get_current_stack(void)
{
hid_t ret_value; /* Return value */
- H5E_t_new *current_stack = H5E_get_my_stack_new ();
- H5E_t_new *estack_copy = H5MM_malloc(sizeof(H5E_t_new));
- H5E_error_t_new *current_error, *new_error;
+ H5E_t *current_stack = H5E_get_my_stack ();
+ H5E_t *estack_copy = H5MM_malloc(sizeof(H5E_t));
+ H5E_error_t *current_error, *new_error;
int i;
FUNC_ENTER_NOAPI(H5E_get_current_stack, FAIL);
@@ -1314,7 +1082,7 @@ H5E_get_current_stack(void)
if(current_error->desc)
H5MM_xfree((void*)current_error->desc);
}
- HDmemset(current_stack->slot, 0, sizeof(H5E_error_t_new)*current_stack->nused);
+ HDmemset(current_stack->slot, 0, sizeof(H5E_error_t)*current_stack->nused);
current_stack->nused = 0;
/* Register the error stack to get an ID for it */
@@ -1344,7 +1112,7 @@ herr_t
H5Eset_current_stack(hid_t err_stack_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- H5E_t_new *estack;
+ H5E_t *estack;
FUNC_ENTER_API(H5Eset_current_stack, FAIL);
H5TRACE1("e","i",err_stack_id);
@@ -1378,11 +1146,11 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5E_set_current_stack(H5E_t_new *estack)
+H5E_set_current_stack(H5E_t *estack)
{
herr_t ret_value = SUCCEED; /* Return value */
- H5E_t_new *current_stack = H5E_get_my_stack_new();
- H5E_error_t_new *current_error, *new_error;
+ H5E_t *current_stack = H5E_get_my_stack();
+ H5E_error_t *current_error, *new_error;
int i;
FUNC_ENTER_NOAPI(H5E_get_current_stack, FAIL);
@@ -1397,7 +1165,7 @@ H5E_set_current_stack(H5E_t_new *estack)
if(current_error->desc)
H5MM_xfree((void*)current_error->desc);
}
- HDmemset(current_stack->slot, 0, sizeof(H5E_error_t_new)*current_stack->nused);
+ HDmemset(current_stack->slot, 0, sizeof(H5E_error_t)*current_stack->nused);
current_stack->nused = 0;
/* Copy new stack to current error stack */
@@ -1439,11 +1207,11 @@ herr_t
H5Eclose_stack(hid_t stack_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- H5E_t_new *err_stack;
+ H5E_t *err_stack;
FUNC_ENTER_API(H5Eclose_stack, FAIL);
H5TRACE1("e","i",stack_id);
-
+/*HDfprintf(stderr, "H5Eclose_stack is called\n");*/
/* Add HGOTO_ERROR later */
if(H5E_DEFAULT == stack_id)
;
@@ -1478,13 +1246,14 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5E_close_stack(H5E_t_new *err_stack)
+H5E_close_stack(H5E_t *err_stack)
{
herr_t ret_value = SUCCEED; /* Return value */
- H5E_error_t_new *error;
+ H5E_error_t *error;
int i;
FUNC_ENTER_NOAPI(H5E_close_stack, FAIL);
+/*HDfprintf(stderr, "H5E_close_stack is called\n");*/
if(err_stack) {
for(i=0; i<err_stack->nused; i++) {
@@ -1523,14 +1292,14 @@ int
H5Eget_num(hid_t error_stack_id)
{
int ret_value; /* Return value */
- H5E_t_new *estack;
+ H5E_t *estack;
FUNC_ENTER_API(H5Eget_num, FAIL);
H5TRACE1("Is","i",error_stack_id);
/* Need to check for errors */
if(error_stack_id == H5E_DEFAULT)
- estack = H5E_get_my_stack_new();
+ estack = H5E_get_my_stack();
else
estack = H5I_object_verify(error_stack_id, H5I_ERROR_STACK);
@@ -1557,12 +1326,13 @@ done:
*-------------------------------------------------------------------------
*/
int
-H5E_get_num(H5E_t_new *err_stack)
+H5E_get_num(H5E_t *err_stack)
{
int ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5E_get_num, FAIL);
-
+
+ assert(err_stack);
ret_value = err_stack->nused;
done:
@@ -1588,14 +1358,14 @@ herr_t
H5Epop(hid_t err_stack, size_t count)
{
herr_t ret_value = SUCCEED; /* Return value */
- H5E_t_new *estack;
+ H5E_t *estack;
FUNC_ENTER_API(H5Epop, FAIL);
H5TRACE2("e","iz",err_stack,count);
/* Need to check for errors */
if(err_stack == H5E_DEFAULT)
- estack = H5E_get_my_stack_new();
+ estack = H5E_get_my_stack();
else
estack = H5I_object_verify(err_stack, H5I_ERROR_STACK);
@@ -1626,10 +1396,10 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5E_pop(H5E_t_new *err_stack, size_t count)
+H5E_pop(H5E_t *err_stack, size_t count)
{
herr_t ret_value = SUCCEED; /* Return value */
- H5E_error_t_new *old_head, *new_head, *delete_head;
+ H5E_error_t *old_head, *new_head, *delete_head;
size_t delete_count;
int i;
@@ -1644,7 +1414,7 @@ H5E_pop(H5E_t_new *err_stack, size_t count)
/* Free memory for the errors to be deleted */
for(i=0; i<count; i++) {
- H5E_error_t_new *error = &(err_stack->slot[i]);
+ H5E_error_t *error = &(err_stack->slot[i]);
if(error->func_name)
H5MM_xfree((void*)error->func_name);
if(error->file_name)
@@ -1656,16 +1426,16 @@ H5E_pop(H5E_t_new *err_stack, size_t count)
/* Move the rest errors to the top of stack. Watch out: func_name, file_name, desc in new slot
* each points to the same location as the old slot. Do not free them when deleting the old
* slot. */
- HDmemmove(old_head, new_head, (err_stack->nused-count)*sizeof(H5E_error_t_new));
+ HDmemmove(old_head, new_head, (err_stack->nused-count)*sizeof(H5E_error_t));
/* Point to the beginning of errors to be removed, delete the old moved slots. */
delete_head = &(err_stack->slot[err_stack->nused-count]);
delete_count = count;
- HDmemset(delete_head, 0, delete_count*sizeof(H5E_error_t_new));
+ HDmemset(delete_head, 0, delete_count*sizeof(H5E_error_t));
err_stack->nused = err_stack->nused - count;
} else {
- H5E_clear_new(err_stack);
+ H5E_clear(err_stack);
}
done:
@@ -1674,7 +1444,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5Epush_new
+ * Function: H5Epush
*
* Purpose: Pushes a new error record onto error stack for the current
* thread. The error has major and minor IDs MAJ_ID and
@@ -1702,22 +1472,22 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Epush_new(hid_t err_stack, const char *file, const char *func, unsigned line,
+H5Epush(hid_t err_stack, const char *file, const char *func, unsigned line,
hid_t maj_id, hid_t min_id, const char *fmt, ...)
{
herr_t ret_value;
- H5E_t_new *estack_ptr;
+ H5E_t *estack_ptr;
H5E_msg_t *maj_ptr, *min_ptr;
va_list ap;
hid_t cls_id;
char tmp[128]; /* What's the maximal length? */
- FUNC_ENTER_API(H5Epush_new, FAIL);
+ FUNC_ENTER_API(H5Epush, FAIL);
H5TRACE7("e","issIuiis",err_stack,file,func,line,maj_id,min_id,fmt);
/* Need to check for errors */
if(err_stack == H5E_DEFAULT)
- estack_ptr = H5E_get_my_stack_new();
+ estack_ptr = H5E_get_my_stack();
else
estack_ptr = H5I_object_verify(err_stack, H5I_ERROR_STACK);
@@ -1729,11 +1499,11 @@ H5Epush_new(hid_t err_stack, const char *file, const char *func, unsigned line,
cls_id = H5I_register(H5I_ERROR_CLASS, maj_ptr->cls);
va_start(ap, fmt);
- vsnprintf(tmp, 128, fmt, ap);
+ HDvsnprintf(tmp, H5E_LEN, fmt, ap);
va_end(ap);
/* Should we make copies of maj_idm and min_id? */
- ret_value = H5E_push_new(estack_ptr, file, func, line, cls_id, maj_id, min_id, tmp);
+ ret_value = H5E_push(estack_ptr, file, func, line, cls_id, maj_id, min_id, tmp);
done:
FUNC_LEAVE_API(ret_value);
@@ -1741,7 +1511,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5E_push_new
+ * Function: H5E_push
*
* Purpose: Pushes a new error record onto error stack for the current
* thread. The error has major and minor IDs MAJ_ID and
@@ -1769,7 +1539,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5E_push_new(H5E_t_new *estack, const char *file, const char *func, unsigned line,
+H5E_push(H5E_t *estack, const char *file, const char *func, unsigned line,
hid_t cls_id, hid_t maj_id, hid_t min_id, const char *desc)
{
/*
@@ -1779,7 +1549,7 @@ H5E_push_new(H5E_t_new *estack, const char *file, const char *func, unsigned lin
* HERROR(). HERROR() is called by HRETURN_ERROR() which could
* be called by FUNC_ENTER().
*/
- FUNC_ENTER_NOINIT(H5E_push_new);
+ FUNC_ENTER_NOINIT(H5E_push);
/*
* Don't fail if arguments are bad. Instead, substitute some default
@@ -1793,6 +1563,7 @@ H5E_push_new(H5E_t_new *estack, const char *file, const char *func, unsigned lin
* Push the error if there's room. Otherwise just forget it.
*/
assert (estack);
+
if (estack->nused<H5E_NSLOTS) {
estack->slot[estack->nused].cls_id = cls_id;
estack->slot[estack->nused].maj_id = maj_id;
@@ -1803,13 +1574,13 @@ H5E_push_new(H5E_t_new *estack, const char *file, const char *func, unsigned lin
estack->slot[estack->nused].desc = HDstrdup(desc);
estack->nused++;
}
-
+
FUNC_LEAVE_NOAPI(SUCCEED);
}
/*-------------------------------------------------------------------------
- * Function: H5Eclear_new
+ * Function: H5Eclear
*
* Purpose: Clears the error stack for the specified error stack.
*
@@ -1823,22 +1594,22 @@ H5E_push_new(H5E_t_new *estack, const char *file, const char *func, unsigned lin
*-------------------------------------------------------------------------
*/
herr_t
-H5Eclear_new(hid_t err_stack)
+H5Eclear(hid_t err_stack)
{
herr_t ret_value=SUCCEED; /* Return value */
- H5E_t_new *estack_ptr;
+ H5E_t *estack_ptr;
- FUNC_ENTER_API(H5Eclear_new, FAIL);
+ FUNC_ENTER_API(H5Eclear, FAIL);
H5TRACE1("e","i",err_stack);
/* FUNC_ENTER() does all the work */
/* Need to check for errors */
if(err_stack == H5E_DEFAULT)
- estack_ptr = H5E_get_my_stack_new();
+ estack_ptr = H5E_get_my_stack();
else
estack_ptr = H5I_object_verify(err_stack, H5I_ERROR_STACK);
- ret_value = H5E_clear_new(estack_ptr);
+ ret_value = H5E_clear(estack_ptr);
done:
FUNC_LEAVE_API(ret_value);
@@ -1846,7 +1617,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5E_clear_new
+ * Function: H5E_clear
*
* Purpose: Private function to clear the error stack for the
* specified error stack.
@@ -1861,13 +1632,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5E_clear_new(H5E_t_new *estack)
+H5E_clear(H5E_t *estack)
{
herr_t ret_value=SUCCEED; /* Return value */
- H5E_error_t_new *error;
+ H5E_error_t *error;
int i;
- FUNC_ENTER_NOAPI(H5E_clear_new, FAIL);
+ FUNC_ENTER_NOAPI(H5E_clear, FAIL);
/* Empty the error stack */
if (estack) {
@@ -1880,16 +1651,17 @@ H5E_clear_new(H5E_t_new *estack)
if(error->desc)
H5MM_xfree((void*)error->desc);
}
- HDmemset(estack->slot, 0, sizeof(H5E_error_t_new)*estack->nused);
+ HDmemset(estack->slot, 0, sizeof(H5E_error_t)*estack->nused);
+ estack->nused = 0;
}
-
+
done:
FUNC_LEAVE_NOAPI(ret_value);
}
/*-------------------------------------------------------------------------
- * Function: H5E_print_new
+ * Function: H5Eprint
*
* Purpose: Prints the error stack in some default way. This is just a
* convenience function for H5Ewalk() with a function that
@@ -1915,22 +1687,22 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Eprint_new(hid_t err_stack, FILE *stream)
+H5Eprint(hid_t err_stack, FILE *stream)
{
herr_t ret_value=SUCCEED; /* Return value */
- H5E_t_new *estack_ptr;
+ H5E_t *estack_ptr;
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Eprint_new, FAIL);
+ FUNC_ENTER_API_NOCLEAR(H5Eprint, FAIL);
/*NO TRACE*/
/* Need to check for errors */
if(err_stack == H5E_DEFAULT)
- estack_ptr = H5E_get_my_stack_new();
+ estack_ptr = H5E_get_my_stack();
else
estack_ptr = H5I_object_verify(err_stack, H5I_ERROR_STACK);
- ret_value = H5E_print_new(estack_ptr, stream);
+ ret_value = H5E_print(estack_ptr, stream);
done:
FUNC_LEAVE_API(ret_value);
@@ -1938,7 +1710,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5E_print_new
+ * Function: H5E_print
*
* Purpose: Private function to print the error stack in some default
* way. This is just a convenience function for H5Ewalk()
@@ -1964,42 +1736,35 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5E_print_new(H5E_t_new *estack, FILE *stream)
+H5E_print(H5E_t *estack, FILE *stream)
{
herr_t ret_value = SUCCEED;
H5E_print_t eprint;
H5E_cls_t origin_cls={"Unknown class", "Unknown library", "Unknown library version"};
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Eprint, FAIL);
+ FUNC_ENTER_NOAPI(H5E_print, FAIL);
/*NO TRACE*/
-
+
+ assert(estack);
if (!stream)
eprint.stream = stderr;
else
eprint.stream = stream;
- eprint.cls.cls_name = HDstrdup(origin_cls.cls_name);
- eprint.cls.lib_name = HDstrdup(origin_cls.lib_name);
- eprint.cls.lib_vers = HDstrdup(origin_cls.lib_vers);
+ eprint.cls.cls_name = origin_cls.cls_name;
+ eprint.cls.lib_name = origin_cls.lib_name;
+ eprint.cls.lib_vers = origin_cls.lib_vers;
- ret_value = H5E_walk_new (estack, H5E_WALK_DOWNWARD, H5E_walk_cb_new, (void*)&eprint);
-
- /* Free memory */
- if(eprint.cls.cls_name)
- H5MM_free(eprint.cls.cls_name);
- if(eprint.cls.lib_name)
- H5MM_free(eprint.cls.lib_name);
- if(eprint.cls.lib_vers)
- H5MM_free(eprint.cls.lib_vers);
+ ret_value = H5E_walk (estack, H5E_WALK_DOWNWARD, H5E_walk_cb, (void*)&eprint);
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*-------------------------------------------------------------------------
- * Function: H5Ewalk_new
+ * Function: H5Ewalk
*
* Purpose: Walks the error stack for the current thread and calls some
* function for each error along the way.
@@ -2018,22 +1783,22 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Ewalk_new(hid_t err_stack, H5E_direction_t direction, H5E_walk_t_new func, void *client_data)
+H5Ewalk(hid_t err_stack, H5E_direction_t direction, H5E_walk_t func, void *client_data)
{
- H5E_t_new *estack_ptr;
+ H5E_t *estack_ptr;
herr_t ret_value;
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Ewalk_new, FAIL);
+ FUNC_ENTER_API_NOCLEAR(H5Ewalk, FAIL);
H5TRACE4("e","iEdxx",err_stack,direction,func,client_data);
/* Need to check for errors */
if(err_stack == H5E_DEFAULT)
- estack_ptr = H5E_get_my_stack_new();
+ estack_ptr = H5E_get_my_stack();
else
estack_ptr = H5I_object_verify(err_stack, H5I_ERROR_STACK);
- ret_value = H5E_walk_new (estack_ptr, direction, func, client_data);
+ ret_value = H5E_walk (estack_ptr, direction, func, client_data);
done:
FUNC_LEAVE_API(ret_value);
@@ -2041,9 +1806,9 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5E_walk_new
+ * Function: H5E_walk
*
- * Purpose: Private function for H5Ewalk_new.
+ * Purpose: Private function for H5Ewalk.
* Walks the error stack, calling the specified function for
* each error on the stack. The DIRECTION argument determines
* whether the stack is walked from the inside out or the
@@ -2072,13 +1837,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5E_walk_new (H5E_t_new *estack, H5E_direction_t direction, H5E_walk_t_new func, void *client_data)
+H5E_walk (H5E_t *estack, H5E_direction_t direction, H5E_walk_t func, void *client_data)
{
int i;
herr_t status;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5E_walk_new, FAIL);
+ FUNC_ENTER_NOAPI(H5E_walk, FAIL);
/* check args, but rather than failing use some default value */
if (direction!=H5E_WALK_UPWARD && direction!=H5E_WALK_DOWNWARD) {
@@ -2087,6 +1852,11 @@ H5E_walk_new (H5E_t_new *estack, H5E_direction_t direction, H5E_walk_t_new func,
/* walk the stack */
assert (estack);
+
+/*for(i=0; i<estack->nused; i++)
+ HDfprintf(stderr, "%s %d: i=%d, maj_id=%d, min_id=%d, nused=%d\n", FUNC, __LINE__, i, estack->slot[i].maj_id,
+ estack->slot[i].min_id, estack->nused);
+*/
if (func && H5E_WALK_UPWARD==direction) {
for (i=0, status=SUCCEED; i<estack->nused && status>=0; i++) {
@@ -2104,7 +1874,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5E_walk_cb_new
+ * Function: H5E_walk_cb
*
* Purpose: This is a default error stack traversal callback function
* that prints error messages to the specified output stream.
@@ -2137,7 +1907,7 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5E_walk_cb_new(int n, H5E_error_t_new *err_desc, void *client_data)
+H5E_walk_cb(int n, H5E_error_t *err_desc, void *client_data)
{
H5E_print_t *eprint = (H5E_print_t *)client_data;
FILE *stream = NULL;
@@ -2149,7 +1919,7 @@ H5E_walk_cb_new(int n, H5E_error_t_new *err_desc, void *client_data)
const char *cls_str = NULL;
const int indent = 2;
- FUNC_ENTER_NOINIT(H5E_walk_cb_new);
+ FUNC_ENTER_NOINIT(H5E_walk_cb);
/*NO TRACE*/
/* Check arguments */
@@ -2161,8 +1931,11 @@ H5E_walk_cb_new(int n, H5E_error_t_new *err_desc, void *client_data)
/* Need to check for errors */
maj_ptr = H5I_object_verify(err_desc->maj_id, H5I_ERROR_MSG);
min_ptr = H5I_object_verify(err_desc->min_id, H5I_ERROR_MSG);
- maj_str = maj_ptr->msg;
- min_str = min_ptr->msg;
+ assert(maj_ptr && min_ptr);
+ if(maj_ptr->msg)
+ maj_str = maj_ptr->msg;
+ if(min_ptr)
+ min_str = min_ptr->msg;
/* Get error class info */
/* add error checking later */
@@ -2173,14 +1946,10 @@ H5E_walk_cb_new(int n, H5E_error_t_new *err_desc, void *client_data)
/* Print error message */
if(HDstrcmp(cls_ptr->lib_name, eprint->cls.lib_name)) {
- /* store the new class information, free the old one. */
- if(eprint->cls.cls_name) H5MM_free(eprint->cls.cls_name);
- if(eprint->cls.lib_name) H5MM_free(eprint->cls.lib_name);
- if(eprint->cls.lib_vers) H5MM_free(eprint->cls.lib_vers);
-
- if(cls_ptr->cls_name) eprint->cls.cls_name = HDstrdup(cls_ptr->cls_name);
- if(cls_ptr->lib_name) eprint->cls.lib_name = HDstrdup(cls_ptr->lib_name);
- if(cls_ptr->lib_vers) eprint->cls.lib_vers = HDstrdup(cls_ptr->lib_vers);
+ /* update to the new class information */
+ if(cls_ptr->cls_name) eprint->cls.cls_name = cls_ptr->cls_name;
+ if(cls_ptr->lib_name) eprint->cls.lib_name = cls_ptr->lib_name;
+ if(cls_ptr->lib_vers) eprint->cls.lib_vers = cls_ptr->lib_vers;
fprintf (stream, "%s-DIAG: Error detected in %s ", cls_ptr->lib_name, cls_ptr->lib_vers);
@@ -2216,7 +1985,7 @@ H5E_walk_cb_new(int n, H5E_error_t_new *err_desc, void *client_data)
/*-------------------------------------------------------------------------
- * Function: H5Eget_auto_new
+ * Function: H5Eget_auto
*
* Purpose: Returns the current settings for the automatic error stack
* traversal function and its data for specific error stack.
@@ -2237,20 +2006,20 @@ H5E_walk_cb_new(int n, H5E_error_t_new *err_desc, void *client_data)
*-------------------------------------------------------------------------
*/
herr_t
-H5Eget_auto_new(hid_t estack_id, H5E_auto_t *func, void **client_data)
+H5Eget_auto(hid_t estack_id, H5E_auto_t *func, void **client_data)
{
herr_t ret_value=SUCCEED; /* Return value */
- H5E_t_new *estack_ptr = NULL;
+ H5E_t *estack_ptr = NULL;
- FUNC_ENTER_API(H5Eget_auto_new, FAIL);
+ FUNC_ENTER_API(H5Eget_auto, FAIL);
H5TRACE3("e","i*x*x",estack_id,func,client_data);
if(estack_id == H5E_DEFAULT)
- estack_ptr = H5E_get_my_stack_new();
+ estack_ptr = H5E_get_my_stack();
else
estack_ptr = H5I_object_verify(estack_id, H5I_ERROR_STACK);
- ret_value = H5E_get_auto_new(estack_ptr, func, client_data);
+ ret_value = H5E_get_auto(estack_ptr, func, client_data);
done:
FUNC_LEAVE_API(ret_value);
@@ -2258,7 +2027,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5E_get_auto_new
+ * Function: H5E_get_auto
*
* Purpose: Private function to return the current settings for the
* automatic error stack traversal function and its data
@@ -2275,11 +2044,11 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5E_get_auto_new(H5E_t_new *estack, H5E_auto_t *func, void **client_data)
+H5E_get_auto(H5E_t *estack, H5E_auto_t *func, void **client_data)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5E_get_auto_new, FAIL);
+ FUNC_ENTER_NOAPI(H5E_get_auto, FAIL);
assert (estack);
@@ -2292,7 +2061,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5Eset_auto_new
+ * Function: H5Eset_auto
*
* Purpose: Turns on or off automatic printing of errors for certain
* error stack. When turned on (non-null FUNC pointer) any
@@ -2318,20 +2087,20 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5Eset_auto_new(hid_t estack_id, H5E_auto_t func, void *client_data)
+H5Eset_auto(hid_t estack_id, H5E_auto_t func, void *client_data)
{
herr_t ret_value=SUCCEED; /* Return value */
- H5E_t_new *estack_ptr = NULL;
+ H5E_t *estack_ptr = NULL;
- FUNC_ENTER_API(H5Eset_auto_new, FAIL);
+ FUNC_ENTER_API(H5Eset_auto, FAIL);
H5TRACE3("e","ixx",estack_id,func,client_data);
if(estack_id == H5E_DEFAULT)
- estack_ptr = H5E_get_my_stack_new();
+ estack_ptr = H5E_get_my_stack();
else
estack_ptr = H5I_object_verify(estack_id, H5I_ERROR_STACK);
- ret_value = H5E_set_auto_new(estack_ptr, func, client_data);
+ ret_value = H5E_set_auto(estack_ptr, func, client_data);
done:
FUNC_LEAVE_API(ret_value);
@@ -2339,7 +2108,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5E_set_auto_new
+ * Function: H5E_set_auto
*
* Purpose: Private function to turn on or off automatic printing of
* errors for certain error stack. When turned on (non-null
@@ -2366,11 +2135,12 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5E_set_auto_new(H5E_t_new *estack, H5E_auto_t func, void *client_data)
+H5E_set_auto(H5E_t *estack, H5E_auto_t func, void *client_data)
{
herr_t ret_value=SUCCEED; /* Return value */
+ H5E_t *tmp;
- FUNC_ENTER_NOAPI(H5E_set_auto_new, FAIL);
+ FUNC_ENTER_NOAPI(H5E_set_auto, FAIL);
assert(estack);
@@ -2380,534 +2150,3 @@ H5E_set_auto_new(H5E_t_new *estack, H5E_auto_t func, void *client_data)
done:
FUNC_LEAVE_NOAPI(ret_value);
}
-
-#endif /* NEW_ERR */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Eset_auto
- *
- * Purpose: Turns on or off automatic printing of errors. When turned on
- * (non-null FUNC pointer) any API function which returns an
- * error indication will first call FUNC passing it CLIENT_DATA
- * as an argument.
- *
- * The default values before this function is called are
- * H5Eprint() with client data being the standard error stream,
- * stderr.
- *
- * Automatic stack traversal is always in the H5E_WALK_DOWNWARD
- * direction.
- *
- * See Also: H5Ewalk()
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Robb Matzke
- * Friday, February 27, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Eset_auto(H5E_auto_t func, void *client_data)
-{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_API(H5Eset_auto, FAIL);
- H5TRACE2("e","xx",func,client_data);
-
- H5E_auto_g = func;
- H5E_auto_data_g = client_data;
-
-done:
- FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Eget_auto
- *
- * Purpose: Returns the current settings for the automatic error stack
- * traversal function and its data. Either (or both) arguments
- * may be null in which case the value is not returned.
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Robb Matzke
- * Saturday, February 28, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Eget_auto(H5E_auto_t *func, void **client_data)
-{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_API(H5Eget_auto, FAIL);
- H5TRACE2("e","*x*x",func,client_data);
-
- if (func) *func = H5E_auto_g;
- if (client_data) *client_data = H5E_auto_data_g;
-
-done:
- FUNC_LEAVE_API(ret_value);
-}
-
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Eclear
- *
- * Purpose: Clears the error stack for the current thread.
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Robb Matzke
- * Friday, February 27, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Eclear(void)
-{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_API(H5Eclear, FAIL);
- H5TRACE0("e","");
- /* FUNC_ENTER() does all the work */
-
-done:
- FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Eprint
- *
- * Purpose: Prints the error stack in some default way. This is just a
- * convenience function for H5Ewalk() with a function that
- * prints error messages. Users are encouraged to write there
- * own more specific error handlers.
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Robb Matzke
- * Friday, February 27, 1998
- *
- * Modifications:
- * Albert Cheng, 2000/12/02
- * Show MPI process rank id if applicable.
- * Albert Cheng, 2001/07/14
- * Show HDF5 library version information string too.
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Eprint(FILE *stream)
-{
- H5E_t *estack = H5E_get_my_stack ();
- herr_t ret_value = FAIL;
-
- /* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Eprint, FAIL);
- /*NO TRACE*/
-
- if (!stream) stream = stderr;
- fprintf (stream, "HDF5-DIAG: Error detected in %s ", H5_lib_vers_info_g);
- /* try show the process or thread id in multiple processes cases*/
-#ifdef H5_HAVE_PARALLEL
- { int mpi_rank, mpi_initialized;
- MPI_Initialized(&mpi_initialized);
- if (mpi_initialized){
- MPI_Comm_rank(MPI_COMM_WORLD,&mpi_rank);
- fprintf (stream, "MPI-process %d.", mpi_rank);
- }else
- fprintf (stream, "thread 0.");
- }
-#elif defined(H5_HAVE_THREADSAFE)
- fprintf (stream, "thread %d.", (int)pthread_self());
-#else
- fprintf (stream, "thread 0.");
-#endif
- if (estack && estack->nused>0) fprintf (stream, " Back trace follows.");
- HDfputc ('\n', stream);
-
- ret_value = H5E_walk (H5E_WALK_DOWNWARD, H5E_walk_cb, (void*)stream);
-
-done:
- FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Ewalk
- *
- * Purpose: Walks the error stack for the current thread and calls some
- * function for each error along the way.
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Robb Matzke
- * Friday, February 27, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Ewalk(H5E_direction_t direction, H5E_walk_t func, void *client_data)
-{
- herr_t ret_value;
-
- /* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Ewalk, FAIL);
- H5TRACE3("e","Edxx",direction,func,client_data);
-
- ret_value = H5E_walk (direction, func, client_data);
-
-done:
- FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5E_walk_cb
- *
- * Purpose: This is a default error stack traversal callback function
- * that prints error messages to the specified output stream.
- * It is not meant to be called directly but rather as an
- * argument to the H5Ewalk() function. This function is called
- * also by H5Eprint(). Application writers are encouraged to
- * use this function as a model for their own error stack
- * walking functions.
- *
- * N is a counter for how many times this function has been
- * called for this particular traversal of the stack. It always
- * begins at zero for the first error on the stack (either the
- * top or bottom error, or even both, depending on the traversal
- * direction and the size of the stack).
- *
- * ERR_DESC is an error description. It contains all the
- * information about a particular error.
- *
- * CLIENT_DATA is the same pointer that was passed as the
- * CLIENT_DATA argument of H5Ewalk(). It is expected to be a
- * file pointer (or stderr if null).
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Robb Matzke
- * Friday, December 12, 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5E_walk_cb(int n, H5E_error_t *err_desc, void *client_data)
-{
- FILE *stream = (FILE *)client_data;
- const char *maj_str = NULL;
- const char *min_str = NULL;
- const int indent = 2;
-
- FUNC_ENTER_NOINIT(H5E_walk_cb);
- /*NO TRACE*/
-
- /* Check arguments */
- assert (err_desc);
- if (!client_data) client_data = stderr;
-
- /* Get descriptions for the major and minor error numbers */
- maj_str = H5Eget_major (err_desc->maj_num);
- min_str = H5Eget_minor (err_desc->min_num);
-
- /* Print error message */
- fprintf (stream, "%*s#%03d: %s line %u in %s(): %s\n",
- indent, "", n, err_desc->file_name, err_desc->line,
- err_desc->func_name, err_desc->desc);
- fprintf (stream, "%*smajor(%02d): %s\n",
- indent*2, "", err_desc->maj_num, maj_str);
- fprintf (stream, "%*sminor(%02d): %s\n",
- indent*2, "", err_desc->min_num, min_str);
-
- FUNC_LEAVE_NOAPI(SUCCEED);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Eget_major
- *
- * Purpose: Given a major error number return a constant character string
- * that describes the error.
- *
- * Return: Success: Ptr to a character string.
- *
- * Failure: Ptr to "Invalid major error number"
- *
- * Programmer: Robb Matzke
- * Friday, February 27, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-const char *
-H5Eget_major (H5E_major_t n)
-{
- unsigned i;
- const char *ret_value="Invalid major error number";
-
- /*
- * WARNING: Do not call the FUNC_ENTER() or FUNC_LEAVE() macros since
- * they might interact badly with the error stack. We are
- * probably calling this function during an error stack
- * traversal and adding/removing entries as the result of an
- * error would most likely mess things up.
- */
- FUNC_ENTER_API_NOINIT(H5Eget_major);
-
- for (i=0; i<NELMTS (H5E_major_mesg_g); i++) {
- if (H5E_major_mesg_g[i].error_code==n)
- HGOTO_DONE(H5E_major_mesg_g[i].str);
- }
-
-done:
- FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Eget_minor
- *
- * Purpose: Given a minor error number return a constant character string
- * that describes the error.
- *
- * Return: Success: Ptr to a character string.
- *
- * Failure: Ptr to "Invalid minor error number"
- *
- * Programmer: Robb Matzke
- * Friday, February 27, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-const char *
-H5Eget_minor (H5E_minor_t n)
-{
- unsigned i;
- const char *ret_value="Invalid minor error number";
-
- /*
- * WARNING: Do not call the FUNC_ENTER() or FUNC_LEAVE() macros since
- * they might interact badly with the error stack. We are
- * probably calling this function during an error stack
- * traversal and adding/removing entries as the result of an
- * error would most likely mess things up.
- */
- FUNC_ENTER_API_NOINIT(H5Eget_minor);
-
- for (i=0; i<NELMTS (H5E_minor_mesg_g); i++) {
- if (H5E_minor_mesg_g[i].error_code==n)
- HGOTO_DONE(H5E_minor_mesg_g[i].str);
- }
-
-done:
- FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5E_push
- *
- * Purpose: Pushes a new error record onto error stack for the current
- * thread. The error has major and minor numbers MAJ_NUM and
- * MIN_NUM, the name of a function where the error was detected,
- * the name of the file where the error was detected, the
- * line within that file, and an error description string. The
- * function name, file name, and error description strings must
- * be statically allocated (the FUNC_ENTER() macro takes care of
- * the function name and file name automatically, but the
- * programmer is responsible for the description string).
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Robb Matzke
- * Friday, December 12, 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5E_push(H5E_major_t maj_num, H5E_minor_t min_num, const char *function_name,
- const char *file_name, unsigned line, const char *desc)
-{
- H5E_t *estack = H5E_get_my_stack ();
-
- /*
- * WARNING: We cannot call HERROR() from within this function or else we
- * could enter infinite recursion. Furthermore, we also cannot
- * call any other HDF5 macro or function which might call
- * HERROR(). HERROR() is called by HRETURN_ERROR() which could
- * be called by FUNC_ENTER().
- */
- FUNC_ENTER_NOINIT(H5E_push);
-
- /*
- * Don't fail if arguments are bad. Instead, substitute some default
- * value.
- */
- if (!function_name) function_name = "Unknown_Function";
- if (!file_name) file_name = "Unknown_File";
- if (!desc) desc = "No description given";
-
- /*
- * Push the error if there's room. Otherwise just forget it.
- */
- assert (estack);
- if (estack->nused<H5E_NSLOTS) {
- estack->slot[estack->nused].maj_num = maj_num;
- estack->slot[estack->nused].min_num = min_num;
- estack->slot[estack->nused].func_name = function_name;
- estack->slot[estack->nused].file_name = file_name;
- estack->slot[estack->nused].line = line;
- estack->slot[estack->nused].desc = desc;
- estack->nused++;
- }
-
- FUNC_LEAVE_NOAPI(SUCCEED);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5Epush
- *
- * Purpose: Pushes a new error record onto error stack for the current
- * thread. The error has major and minor numbers MAJ_NUM and
- * MIN_NUM, the name of a function where the error was detected,
- * the name of the file where the error was detected, the
- * line within that file, and an error description string. The
- * function name, file name, and error description strings must
- * be statically allocated.
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Quincey Koziol
- * Monday, October 18, 1999
- *
- * Notes: Basically a public API wrapper around the H5E_push function.
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Epush(const char *file, const char *func, unsigned line, H5E_major_t maj,
- H5E_minor_t min, const char *str)
-{
- herr_t ret_value;
-
- FUNC_ENTER_API(H5Epush, FAIL);
- H5TRACE6("e","ssIuEjEns",file,func,line,maj,min,str);
-
- ret_value = H5E_push(maj, min, func, file, line, str);
-
-done:
- FUNC_LEAVE_API(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5E_clear
- *
- * Purpose: Clears the error stack for the current thread.
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Robb Matzke
- * Friday, February 27, 1998
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5E_clear(void)
-{
- H5E_t *estack = H5E_get_my_stack ();
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5E_clear, FAIL);
-
- if (estack) estack->nused = 0;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value);
-}
-
-
-/*-------------------------------------------------------------------------
- * Function: H5E_walk
- *
- * Purpose: Walks the error stack, calling the specified function for
- * each error on the stack. The DIRECTION argument determines
- * whether the stack is walked from the inside out or the
- * outside in. The value H5E_WALK_UPWARD means begin with the
- * most specific error and end at the API; H5E_WALK_DOWNWARD
- * means to start at the API and end at the inner-most function
- * where the error was first detected.
- *
- * The function pointed to by FUNC will be called for each error
- * in the error stack. It's arguments will include an index
- * number (beginning at zero regardless of stack traversal
- * direction), an error stack entry, and the CLIENT_DATA pointer
- * passed to H5E_print.
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Robb Matzke
- * Friday, December 12, 1997
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5E_walk (H5E_direction_t direction, H5E_walk_t func, void *client_data)
-{
- H5E_t *estack = H5E_get_my_stack ();
- int i;
- herr_t status;
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5E_walk, FAIL);
-
- /* check args, but rather than failing use some default value */
- if (direction!=H5E_WALK_UPWARD && direction!=H5E_WALK_DOWNWARD) {
- direction = H5E_WALK_UPWARD;
- }
-
- /* walk the stack */
- assert (estack);
- if (func && H5E_WALK_UPWARD==direction) {
- for (i=0, status=SUCCEED; i<estack->nused && status>=0; i++) {
- status = (func)(i, estack->slot+i, client_data);
- }
- } else if (func && H5E_WALK_DOWNWARD==direction) {
- for (i=estack->nused-1, status=SUCCEED; i>=0 && status>=0; --i) {
- status = (func)(estack->nused-(i+1), estack->slot+i, client_data);
- }
- }
-
-done:
- FUNC_LEAVE_NOAPI(ret_value);
-}