[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

5 files changed, 258 insertions, 258 deletions

diff --git a/src/H5Dprivate.h b/src/H5Dprivate.h
index 15fced5..4de95b0 100644
--- a/src/H5Dprivate.h
+++ b/src/H5Dprivate.h
@@ -156,6 +156,7 @@ typedef struct H5D_dcpl_cache_t {
 /******************************/
 /* Library Private Prototypes */
 /******************************/
+
 H5_DLL herr_t H5D_init(void);
 H5_DLL H5D_t *H5D_open(const H5G_loc_t *loc, hid_t dxpl_id);
 H5_DLL herr_t H5D_close(H5D_t *dataset);
diff --git a/src/H5P.c b/src/H5P.c
index ddeafdf..af4a563 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -17,13 +17,19 @@
  * Purpose:	Generic Property Functions
  */
 
+/****************/
+/* Module Setup */
+/****************/
+
 #define H5P_PACKAGE		/*suppress error about including H5Ppkg	  */
 
 /* Interface initialization */
 #define H5_INTERFACE_INIT_FUNC	H5P_init_interface
 
 
-/* Private header files */
+/***********/
+/* Headers */
+/***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Dprivate.h"		/* Datasets				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
@@ -34,10 +40,37 @@
 #include "H5MMprivate.h"	/* Memory management			*/
 #include "H5Ppkg.h"		/* Property lists		  	*/
 
-/* Local macros */
+/****************/
+/* Local Macros */
+/****************/
+
 #define H5P_DEFAULT_SKIPLIST_HEIGHT     8
 
-/* Local variables */
+
+/******************/
+/* Local Typedefs */
+/******************/
+
+/* Typedef for checking for duplicate class names in parent class */
+typedef struct {
+    const H5P_genclass_t *parent;       /* Pointer to parent class */
+    const char *name;                   /* Pointer to name to check */
+} H5P_check_class_t;
+
+
+/********************/
+/* Local Prototypes */
+/********************/
+
+/* General helper routines */
+static herr_t H5P_unregister(H5P_genclass_t *pclass, const char *name);
+static H5P_genprop_t *H5P_dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type);
+static herr_t H5P_free_prop(H5P_genprop_t *prop);
+
+
+/*********************/
+/* Package Variables */
+/*********************/
 
 /*
  * Predefined property list classes. These are initialized at runtime by
@@ -80,10 +113,6 @@ hid_t H5P_LST_OBJECT_COPY_g         = FAIL;
 hid_t H5P_LST_LINK_CREATE_g         = FAIL;
 hid_t H5P_LST_LINK_ACCESS_g         = FAIL;
 
-/* Track the revision count of a class, to make comparisons faster */
-static unsigned H5P_next_rev=0;
-#define H5P_GET_NEXT_REV        (H5P_next_rev++)
-
 /* Root property list class library initialization object */
 const H5P_libclass_t H5P_CLS_ROOT[1] = {{
     "root",			/* Class name for debugging     */
@@ -179,28 +208,67 @@ const H5P_libclass_t H5P_CLS_TACC[1] = {{
     NULL 		        /* Class close callback info    */
 }};
 
-/* Declare a free list to manage the H5P_genprop_t struct */
-H5FL_DEFINE(H5P_genprop_t);
 
-/* Declare a free list to manage the H5P_genplist_t struct */
-H5FL_DEFINE(H5P_genplist_t);
+/* Library property list classes defined in other code modules */
+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_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_DXFR[1];         /* Data transfer */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_FMNT[1];         /* File mount */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_ACRT[1];         /* Attribute creation */
+H5_DLLVAR const H5P_libclass_t H5P_CLS_LCRT[1];         /* Link creation */
+
+
+/*****************************/
+/* Library Private Variables */
+/*****************************/
+
+
+/*******************/
+/* Local Variables */
+/*******************/
+
+/* Track the revision count of a class, to make comparisons faster */
+static unsigned H5P_next_rev=0;
+#define H5P_GET_NEXT_REV        (H5P_next_rev++)
+
+/* List of all property list classes in the library */
+/* (order here is not important, they will be initialized in the proper
+ *      order according to their parent class dependencies)
+ */
+static H5P_libclass_t const * const init_class[] = {
+    H5P_CLS_ROOT,       /* Root */
+    H5P_CLS_OCRT,       /* Object create */
+    H5P_CLS_STRCRT,     /* String create */
+    H5P_CLS_LACC,       /* Link access */
+    H5P_CLS_GCRT,       /* Group create */
+    H5P_CLS_OCPY,       /* Object copy */
+    H5P_CLS_GACC,       /* Group access */
+    H5P_CLS_FCRT,       /* File creation */
+    H5P_CLS_FACC,       /* File access */
+    H5P_CLS_DCRT,       /* Dataset creation */
+    H5P_CLS_DACC,       /* Dataset access */
+    H5P_CLS_DXFR,       /* Data transfer */
+    H5P_CLS_FMNT,       /* File mount */
+    H5P_CLS_TCRT,       /* Datatype creation */
+    H5P_CLS_TACC,       /* Datatype access */
+    H5P_CLS_ACRT,       /* Attribute creation */
+    H5P_CLS_LCRT        /* Link creation */
+};
 
 /* Declare a free list to manage the H5P_genclass_t struct */
 H5FL_DEFINE_STATIC(H5P_genclass_t);
 
-/* Local typedefs */
+/* Declare a free list to manage the H5P_genprop_t struct */
+H5FL_DEFINE_STATIC(H5P_genprop_t);
 
-/* Typedef for checking for duplicate class names in parent class */
-typedef struct {
-    const H5P_genclass_t *parent;       /* Pointer to parent class */
-    const char *name;                   /* Pointer to name to check */
-} H5P_check_class_t;
+/* Declare a free list to manage the H5P_genplist_t struct */
+H5FL_DEFINE_STATIC(H5P_genplist_t);
 
-/* Local static functions */
-static herr_t H5P_init_class(const H5P_libclass_t *lib_class);
-static herr_t H5P_unregister(H5P_genclass_t *pclass, const char *name);
-static H5P_genprop_t *H5P_dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type);
-static herr_t H5P_free_prop(H5P_genprop_t *prop);
 
 
 /*--------------------------------------------------------------------------
@@ -301,63 +369,6 @@ done:
 } /* end H5P_init() */
 
 
-/*-------------------------------------------------------------------------
- * Function:    H5P_init_class
- *
- * Purpose:     Initialize a library class
- *
- * Return:      Pointer to class created on success/NULL on failure
- *
- * Programmer:  Quincey Koziol
- *              October 31, 2006
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5P_init_class(const H5P_libclass_t *lib_class)
-{
-    H5P_genclass_t *par_class = NULL;   /* Parent class of new class */
-    H5P_genclass_t *new_class;          /* New property list class created */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5P_init_class)
-
-    /* Sanity checks */
-    HDassert(lib_class);
-    HDassert(lib_class->par_class_id || lib_class == H5P_CLS_ROOT);
-    HDassert(lib_class->class_id);
-    HDassert(*lib_class->class_id == (-1));
-
-    /* Check for parent class */
-    if(lib_class->par_class_id) {
-        /* Get the pointer to the parent class */
-        if(NULL == (par_class = H5I_object(*lib_class->par_class_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list class")
-    } /* end if */
-
-    /* Allocate the object create class */
-    if(NULL == (new_class = H5P_create_class(par_class, lib_class->name, 1, lib_class->create_func, lib_class->create_data, lib_class->copy_func, lib_class->copy_data, lib_class->close_func, lib_class->close_data)))
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
-
-    /* Call routine to register properties for class */
-    if(lib_class->reg_prop_func && (*lib_class->reg_prop_func)(new_class) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't register properties")
-
-    /* Register the object create class */
-    if((*lib_class->class_id = H5I_register(H5I_GENPROP_CLS, new_class)) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't register property list class")
-
-    /* Only register the default property list if it hasn't been created yet */
-    if(lib_class->def_plist_id && *lib_class->def_plist_id == (-1)) {
-        /* Register the default property list for the new class*/
-        if((*lib_class->def_plist_id = H5P_create_id(new_class)) < 0)
-             HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't register default property list for class")
-    } /* end if */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5P_init_class() */
-
-
 /*--------------------------------------------------------------------------
 NAME
    H5P_init_interface -- Initialize interface-specific information
@@ -371,7 +382,9 @@ DESCRIPTION
 static herr_t
 H5P_init_interface(void)
 {
-    herr_t      ret_value = SUCCEED;
+    size_t tot_init;                    /* Total # of classes initialized */
+    size_t pass_init;                   /* # of classes initialized in each pass */
+    herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5P_init_interface)
 
@@ -383,99 +396,66 @@ H5P_init_interface(void)
     if(H5I_register_type(H5I_GENPROP_LST, (size_t)H5I_GENPROPOBJ_HASHSIZE, 0, (H5I_free_t)H5P_close) < 0)
         HGOTO_ERROR(H5E_ATOM, H5E_CANTINIT, FAIL, "unable to initialize ID group")
 
-    /* Create root property list class
-     * 
-     * All other property list classes ultimately inherit from this class.
-     */
-    if(H5P_init_class(H5P_CLS_ROOT) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
-
-    /*
-     * Initialize property list classes for library.
-     */
-
-    /* Create object create property class
-     *
-     * Classes that create objects should inherit from this class
-     * For example: group, dataset and named datatype creation classes...
-     */
-    if(H5P_init_class(H5P_CLS_OCRT) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
-
-    /* Create string creation property class
-     *
-     * Classes that contain strings should inherit from this class 
-     * For example, links and attributes have names associated with them.
-     */
-    if(H5P_init_class(H5P_CLS_STRCRT) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
-
-    /* Create link access property classes (which need to be inherited by later classes */
-    /* Create string creation property class
-     *
-     * Classes that access objects in the file should inherit from this class 
-     * For example: group, dataset and named datatype access classes...
+    /* Repeatedly pass over the list of property list classes for the library,
+     *  initializing each class if it's parent class is initialized, until no
+     *  more progress is made.
      */
-    if(H5P_init_class(H5P_CLS_LACC) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
-
-    /* Create group creation property class
-     *
-     * (Register the group property classes before file property classes, so
-     *  file creation property class can inherit from group creation property
-     *  class, which is used to allow application to control the group creation
-     *  properties of the root group of a file. -QAK)
-     */
-    if(H5P_init_class(H5P_CLS_GCRT) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
-
-    /* Create object copy property class */
-    if(H5P_init_class(H5P_CLS_OCPY) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
-
-    /* Create group access property class */
-    if(H5P_init_class(H5P_CLS_GACC) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
-
-    /* Create file creation property class */
-    if(H5P_init_class(H5P_CLS_FCRT) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
-
-    /* Create file access property class */
-    if(H5P_init_class(H5P_CLS_FACC) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
-
-    /* Create dataset creation property class */
-    if(H5P_init_class(H5P_CLS_DCRT) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
-
-    /* Create dataset access property class */
-    if(H5P_init_class(H5P_CLS_DACC) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
+    tot_init = 0;
+    do {
+        size_t u;                           /* Local index variable */
+
+        /* Reset pass initialization counter */
+        pass_init = 0;
+
+        /* Make a pass over all the library's property list classes */
+        for(u = 0; u < NELMTS(init_class); u++) {
+            H5P_libclass_t const *lib_class = init_class[u]; /* Current class to operate on */
+
+            /* Check if the current class hasn't been initialized and can be now */
+            HDassert(lib_class->class_id);
+            if(*lib_class->class_id == (-1) && (lib_class->par_class_id == NULL
+                        || *lib_class->par_class_id > 0)) {
+                H5P_genclass_t *par_pclass = NULL;   /* Parent class of new class */
+                H5P_genclass_t *new_pclass;          /* New property list class created */
+
+                /* Sanity check - only the root class is not allowed to have a parent class */
+                HDassert(lib_class->par_class_id || lib_class == H5P_CLS_ROOT);
+
+                /* Check for parent class */
+                if(lib_class->par_class_id) {
+                    /* Get the pointer to the parent class */
+                    if(NULL == (par_pclass = H5I_object(*lib_class->par_class_id)))
+                        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list class")
+                } /* end if */
 
-    /* Create data transfer property class */
-    if(H5P_init_class(H5P_CLS_DXFR) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
+                /* Allocate the new class */
+                if(NULL == (new_pclass = H5P_create_class(par_pclass, lib_class->name, 1, lib_class->create_func, lib_class->create_data, lib_class->copy_func, lib_class->copy_data, lib_class->close_func, lib_class->close_data)))
+                    HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
 
-    /* Create file mount property class */
-    if(H5P_init_class(H5P_CLS_FMNT) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
+                /* Call routine to register properties for class */
+                if(lib_class->reg_prop_func && (*lib_class->reg_prop_func)(new_pclass) < 0)
+                    HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't register properties")
 
-    /* Create datatype creation property class */
-    if(H5P_init_class(H5P_CLS_TCRT) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
+                /* Register the new class */
+                if((*lib_class->class_id = H5I_register(H5I_GENPROP_CLS, new_pclass)) < 0)
+                    HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't register property list class")
 
-    /* Create datatype access property class */
-    if(H5P_init_class(H5P_CLS_TACC) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
+                /* Only register the default property list if it hasn't been created yet */
+                if(lib_class->def_plist_id && *lib_class->def_plist_id == (-1)) {
+                    /* Register the default property list for the new class*/
+                    if((*lib_class->def_plist_id = H5P_create_id(new_pclass)) < 0)
+                         HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't register default property list for class")
+                } /* end if */
 
-    /* Create attribute creation property class */
-    if(H5P_init_class(H5P_CLS_ACRT) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
+                /* Increment class initialization counters */
+                pass_init++;
+                tot_init++;
+            } /* end if */
+        } /* end for */
+    } while(pass_init > 0);
 
-    /* Create link creation property class */
-    if(H5P_init_class(H5P_CLS_LCRT) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "class initialization failed")
+    /* Verify that all classes were initialized */
+    HDassert(tot_init == NELMTS(init_class));
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
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);
diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h
index 5209893..3d39251 100644
--- a/src/H5Pprivate.h
+++ b/src/H5Pprivate.h
@@ -25,16 +25,35 @@
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Oprivate.h"		/* Object headers		  	*/
 
+/**************************/
+/* Library Private Macros */
+/**************************/
+
 /* String creation properties */
 #define H5P_CHAR_ENCODING_NAME  "character_encoding"
 #define H5P_CHAR_ENCODING_SIZE  sizeof(H5T_cset_t)
 #define H5P_CHAR_ENCODING_DEF   H5F_DEFAULT_CSET
 
+
+/****************************/
+/* Library Private Typedefs */
+/****************************/
+
 /* Forward declarations for anonymous H5P objects */
 typedef struct H5P_genplist_t H5P_genplist_t;
 typedef struct H5P_genclass_t H5P_genclass_t;
 
-/* Private functions, not part of the publicly documented API */
+
+/*****************************/
+/* Library Private Variables */
+/*****************************/
+
+
+/******************************/
+/* Library Private Prototypes */
+/******************************/
+
+/* Package initialization routine */
 H5_DLL herr_t H5P_init(void);
 
 /* Internal versions of API routines */
@@ -76,4 +95,5 @@ H5_DLL hid_t H5P_peek_hid_t(H5P_genplist_t *plist, const char *name);
 H5_DLL void *H5P_peek_voidp(H5P_genplist_t *plist, const char *name);
 H5_DLL size_t H5P_peek_size_t(H5P_genplist_t *plist, const char *name);
 
-#endif
+#endif /* _H5Pprivate_H */
+
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index c19a1f9..999f509 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -19,8 +19,7 @@
 #ifndef _H5Ppublic_H
 #define _H5Ppublic_H
 
-/* Default Template for creation, access, etc. templates */
-#define H5P_DEFAULT     0
+/* System headers needed by this file */
 
 /* Public headers needed by this file */
 #include "H5public.h"
@@ -33,46 +32,12 @@
 #include "H5Tpublic.h"
 #include "H5Zpublic.h"
 
-/* Metroworks <sys/types.h> doesn't define off_t. */
-#ifdef __MWERKS__
-typedef long off_t;
-/* Metroworks does not define EINTR in <errno.h> */
-# define EINTR 4
-#endif
-/*__MWERKS__*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Define property list class callback function pointer types */
-typedef herr_t (*H5P_cls_create_func_t)(hid_t prop_id, void *create_data);
-typedef herr_t (*H5P_cls_copy_func_t)(hid_t new_prop_id, hid_t old_prop_id,
-                                      void *copy_data);
-typedef herr_t (*H5P_cls_close_func_t)(hid_t prop_id, void *close_data);
-
-/* Define property list callback function pointer types */
-typedef herr_t (*H5P_prp_cb1_t)(const char *name, size_t size, void *value);
-typedef herr_t (*H5P_prp_cb2_t)(hid_t prop_id, const char *name, size_t size, void *value);
-typedef H5P_prp_cb1_t H5P_prp_create_func_t;
-typedef H5P_prp_cb2_t H5P_prp_set_func_t;
-typedef H5P_prp_cb2_t H5P_prp_get_func_t;
-typedef H5P_prp_cb2_t H5P_prp_delete_func_t;
-typedef H5P_prp_cb1_t H5P_prp_copy_func_t;
-typedef int (*H5P_prp_compare_func_t)(const void *value1, const void *value2, size_t size);
-typedef H5P_prp_cb1_t H5P_prp_close_func_t;
-
-/* Define property list iteration function type */
-typedef herr_t (*H5P_iterate_t)(hid_t id, const char *name, void *iter_data);
 
-/*
- * The library created property list classes
- *
- * NOTE: When adding H5P_* macros, remember to redefine them in H5Pprivate.h
- *
- */
+/*****************/
+/* Public Macros */
+/*****************/
 
-/* When this header is included from a private header, don't make calls to H5open() */
+/* When this header is included from a private HDF5 header, don't make calls to H5open() */
 #undef H5OPEN
 #ifndef _H5private_H
 #define H5OPEN        H5open(),
@@ -80,6 +45,13 @@ typedef herr_t (*H5P_iterate_t)(hid_t id, const char *name, void *iter_data);
 #define H5OPEN
 #endif  /* _H5private_H */
 
+/* Default value for all property list classes */
+#define H5P_DEFAULT     0
+
+/*
+ * The library's property list classes
+ */
+
 #define H5P_ROOT		   	(H5OPEN H5P_CLS_ROOT_g)
 #define H5P_OBJECT_CREATE 		(H5OPEN H5P_CLS_OBJECT_CREATE_g)
 #define H5P_FILE_CREATE 		(H5OPEN H5P_CLS_FILE_CREATE_g)
@@ -97,6 +69,60 @@ typedef herr_t (*H5P_iterate_t)(hid_t id, const char *name, void *iter_data);
 #define H5P_OBJECT_COPY	 		(H5OPEN H5P_CLS_OBJECT_COPY_g)
 #define H5P_LINK_CREATE 		(H5OPEN H5P_CLS_LINK_CREATE_g)
 #define H5P_LINK_ACCESS 		(H5OPEN H5P_CLS_LINK_ACCESS_g)
+
+/*
+ * The library's default property lists
+ */
+#define H5P_FILE_CREATE_DEFAULT		(H5OPEN H5P_LST_FILE_CREATE_g)
+#define H5P_FILE_ACCESS_DEFAULT 	(H5OPEN H5P_LST_FILE_ACCESS_g)
+#define H5P_DATASET_CREATE_DEFAULT  	(H5OPEN H5P_LST_DATASET_CREATE_g)
+#define H5P_DATASET_ACCESS_DEFAULT  	(H5OPEN H5P_LST_DATASET_ACCESS_g)
+#define H5P_DATASET_XFER_DEFAULT   	(H5OPEN H5P_LST_DATASET_XFER_g)
+#define H5P_FILE_MOUNT_DEFAULT       	(H5OPEN H5P_LST_FILE_MOUNT_g)
+#define H5P_GROUP_CREATE_DEFAULT	(H5OPEN H5P_LST_GROUP_CREATE_g)
+#define H5P_GROUP_ACCESS_DEFAULT 	(H5OPEN H5P_LST_GROUP_ACCESS_g)
+#define H5P_DATATYPE_CREATE_DEFAULT	(H5OPEN H5P_LST_DATATYPE_CREATE_g)
+#define H5P_DATATYPE_ACCESS_DEFAULT 	(H5OPEN H5P_LST_DATATYPE_ACCESS_g)
+#define H5P_ATTRIBUTE_CREATE_DEFAULT	(H5OPEN H5P_LST_ATTRIBUTE_CREATE_g)
+#define H5P_OBJECT_COPY_DEFAULT		(H5OPEN H5P_LST_OBJECT_COPY_g)
+#define H5P_LINK_CREATE_DEFAULT		(H5OPEN H5P_LST_LINK_CREATE_g)
+#define H5P_LINK_ACCESS_DEFAULT		(H5OPEN H5P_LST_LINK_ACCESS_g)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*******************/
+/* Public Typedefs */
+/*******************/
+
+
+/* Define property list class callback function pointer types */
+typedef herr_t (*H5P_cls_create_func_t)(hid_t prop_id, void *create_data);
+typedef herr_t (*H5P_cls_copy_func_t)(hid_t new_prop_id, hid_t old_prop_id,
+                                      void *copy_data);
+typedef herr_t (*H5P_cls_close_func_t)(hid_t prop_id, void *close_data);
+
+/* Define property list callback function pointer types */
+typedef herr_t (*H5P_prp_cb1_t)(const char *name, size_t size, void *value);
+typedef herr_t (*H5P_prp_cb2_t)(hid_t prop_id, const char *name, size_t size, void *value);
+typedef H5P_prp_cb1_t H5P_prp_create_func_t;
+typedef H5P_prp_cb2_t H5P_prp_set_func_t;
+typedef H5P_prp_cb2_t H5P_prp_get_func_t;
+typedef H5P_prp_cb2_t H5P_prp_delete_func_t;
+typedef H5P_prp_cb1_t H5P_prp_copy_func_t;
+typedef int (*H5P_prp_compare_func_t)(const void *value1, const void *value2, size_t size);
+typedef H5P_prp_cb1_t H5P_prp_close_func_t;
+
+/* Define property list iteration function type */
+typedef herr_t (*H5P_iterate_t)(hid_t id, const char *name, void *iter_data);
+
+/********************/
+/* Public Variables */
+/********************/
+
+/* Property list class IDs */
+/* (Internal to library, do not use!  Use macros above) */
 H5_DLLVAR hid_t H5P_CLS_ROOT_g;
 H5_DLLVAR hid_t H5P_CLS_OBJECT_CREATE_g;
 H5_DLLVAR hid_t H5P_CLS_FILE_CREATE_g;
@@ -115,25 +141,8 @@ H5_DLLVAR hid_t H5P_CLS_OBJECT_COPY_g;
 H5_DLLVAR hid_t H5P_CLS_LINK_CREATE_g;
 H5_DLLVAR hid_t H5P_CLS_LINK_ACCESS_g;
 
-/*
- * The library created default property lists
- *
- */
-#define H5P_OBJ_CLASS_DEFAULT  		(H5OPEN H5P_LST_OBJ_CLASS_g)
-#define H5P_FILE_CREATE_DEFAULT		(H5OPEN H5P_LST_FILE_CREATE_g)
-#define H5P_FILE_ACCESS_DEFAULT 	(H5OPEN H5P_LST_FILE_ACCESS_g)
-#define H5P_DATASET_CREATE_DEFAULT  	(H5OPEN H5P_LST_DATASET_CREATE_g)
-#define H5P_DATASET_ACCESS_DEFAULT  	(H5OPEN H5P_LST_DATASET_ACCESS_g)
-#define H5P_DATASET_XFER_DEFAULT   	(H5OPEN H5P_LST_DATASET_XFER_g)
-#define H5P_FILE_MOUNT_DEFAULT       	(H5OPEN H5P_LST_FILE_MOUNT_g)
-#define H5P_GROUP_CREATE_DEFAULT	(H5OPEN H5P_LST_GROUP_CREATE_g)
-#define H5P_GROUP_ACCESS_DEFAULT 	(H5OPEN H5P_LST_GROUP_ACCESS_g)
-#define H5P_DATATYPE_CREATE_DEFAULT	(H5OPEN H5P_LST_DATATYPE_CREATE_g)
-#define H5P_DATATYPE_ACCESS_DEFAULT 	(H5OPEN H5P_LST_DATATYPE_ACCESS_g)
-#define H5P_ATTRIBUTE_CREATE_DEFAULT	(H5OPEN H5P_LST_ATTRIBUTE_CREATE_g)
-#define H5P_OBJECT_COPY_DEFAULT		(H5OPEN H5P_LST_OBJECT_COPY_g)
-#define H5P_LINK_CREATE_DEFAULT		(H5OPEN H5P_LST_LINK_CREATE_g)
-#define H5P_LINK_ACCESS_DEFAULT		(H5OPEN H5P_LST_LINK_ACCESS_g)
+/* Default roperty list IDs */
+/* (Internal to library, do not use!  Use macros above) */
 H5_DLLVAR hid_t H5P_LST_FILE_CREATE_g;
 H5_DLLVAR hid_t H5P_LST_FILE_ACCESS_g;
 H5_DLLVAR hid_t H5P_LST_DATASET_CREATE_g;
@@ -149,7 +158,10 @@ H5_DLLVAR hid_t H5P_LST_OBJECT_COPY_g;
 H5_DLLVAR hid_t H5P_LST_LINK_CREATE_g;
 H5_DLLVAR hid_t H5P_LST_LINK_ACCESS_g;
 
-/* Public functions */
+/*********************/
+/* Public Prototypes */
+/*********************/
+
 H5_DLL hid_t H5Pcreate_class(hid_t parent, const char *name,
             H5P_cls_create_func_t cls_create, void *create_data,
             H5P_cls_copy_func_t cls_copy, void *copy_data,