summaryrefslogtreecommitdiffstats
path: root/src/H5Ppkg.h
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-11-02 18:10:31 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-11-02 18:10:31 (GMT)
commitd90d6ffdce1f1e3426c6b7f5dc83809e09749079 (patch)
treeafb116691267c7650502bbabcb6a2e38049762f9 /src/H5Ppkg.h
parent05c0302e35cab573368cb889686d765baa5722ef (diff)
downloadhdf5-d90d6ffdce1f1e3426c6b7f5dc83809e09749079.zip
hdf5-d90d6ffdce1f1e3426c6b7f5dc83809e09749079.tar.gz
hdf5-d90d6ffdce1f1e3426c6b7f5dc83809e09749079.tar.bz2
[svn-r12845] Description:
Finish refactoring job on the library's property list class initialization code, so that the library determines the parent class dependencies at run-time, eliminating the need for developers to initialize the classes in a particular order. Also eliminates some more redundant code... Tested on: FreeBSD/32 4.11 (sleipnir) w/threadsafe & debugging turned on Linux/32 2.4 (heping) w/FORTRAN & C++ Linux/64 2.4 (mir) w/build-all & 1.6 compat enabled AIX/32 5.x (copper) w/FORTRAN & parallel
Diffstat (limited to 'src/H5Ppkg.h')
-rw-r--r--src/H5Ppkg.h47
1 files changed, 17 insertions, 30 deletions
diff --git a/src/H5Ppkg.h b/src/H5Ppkg.h
index 2ed9063..39c8cf3 100644
--- a/src/H5Ppkg.h
+++ b/src/H5Ppkg.h
@@ -27,19 +27,21 @@
#ifndef _H5Ppkg_H
#define _H5Ppkg_H
-/*
- * Define this to enable debugging.
- */
-#ifdef NDEBUG
-# undef H5P_DEBUG
-#endif
-
/* Get package's private header */
#include "H5Pprivate.h"
/* Other private headers needed by this file */
#include "H5SLprivate.h" /* Skip lists */
+/**************************/
+/* Package Private Macros */
+/**************************/
+
+
+/****************************/
+/* Package Private Typedefs */
+/****************************/
+
/* Define enum for type of object that property is within */
typedef enum {
H5P_PROP_WITHIN_UNKNOWN=0, /* Property container is unknown */
@@ -135,27 +137,15 @@ typedef struct H5P_libclass_t {
void *close_data; /* Pointer to user data to pass along to close callback */
} H5P_libclass_t;
-/*
- * Library property list classes.
- */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_ROOT[1]; /* Root */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_OCRT[1]; /* Object create */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_STRCRT[1]; /* String create */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_LACC[1]; /* Link access */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_GCRT[1]; /* Group create */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_OCPY[1]; /* Object copy */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_GACC[1]; /* Group access */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_FCRT[1]; /* File creation */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_FACC[1]; /* File access */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_DCRT[1]; /* Dataset creation */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_DACC[1]; /* Dataset access */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_DXFR[1]; /* Data transfer */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_FMNT[1]; /* File mount */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_TCRT[1]; /* Datatype creation */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_TACC[1]; /* Datatype access */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_ACRT[1]; /* Attribute creation */
-H5_DLLVAR const H5P_libclass_t H5P_CLS_LCRT[1]; /* Link creation */
+/*****************************/
+/* Package Private Variables */
+/*****************************/
+
+
+/******************************/
+/* Package Private Prototypes */
+/******************************/
/* Private functions, not part of the publicly documented API */
H5_DLL H5P_genclass_t *H5P_create_class(H5P_genclass_t *par_class,
@@ -170,9 +160,6 @@ H5_DLL H5P_genclass_t *H5P_open_class_path(const char *path);
H5_DLL int H5P_tbbt_strcmp(const void *k1, const void *k2, int cmparg);
H5_DLL herr_t H5P_close_class(void *_pclass);
-/* Class initialization routines */
-H5_DLL herr_t H5P_ocpy_init(H5P_genclass_t *pclass);
-
/* Testing functions */
#ifdef H5P_TESTING
H5_DLL char *H5P_get_class_path_test(hid_t pclass_id);