Merge pull request #730 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:hdf5_1_10 to hdf5_1_10

* commit '2074cbd516d3dcc6aa6a3f8aa2978017baf8c5cc': (397 commits)
  fixed merge with develop issues
  HDFFV-10037: fixed wrong C link flags
  Correct typo
  fix typo
  Fix typos
  HDFFV-10297 Free buffer inside loop
  HDFFV-10297 Cleanup, Initialize variables
  Moved the SWMR + cache image check up before the root group is constructed to avoid the special case close.
  HDFFV-10297 Windows issues fixed
  Windows cannot share files easily
  Moved the 'cache image + SWMR' check from H5Fcreate/open to H5F_open. Prep for the VOL merge.
  Avoid double free
  Windows had issues - revert code changes for get_option
  Remove extra command line
  Correct name of file
  Add Mask test to script
  Add new output files to clear test
  Correct name of err file
  Fix name of output files
  Fix format convert error mask test
  ...

1 files changed, 197 insertions, 791 deletions

diff --git a/src/H5PL.c b/src/H5PL.c
index 65d6c91..bd02bf3 100644
--- a/src/H5PL.c
+++ b/src/H5PL.c
@@ -22,135 +22,28 @@
 /***********/
 #include "H5private.h"      /* Generic Functions            */
 #include "H5Eprivate.h"     /* Error handling               */
-#include "H5MMprivate.h"    /* Memory management            */
 #include "H5PLpkg.h"        /* Plugin                       */
-#include "H5Zprivate.h"     /* Filter pipeline              */
 
 
 /****************/
 /* Local Macros */
 /****************/
-#ifdef H5_HAVE_WIN32_API
-#define H5PL_EXPAND_ENV_VAR {                                                            \
-        long bufCharCount;                                                               \
-        char *tempbuf;                                                                   \
-        if(NULL == (tempbuf = (char *)H5MM_malloc(H5PL_EXPAND_BUFFER_SIZE)))             \
-            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for expanded path")                          \
-        if((bufCharCount = ExpandEnvironmentStringsA(dl_path, tempbuf, H5PL_EXPAND_BUFFER_SIZE)) > H5PL_EXPAND_BUFFER_SIZE) { \
-            tempbuf = (char *)H5MM_xfree(tempbuf);                                       \
-            HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "expanded path is too long")      \
-        }                                                                                \
-        if(bufCharCount == 0) {                                                          \
-            tempbuf = (char *)H5MM_xfree(tempbuf);                                       \
-            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "failed to expand path")          \
-        }                                                                                \
-        dl_path = (char *)H5MM_xfree(dl_path);                                           \
-        dl_path = tempbuf;                                                               \
- }
-#else
-#define H5PL_EXPAND_ENV_VAR
-#endif /* H5_HAVE_WIN32_API */
-
-/****************************/
-/* Macros for supporting
- * both Windows and Unix */
-/****************************/
-/* Windows support
- *
- * SPECIAL WINDOWS NOTE
- *
- * Some of the Win32 API functions expand to fooA or fooW depending on
- * whether UNICODE or _UNICODE are defined. You MUST explicitly use
- * the A version of the functions to force char * behavior until we
- * work out a scheme for proper Windows Unicode support.
- *
- * If you do not do this, people will be unable to incorporate our
- * source code into their own CMake builds if they define UNICODE.
- */
-#ifdef H5_HAVE_WIN32_API
-
-#define H5PL_PATH_SEPARATOR     ";"
-
-/* Handle for dynamic library */
-#define H5PL_HANDLE HINSTANCE
-
-/* Get a handle to a plugin library.  Windows: TEXT macro handles Unicode strings */
-#define H5PL_OPEN_DLIB(S) LoadLibraryExA(S, NULL, LOAD_WITH_ALTERED_SEARCH_PATH)
-
-/* Get the address of a symbol in dynamic library */
-#define H5PL_GET_LIB_FUNC(H,N) GetProcAddress(H,N)
-
-/* Close dynamic library */
-#define H5PL_CLOSE_LIB(H) FreeLibrary(H)
-
-/* Clear error - nothing to do */
-#define H5PL_CLR_ERROR
-
-/* maximum size for expanding env vars */
-#define H5PL_EXPAND_BUFFER_SIZE 32767
-
-typedef const void *(__cdecl *H5PL_get_plugin_info_t)(void);
-
-/* Unix support */
-#else /* H5_HAVE_WIN32_API */
-
-#define H5PL_PATH_SEPARATOR     ":"
-
-/* Handle for dynamic library */
-#define H5PL_HANDLE void *
-
-/* Get a handle to a plugin library.  Windows: TEXT macro handles Unicode strings */
-#define H5PL_OPEN_DLIB(S) dlopen(S, RTLD_LAZY)
-
-/* Get the address of a symbol in dynamic library */
-#define H5PL_GET_LIB_FUNC(H,N) dlsym(H,N)
-
-/* Close dynamic library */
-#define H5PL_CLOSE_LIB(H) dlclose(H)
-
-/* Clear error */
-#define H5PL_CLR_ERROR HERROR(H5E_PLUGIN, H5E_CANTGET, "can't dlopen:%s", dlerror())
-
-typedef const void *(*H5PL_get_plugin_info_t)(void);
-#endif /* H5_HAVE_WIN32_API */
-
-/* Whether to preload pathnames for plugin libraries */
-#define H5PL_DEFAULT_PATH       H5_DEFAULT_PLUGINDIR
-
-/* Special symbol to indicate no plugin loading */
-#define H5PL_NO_PLUGIN          "::"
 
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-/* Type for the list of info for opened plugin libraries */
-typedef struct H5PL_table_t {
-    H5PL_type_t pl_type;            /* plugin type          */
-    int         pl_id;              /* ID for the plugin    */
-    H5PL_HANDLE handle;             /* plugin handle        */
-} H5PL_table_t;
-
 
 /********************/
 /* Local Prototypes */
 /********************/
 
-static herr_t H5PL__init_path_table(void);
-static htri_t H5PL__find(H5PL_type_t plugin_type, int type_id, char *dir, const void **info);
-static htri_t H5PL__open(H5PL_type_t pl_type, char *libname, int plugin_id, const void **pl_info);
-static htri_t H5PL__search_table(H5PL_type_t plugin_type, int type_id, const void **info);
-static herr_t H5PL__close(H5PL_HANDLE handle);
-
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-/* Package initialization variable */
-hbool_t H5_PKG_INIT_VAR = FALSE;
-
 
 /*****************************/
 /* Library Private Variables */
@@ -161,145 +54,42 @@ hbool_t H5_PKG_INIT_VAR = FALSE;
 /* Local Variables */
 /*******************/
 
-/* Table for opened plugin libraries */
-static size_t           H5PL_table_alloc_g = 0;
-static size_t           H5PL_table_used_g = 0;
-static H5PL_table_t     *H5PL_table_g = NULL;
-
-/* Table of location paths for plugin libraries */
-static char             *H5PL_path_table_g[H5PL_MAX_PATH_NUM];
-static size_t           H5PL_num_paths_g = 0;
-static hbool_t          H5PL_path_found_g = FALSE;
-
-/* Enable all plugin libraries */
-static unsigned int     H5PL_plugin_g = H5PL_ALL_PLUGIN;
-
-
-
-/*--------------------------------------------------------------------------
-NAME
-   H5PL__init_package -- Initialize interface-specific information
-USAGE
-    herr_t H5PL__init_package()
-RETURNS
-    Non-negative on success/Negative on failure
-DESCRIPTION
-    Initializes any interface-specific data or routines.
-
---------------------------------------------------------------------------*/
-herr_t
-H5PL__init_package(void)
-{
-    char        *preload_path;
-
-    FUNC_ENTER_PACKAGE_NOERR
-
-    /* Retrieve pathnames from HDF5_PLUGIN_PRELOAD if the user sets it
-     * to tell the library to load plugin libraries without search.
-     */
-    if(NULL != (preload_path = HDgetenv("HDF5_PLUGIN_PRELOAD")))
-        /* Special symbol "::" means no plugin during data reading. */
-        if(!HDstrcmp(preload_path, H5PL_NO_PLUGIN))
-            H5PL_plugin_g = 0;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5PL__init_package() */
-
 
 /*-------------------------------------------------------------------------
- * Function:    H5PL_term_package
+ * Function:    H5PLset_loading_state
  *
- * Purpose:     Terminate the H5PL interface: release all memory, reset all
- *              global variables to initial values. This only happens if all
- *              types have been destroyed from other interfaces.
- *
- * Return:      Success:    Positive if any action was taken that might
- *                          affect some other interface; zero otherwise.
- *              Failure:    Negative.
- *
- * Programmer:  Raymond Lu
- *              20 February 2013
- *
- *-------------------------------------------------------------------------
- */
-int
-H5PL_term_package(void)
-{
-    int  n = 0;
-
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-    if(H5_PKG_INIT_VAR) {
-        size_t u;       /* Local index variable */
-
-        /* Close opened dynamic libraries */
-        if(H5PL_table_g) {
-            for(u = 0; u < H5PL_table_used_g; u++)
-                H5PL__close((H5PL_table_g[u]).handle);
-
-            /* Free the table of dynamic libraries */
-            H5PL_table_g = (H5PL_table_t *)H5MM_xfree(H5PL_table_g);
-            H5PL_table_used_g = H5PL_table_alloc_g = 0;
-
-            n++;
-        } /* end if */
-
-        /* Free the table of search paths */
-        if(H5PL_num_paths_g > 0) {
-            for(u = 0; u < H5PL_num_paths_g; u++)
-                if(H5PL_path_table_g[u])
-                    H5PL_path_table_g[u] = (char *)H5MM_xfree(H5PL_path_table_g[u]);
-            H5PL_num_paths_g = 0;
-            H5PL_path_found_g = FALSE;
-
-            n++;
-        } /* end if */
-
-        /* Mark the interface as uninitialized */
-        if(0 == n)
-            H5_PKG_INIT_VAR = FALSE;
-    } /* end if */
-
-    FUNC_LEAVE_NOAPI(n)
-} /* end H5PL_term_package() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5PLset_loading_state
+ * Purpose:     Control the loading of dynamic plugin types.
  *
- * Purpose: Control the loading of dynamic plugin types.
+ *              The plugin_control_mask parameter is a bitfield that controls
+ *              whether certain classes of plugins (e.g.: filters,
+ *              VOL drivers) will be loaded by the library.
  *
- * This function will not allow plugin types if the pathname from the HDF5_PLUGIN_PRELOAD
- * environment variable is set to the special "::" string.
+ *              plugin bit = 0, will prevent the use of that dynamic plugin type.
+ *              plugin bit = 1, will allow the use of that dynamic plugin type.
  *
- * plugin bit = 0, will prevent the use of that dynamic plugin type.
- * plugin bit = 1, will allow the use of that dynamic plugin type.
+ *              A list of pre-defined masks can be found in H5PLpublic.h.
+ *              Set the mask to 0 to disable all plugins.
  *
- * H5PL_TYPE_FILTER changes just dynamic filters
- * A H5PL_ALL_PLUGIN will enable all dynamic plugin types
- * A zero value will disable all dynamic plugin types
+ *              This function will not allow plugin types if the pathname
+ *              from the HDF5_PLUGIN_PRELOAD environment variable is set to
+ *              the special "::" string.
  *
- * Return: Non-negative or success
+ * Return:      Success:    Non-negative
+ *              Failture:   Negative
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5PLset_loading_state(unsigned int plugin_type)
+H5PLset_loading_state(unsigned int plugin_control_mask)
 {
-    char *preload_path;
-    herr_t ret_value = SUCCEED; /* Return value */
+    herr_t  ret_value = SUCCEED;        /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE1("e", "Iu", plugin_type);
+    H5TRACE1("e", "Iu", plugin_control_mask);
 
-    /* change the bit value of the requested plugin type(s) */
-    H5PL_plugin_g = plugin_type;
-
-    /* check if special ENV variable is set and disable all plugin types */
-    if(NULL != (preload_path = HDgetenv("HDF5_PLUGIN_PRELOAD")))
-        /* Special symbol "::" means no plugin during data reading. */
-        if(!HDstrcmp(preload_path, H5PL_NO_PLUGIN))
-            H5PL_plugin_g = 0;
+    /* Set the plugin control mask */
+    if(H5PL__set_plugin_control_mask(plugin_control_mask) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTSET, FAIL, "error setting plugin control mask")
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -307,27 +97,35 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function: H5PLget_loading_state
+ * Function:    H5PLget_loading_state
  *
- * Purpose: Query state of the loading of dynamic plugin types.
+ * Purpose:     Get the bitmask that controls whether certain classes
+ *              of plugins (e.g.: filters, VOL drivers) will be loaded
+ *              by the library.
  *
- * This function will return the state of the global flag.
+ *              Zero if all plugin types are disabled
+ *              Negative if all plugin types are enabled
+ *              Positive if one or more of the plugin types are enabled
  *
- * Return: Zero if all plugin types are disabled, negative if all
- * plugin types are enabled, positive if one or more of the plugin types are enabled.
+ * Return:      Success:    Non-negative
+ *              Failture:   Negative
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5PLget_loading_state(unsigned int *plugin_type)
+H5PLget_loading_state(unsigned int *plugin_control_mask)
 {
-    herr_t ret_value = SUCCEED; /* Return value */
+    herr_t ret_value = SUCCEED;     /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE1("e", "*Iu", plugin_type);
+    H5TRACE1("e", "*Iu", plugin_control_mask);
 
-    if(plugin_type)
-        *plugin_type = H5PL_plugin_g;
+    if (NULL == plugin_control_mask)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "plugin_control_mask parameter cannot be NULL")
+
+    /* Set the plugin control mask */
+    if(H5PL__get_plugin_control_mask(plugin_control_mask) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_CANTGET, FAIL, "error getting plugin control mask")
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -335,674 +133,282 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5PL_load
- *
- * Purpose:     Given the plugin type and identifier, this function searches
- *              and/or loads a dynamic plugin library first among the already
- *              opened libraries then in the designated location paths.
- *
- * Return:      Non-NULL on success/NULL on failure
- *
- * Programmer:  Raymond Lu
- *              13 February 2013
- *
- *-------------------------------------------------------------------------
- */
-const void *
-H5PL_load(H5PL_type_t type, int id)
-{
-    htri_t      found;               /* Whether the plugin was found */
-    const void  *plugin_info = NULL;
-    const void  *ret_value = NULL;
-
-    FUNC_ENTER_NOAPI(NULL)
-
-    switch(type) {
-        case H5PL_TYPE_FILTER:
-            if((H5PL_plugin_g & H5PL_FILTER_PLUGIN) == 0)
-                HGOTO_ERROR(H5E_PLUGIN, H5E_CANTLOAD, NULL, "required dynamically loaded plugin filter '%d' is not available", id)
-            break;
-
-        case H5PL_TYPE_ERROR:
-        case H5PL_TYPE_NONE:
-        default:
-            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTLOAD, NULL, "required dynamically loaded plugin '%d' is not valid", id)
-    } /* end switch */
-
-    /* Initialize the location paths for dynamic libraries, if they aren't
-     * already set up.
-     */
-    if(FALSE == H5PL_path_found_g)
-        if(H5PL__init_path_table() < 0)
-            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTINIT, NULL, "can't initialize search path table")
-
-    /* Search in the table of already loaded plugin libraries */
-    if((found = H5PL__search_table(type, id, &plugin_info)) < 0)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, NULL, "search in table failed")
-
-    /* If not found, iterate through the path table to find the right dynamic library */
-    if(!found) {
-        size_t       i;                   /* Local index variable */
-
-        for(i = 0; i < H5PL_num_paths_g; i++) {
-            if((found = H5PL__find(type, id, H5PL_path_table_g[i], &plugin_info)) < 0)
-                HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, NULL, "search in paths failed")
-
-            /* Break out if found */
-            if(found) {
-                HDassert(plugin_info);
-                break;
-            } /* end if */
-        } /* end for */
-    } /* end if */
-
-    /* Check if we found the plugin */
-    if(found)
-        ret_value = plugin_info;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5PL_load() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5PLappend
+ * Function:    H5PLappend
  *
- * Purpose: Insert a plugin path at the end of the list.
+ * Purpose:     Insert a plugin search path at the end of the list.
  *
- * Return: Non-negative or success.
+ * Return:      Success:    Non-negative
+ *              Failture:   Negative
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5PLappend(const char *plugin_path)
+H5PLappend(const char *search_path)
 {
     herr_t ret_value = SUCCEED; /* Return value */
-    char        *dl_path = NULL;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE1("e", "*s", plugin_path);
-    if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
-    if(NULL == plugin_path)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
-    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
+    H5TRACE1("e", "*s", search_path);
 
-    H5PL_EXPAND_ENV_VAR
+    /* Check args */
+    if (NULL == search_path)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "plugin_path parameter cannot be NULL")
+    if (0 == HDstrlen(search_path))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "plugin_path parameter cannot have length zero")
 
-    H5PL_path_table_g[H5PL_num_paths_g] = dl_path;
-    H5PL_num_paths_g++;
+    /* Append the search path to the path table */
+    if (H5PL__append_path(search_path) < 0)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTAPPEND, FAIL, "unable to append search path")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLappend() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function: H5PLprepend
+ * Function:    H5PLprepend
  *
- * Purpose: Insert a plugin path at the beginning of the list.
+ * Purpose:     Insert a plugin search path at the beginning of the list.
  *
- * Return: Non-negative or success.
+ * Return:      Success:    Non-negative
+ *              Failture:   Negative
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5PLprepend(const char *plugin_path)
+H5PLprepend(const char *search_path)
 {
     herr_t ret_value = SUCCEED; /* Return value */
-    char        *dl_path = NULL;
-    unsigned int plindex;
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE1("e", "*s", plugin_path);
-    if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
-    if(NULL == plugin_path)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
-    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
+    H5TRACE1("e", "*s", search_path);
 
-    H5PL_EXPAND_ENV_VAR
+    /* Check args */
+    if (NULL == search_path)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "plugin_path parameter cannot be NULL")
+    if (0 == HDstrlen(search_path))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "plugin_path parameter cannot have length zero")
 
-    for (plindex = (unsigned int)H5PL_num_paths_g; plindex > 0; plindex--)
-        H5PL_path_table_g[plindex] = H5PL_path_table_g[plindex - 1];
-    H5PL_path_table_g[0] = dl_path;
-    H5PL_num_paths_g++;
+    /* Prepend the search path to the path table */
+    if (H5PL__prepend_path(search_path) < 0)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTINSERT, FAIL, "unable to prepend search path")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLprepend() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function: H5PLreplace
+ * Function:    H5PLreplace
  *
- * Purpose: Replace the path at the specified index.
+ * Purpose:     Replace the path at the specified index. The path at the
+ *              index must exist.
  *
- * Return: Non-negative or success.
+ * Return:      Non-negative or success.
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5PLreplace(const char *plugin_path, unsigned int index)
+H5PLreplace(const char *search_path, unsigned int index)
 {
-    herr_t ret_value = SUCCEED; /* Return value */
-    char        *dl_path = NULL;
+    unsigned    num_paths;              /* Current number of stored paths */
+    herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE2("e", "*sIu", plugin_path, index);
-    if(NULL == plugin_path)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
-    if(index >= H5PL_MAX_PATH_NUM)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "index path out of bounds for table")
-    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
+    H5TRACE2("e", "*sIu", search_path, index);
+
+    /* Check args */
+    if (NULL == search_path)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "plugin_path parameter cannot be NULL")
+    if (0 == HDstrlen(search_path))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "plugin_path parameter cannot have length zero")
 
-    H5PL_EXPAND_ENV_VAR
+    /* Check index */
+    num_paths = H5PL__get_num_paths();
+    if (0 == num_paths)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "path table is empty")
+    else if (index >= num_paths)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "index path out of bounds for table - can't be more than %u", (num_paths - 1))
 
-    if(H5PL_path_table_g[index])
-        H5PL_path_table_g[index] = (char *)H5MM_xfree(H5PL_path_table_g[index]);
-    H5PL_path_table_g[index] = dl_path;
+    /* Insert the search path into the path table */
+    if (H5PL__replace_path(search_path, index) < 0)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTINSERT, FAIL, "unable to replace search path")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLreplace() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function: H5PLinsert
+ * Function:    H5PLinsert
  *
- * Purpose: Insert a plugin path at the specified index, moving other paths after the index.
+ * Purpose:     Insert a plugin search path at the specified index, moving
+ *              other paths after the index.
  *
- * Return: Non-negative or success.
+ * Return:      Success:    Non-negative
+ *              Failture:   Negative
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5PLinsert(const char *plugin_path, unsigned int index)
+H5PLinsert(const char *search_path, unsigned int index)
 {
-    herr_t ret_value = SUCCEED; /* Return value */
-    char        *dl_path = NULL;
-    unsigned int plindex;
+    unsigned    num_paths;              /* Current number of stored paths */
+    herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE2("e", "*sIu", plugin_path, index);
-    if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
-    if(NULL == plugin_path)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no path provided")
-    if(index >= H5PL_MAX_PATH_NUM)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "index path out of bounds for table")
-    if(NULL == (dl_path = H5MM_strdup(plugin_path)))
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
-
-    H5PL_EXPAND_ENV_VAR
-
-    for(plindex = (unsigned int)H5PL_num_paths_g; plindex > index; plindex--)
-        H5PL_path_table_g[plindex] = H5PL_path_table_g[plindex - 1];
-    H5PL_path_table_g[index] = dl_path;
-    H5PL_num_paths_g++;
+    H5TRACE2("e", "*sIu", search_path, index);
+
+    /* Check args */
+    if (NULL == search_path)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "plugin_path parameter cannot be NULL")
+    if (0 == HDstrlen(search_path))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "plugin_path parameter cannot have length zero")
+
+    /* Check index */
+    num_paths = H5PL__get_num_paths();
+    if ((0 != num_paths) && (index >= num_paths))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "index path out of bounds for table - can't be more than %u", (num_paths - 1))
+
+    /* Insert the search path into the path table */
+    if (H5PL__insert_path(search_path, index) < 0)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTINSERT, FAIL, "unable to insert search path")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLinsert() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function: H5PLremove
+ * Function:    H5PLremove
  *
- * Purpose: Remove the plugin path at the specifed index and compacting the list.
+ * Purpose:     Remove the plugin path at the specifed index and compact
+ *              the list.
  *
- * Return: Non-negative or success.
+ * Return:      Success:    Non-negative
+ *              Failture:   Negative
+ *
+ * Return:      Non-negative or success.
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5PLremove(unsigned int index)
 {
-    herr_t ret_value = SUCCEED; /* Return value */
-    unsigned int plindex;
+    unsigned    num_paths;              /* Current number of stored paths */
+    herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "Iu", index);
-    if(H5PL_num_paths_g == 0)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "no directories in table")
-    if(index >= H5PL_MAX_PATH_NUM)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "index path out of bounds for table")
-    if(NULL == H5PL_path_table_g[index])
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no directory path at index")
-    H5PL_path_table_g[index] = (char *)H5MM_xfree(H5PL_path_table_g[index]);
-
-    H5PL_num_paths_g--;
-    for(plindex = index; plindex < (unsigned int)H5PL_num_paths_g; plindex++)
-        H5PL_path_table_g[plindex] = H5PL_path_table_g[plindex + 1];
-    H5PL_path_table_g[H5PL_num_paths_g] = NULL;
+
+    /* Check index */
+    num_paths = H5PL__get_num_paths();
+    if (0 == num_paths)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "path table is empty")
+    else if (index >= num_paths)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "index path out of bounds for table - can't be more than %u", (num_paths - 1))
+
+    /* Delete the search path from the path table */
+    if (H5PL__remove_path(index) < 0)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTDELETE, FAIL, "unable to remove search path")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLremove() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function: H5PLget
+ * Function:    H5PLget
+ *
+ * Purpose:     Query the plugin path at a specified index.
  *
- * Purpose: Query the plugin path at the specified index.
+ *  If 'path_buf' is non-NULL then up to 'buf_size' bytes will be written into
+ *  that buffer and the length of the path name will be returned.
  *
- * Return: Success: The length of path.
+ *  If 'path_buf' is NULL, this function will simply return the number of
+ *  characters required to store the path name, ignoring 'path_buf' and
+ *  'buf_size'
  *
- *  If `pathname' is non-NULL then write up to `size' bytes into that
- *  buffer and always return the length of the pathname.
- *  Otherwise `size' is ignored and the function does not store the pathname,
- *  just returning the number of characters required to store the pathname.
- *  If an error occurs then the buffer pointed to by `pathname' (NULL or non-NULL)
- *  is unchanged and the function returns a negative value.
- *  If a zero is returned for the name's length, then there is no pathname
- *  associated with the index.
+ *  If an error occurs then the buffer pointed to by 'path_buf'
+ *  (NULL or non-NULL) will be unchanged and the function will return a
+ *  negative value.
+ *
+ *  If a zero is returned for the name's length, then there is no path name
+ *  associated with the index and the 'path_buf' buffer will be unchanged.
+ *
+ * Return:  Success:    The length of path
+ *          Failure:    A negative value
  *
  *-------------------------------------------------------------------------
  */
 ssize_t
-H5PLget(unsigned int index, char *pathname/*out*/, size_t size)
+H5PLget(unsigned int index, char *path_buf, size_t buf_size)
 {
-    ssize_t      ret_value = 0;    /* Return value */
-    size_t       len = 0;          /* Length of pathname */
-    char        *dl_path = NULL;
+    unsigned    num_paths;              /* Current number of stored paths */
+    const char *path = NULL;            /* path from table */
+    size_t      path_len = 0;           /* Length of path */
+    ssize_t     ret_value = 0;          /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE3("Zs", "Iuxz", index, pathname, size);
-    if(H5PL_num_paths_g == 0)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "no directories in table")
-    if(index >= H5PL_MAX_PATH_NUM)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "index path out of bounds for table")
-    if(NULL == (dl_path = H5PL_path_table_g[index]))
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "no directory path at index")
-    len = HDstrlen(dl_path);
-    if(pathname) {
-        HDstrncpy(pathname, dl_path, MIN((size_t)(len + 1), size));
-        if((size_t)len >= size)
-            pathname[size - 1] = '\0';
+    H5TRACE3("Zs", "Iu*sz", index, path_buf, buf_size);
+
+    /* Check index */
+    num_paths = H5PL__get_num_paths();
+    if (0 == num_paths)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "path table is empty")
+    else if (index >= num_paths)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "index path out of bounds for table - can't be more than %u", (num_paths - 1))
+
+    /* Check if the search table is empty */
+    if (H5PL__get_num_paths() == 0)
+        HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, (-1), "plugin search path table is empty")
+
+    /* Get the path at the specified index and its length */
+    if (NULL == (path = H5PL__get_path(index)))
+        HGOTO_ERROR(H5E_PLUGIN, H5E_BADVALUE, (-1), "no path stored at that index")
+    path_len = HDstrlen(path);
+
+    /* If the path buffer is not NULL, copy the path to the buffer */
+    if (path_buf) {
+        HDstrncpy(path_buf, path, MIN((size_t)(path_len + 1), buf_size));
+        if ((size_t)path_len >= buf_size)
+            path_buf[buf_size - 1] = '\0';
     } /* end if */
 
     /* Set return value */
-    ret_value = (ssize_t)len;
+    ret_value = (ssize_t)path_len;
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLget() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function: H5PLsize
+ * Function:    H5PLsize
  *
- * Purpose: Query the size of the current list of plugin paths.
+ * Purpose:     Get the number of stored plugin paths.
+ *              XXX: This is a terrible name. Can it be changed?
  *
- * Return: Plugin path size
+ * Return:      SUCCEED/FAIL
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5PLsize(unsigned int *listsize)
+H5PLsize(unsigned int *num_paths)
 {
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE1("e", "*Iu", listsize);
+    H5TRACE1("e", "*Iu", num_paths);
+
+    /* Check arguments */
+    if (!num_paths)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "num_paths parameter cannot be NULL")
 
-    *listsize = (unsigned int)H5PL_num_paths_g;
+    /* Get the number of stored plugin paths */
+    *num_paths = H5PL__get_num_paths();
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5PLsize() */
 
-
-/*-------------------------------------------------------------------------
- * Function:    H5PL__init_path_table
- *
- * Purpose:     Initialize the path table.
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  Quincey Koziol
- *              18 March 2013
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5PL__init_path_table(void)
-{
-    char        *dl_path = NULL;
-    char        *origin_dl_path;
-    char        *dir;
-    herr_t      ret_value = SUCCEED;    /* Return value */
-
-    FUNC_ENTER_STATIC
-
-    /* Retrieve paths from HDF5_PLUGIN_PATH if the user sets it
-     * or from the default paths if it isn't set.
-     */
-    origin_dl_path = HDgetenv("HDF5_PLUGIN_PATH");
-    if(NULL == origin_dl_path)
-        dl_path = H5MM_strdup(H5PL_DEFAULT_PATH);
-    else
-        dl_path = H5MM_strdup(origin_dl_path);
-    if(NULL == dl_path)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
-
-    H5PL_EXPAND_ENV_VAR
-
-    /* Put paths in the path table.  They are separated by ":" */
-    dir = HDstrtok(dl_path, H5PL_PATH_SEPARATOR);
-    while(dir) {
-        /* Check for too many directories in path */
-        if(H5PL_num_paths_g == H5PL_MAX_PATH_NUM)
-            HGOTO_ERROR(H5E_PLUGIN, H5E_NOSPACE, FAIL, "too many directories in path for table")
-        if(NULL == (H5PL_path_table_g[H5PL_num_paths_g] = H5MM_strdup(dir)))
-            HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
-        H5PL_num_paths_g++;
-        dir = HDstrtok(NULL, H5PL_PATH_SEPARATOR);
-    } /* end while */
-
-    H5PL_path_found_g = TRUE;
-
-done:
-    if(dl_path)
-        dl_path = (char *)H5MM_xfree(dl_path);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5PL__init_path_table() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5PL__find
- *
- * Purpose:     Given a path, this function opens the directory and envokes
- *              another function to go through all files to find the right
- *              plugin library. Two function definitions are for Unix and
- *              Windows.
- *
- * Return:      TRUE on success,
- *              FALSE on not found,
- *              negative on failure
- *
- * Programmer:  Raymond Lu
- *              13 February 2013
- *
- *-------------------------------------------------------------------------
- */
-#ifndef H5_HAVE_WIN32_API
-static htri_t
-H5PL__find(H5PL_type_t plugin_type, int type_id, char *dir, const void **info)
-{
-    char           *pathname = NULL;
-    DIR            *dirp = NULL;
-    struct dirent  *dp;
-    htri_t         ret_value = FALSE;
-
-    FUNC_ENTER_STATIC
-
-    /* Open the directory */
-    if(!(dirp = HDopendir(dir)))
-        HGOTO_ERROR(H5E_PLUGIN, H5E_OPENERROR, FAIL, "can't open directory: %s", dir)
-
-    /* Iterates through all entries in the directory to find the right plugin library */
-    while(NULL != (dp = HDreaddir(dirp))) {
-        /* The library we are looking for should be called libxxx.so... on Unix
-         * or libxxx.xxx.dylib on Mac.
-         */
-#ifndef __CYGWIN__
-        if(!HDstrncmp(dp->d_name, "lib", (size_t)3) &&
-                (HDstrstr(dp->d_name, ".so") || HDstrstr(dp->d_name, ".dylib"))) {
-#else
-        if(!HDstrncmp(dp->d_name, "cyg", (size_t)3) &&
-                HDstrstr(dp->d_name, ".dll") ) {
-
-#endif
-            h5_stat_t   my_stat;
-            size_t      pathname_len;
-            htri_t      found_in_dir;
-
-            /* Allocate & initialize the path name */
-            pathname_len = HDstrlen(dir) + HDstrlen(dp->d_name) + 2;
-            if(NULL == (pathname = (char *)H5MM_malloc(pathname_len)))
-                HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
-            HDsnprintf(pathname, pathname_len, "%s/%s", dir, dp->d_name);
-
-            /* Get info for directory entry */
-            if(HDstat(pathname, &my_stat) == -1)
-                HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't stat file: %s", HDstrerror(errno))
-
-            /* If it is a directory, skip it */
-            if(S_ISDIR(my_stat.st_mode))
-                continue;
-
-            /* Attempt to open the dynamic library as a filter library */
-            if((found_in_dir = H5PL__open(plugin_type, pathname, type_id, info)) < 0)
-                HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "search in directory failed")
-            if(found_in_dir)
-                HGOTO_DONE(TRUE)    /* Indicate success */
-            pathname = (char *)H5MM_xfree(pathname);
-        } /* end if */
-    } /* end while */
-
-done:
-    if(dirp)
-        if(HDclosedir(dirp) < 0)
-            HDONE_ERROR(H5E_FILE, H5E_CLOSEERROR, FAIL, "can't close directory: %s", HDstrerror(errno))
-    pathname = (char *)H5MM_xfree(pathname);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5PL__find() */
-#else /* H5_HAVE_WIN32_API */
-static htri_t
-H5PL__find(H5PL_type_t plugin_type, int type_id, char *dir, const void **info)
-{
-    WIN32_FIND_DATAA    fdFile;
-    HANDLE              hFind;
-    char                *pathname = NULL;
-    char                service[2048];
-    htri_t              ret_value = FALSE;
-
-    FUNC_ENTER_STATIC
-
-    /* Specify a file mask. *.* = We want everything! */
-    sprintf(service, "%s\\*.dll", dir);
-    if((hFind = FindFirstFileA(service, &fdFile)) == INVALID_HANDLE_VALUE)
-        HGOTO_ERROR(H5E_PLUGIN, H5E_OPENERROR, FAIL, "can't open directory")
-
-    do {
-        /* Find first file will always return "."
-         * and ".." as the first two directories.
-         */
-        if(HDstrcmp(fdFile.cFileName, ".") != 0 && HDstrcmp(fdFile.cFileName, "..") != 0) {
-            size_t      pathname_len;
-            htri_t      found_in_dir;
-
-            /* Allocate & initialize the path name */
-            pathname_len = HDstrlen(dir) + HDstrlen(fdFile.cFileName) + 2;
-            if(NULL == (pathname = (char *)H5MM_malloc(pathname_len)))
-                HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "can't allocate memory for path")
-            HDsnprintf(pathname, pathname_len, "%s\\%s", dir, fdFile.cFileName);
-
-            /* Is the entity a File or Folder? */
-            if(fdFile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-                continue;
-
-            if((found_in_dir = H5PL__open(plugin_type, pathname, type_id, info)) < 0)
-                HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "search in directory failed")
-            if(found_in_dir)
-                HGOTO_DONE(TRUE)    /* Indicate success */
-            pathname = (char *)H5MM_xfree(pathname);
-        } /* end if */
-    } while(FindNextFileA(hFind, &fdFile)); /* Find the next file. */
-
-done:
-    if(hFind)
-        FindClose(hFind);
-    if(pathname)
-        pathname = (char *)H5MM_xfree(pathname);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5PL__find() */
-#endif /* H5_HAVE_WIN32_API */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5PL__open
- *
- * Purpose:     Iterates through all files to find the right plugin library.
- *              It loads the dynamic plugin library and keeps it on the list
- *              of loaded libraries.
- *
- * Return:      TRUE on success,
- *              FALSE on not found,
- *              negative on failure
- *
- * Programmer:  Raymond Lu
- *              13 February 2013
- *
- *-------------------------------------------------------------------------
- */
-static htri_t
-H5PL__open(H5PL_type_t pl_type, char *libname, int pl_id, const void **pl_info)
-{
-    H5PL_HANDLE    handle = NULL;
-    htri_t         ret_value = FALSE;
-
-    FUNC_ENTER_STATIC
-
-    /* There are different reasons why a library can't be open, e.g. wrong architecture.
-     * simply continue if we can't open it.
-     */
-    if(NULL == (handle = H5PL_OPEN_DLIB(libname))) {
-        H5PL_CLR_ERROR; /* clear error */
-    } /* end if */
-    else {
-        H5PL_get_plugin_info_t get_plugin_info = NULL;
-
-        /* Return a handle for the function H5PLget_plugin_info in the dynamic library.
-         * The plugin library is suppose to define this function.
-         */
-        if(NULL == (get_plugin_info = (H5PL_get_plugin_info_t)H5PL_GET_LIB_FUNC(handle, "H5PLget_plugin_info"))) {
-            if(H5PL__close(handle) < 0)
-                HGOTO_ERROR(H5E_PLUGIN, H5E_CLOSEERROR, FAIL, "can't close dynamic library")
-        } /* end if */
-        else {
-            const H5Z_class2_t *plugin_info;
-
-            /* Invoke H5PLget_plugin_info to verify this is the right library we are looking for.
-             * Move on if it isn't.
-             */
-            if(NULL == (plugin_info = (const H5Z_class2_t *)(*get_plugin_info)())) {
-                if(H5PL__close(handle) < 0)
-                    HGOTO_ERROR(H5E_PLUGIN, H5E_CLOSEERROR, FAIL, "can't close dynamic library")
-                HGOTO_ERROR(H5E_PLUGIN, H5E_CANTGET, FAIL, "can't get plugin info")
-            } /* end if */
-
-            /* Successfully found plugin library, check if it's the right one */
-            if(plugin_info->id == pl_id) {
-                /* Expand the table if it is too small */
-                if(H5PL_table_used_g >= H5PL_table_alloc_g) {
-                    size_t n = MAX(H5Z_MAX_NFILTERS, 2 * H5PL_table_alloc_g);
-                    H5PL_table_t *table = (H5PL_table_t *)H5MM_realloc(H5PL_table_g, n * sizeof(H5PL_table_t));
-
-                    if(!table)
-                        HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "unable to extend dynamic library table")
-
-                    H5PL_table_g = table;
-                    H5PL_table_alloc_g = n;
-                } /* end if */
-
-                (H5PL_table_g[H5PL_table_used_g]).handle = handle;
-                (H5PL_table_g[H5PL_table_used_g]).pl_type = pl_type;
-                (H5PL_table_g[H5PL_table_used_g]).pl_id = plugin_info->id;
-                H5PL_table_used_g++;
-
-                /* Set the plugin info to return */
-                *pl_info = (const void *)plugin_info;
-
-                /* Indicate success */
-                ret_value = TRUE;
-            } /* end if */
-            else
-                if(H5PL__close(handle) < 0)
-                    HGOTO_ERROR(H5E_PLUGIN, H5E_CLOSEERROR, FAIL, "can't close dynamic library")
-        } /* end if */
-    } /* end else */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5PL__open() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5PL__search_table
- *
- * Purpose:     Search in the list of already opened dynamic libraries
- *              to see if the one we are looking for is already opened.
- *
- * Return:      TRUE on success,
- *              FALSE on not found,
- *              Negative on failure
- *
- * Programmer:  Raymond Lu
- *              13 February 2013
- *
- *-------------------------------------------------------------------------
- */
-static htri_t
-H5PL__search_table(H5PL_type_t plugin_type, int type_id, const void **info)
-{
-    htri_t         ret_value = FALSE;
-
-    FUNC_ENTER_STATIC
-
-    /* Search in the table of already opened dynamic libraries */
-    if(H5PL_table_used_g > 0) {
-        size_t         i;
-
-        for(i = 0; i < H5PL_table_used_g; i++) {
-            if((plugin_type == (H5PL_table_g[i]).pl_type) && (type_id == (H5PL_table_g[i]).pl_id)) {
-                H5PL_get_plugin_info_t get_plugin_info;
-                const H5Z_class2_t   *plugin_info;
-
-                if(NULL == (get_plugin_info = (H5PL_get_plugin_info_t)H5PL_GET_LIB_FUNC((H5PL_table_g[i]).handle, "H5PLget_plugin_info")))
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get function for H5PLget_plugin_info")
-
-                if(NULL == (plugin_info = (const H5Z_class2_t *)(*get_plugin_info)()))
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get plugin info")
-
-                *info = plugin_info;
-                HGOTO_DONE(TRUE)
-            } /* end if */
-        } /* end for */
-    } /* end if */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5PL__search_table() */
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5PL__close
- *
- * Purpose:     Closes the handle for dynamic library
- *
- * Return:      Non-negative on success/Negative on failure
- *
- * Programmer:  Raymond Lu
- *              13 February 2013
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5PL__close(H5PL_HANDLE handle)
-{
-    FUNC_ENTER_STATIC_NOERR
-
-    H5PL_CLOSE_LIB(handle);
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5PL__close() */
-