summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-09-19 16:38:08 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-09-19 16:38:08 (GMT)
commit0653325f0d4a92164842bb30b797f130e44cbc68 (patch)
tree15fde81b28e60d8fcae7864edf0281a3ffdca153 /src
parent4182c81addaaac3e4234369dc5a0089fb93756d9 (diff)
downloadhdf5-0653325f0d4a92164842bb30b797f130e44cbc68.zip
hdf5-0653325f0d4a92164842bb30b797f130e44cbc68.tar.gz
hdf5-0653325f0d4a92164842bb30b797f130e44cbc68.tar.bz2
[svn-r24167] HDFFV-8513, HDFFV-8522 Plugin testing in h5repack, h5dump.
Add more usage info for UserMacros. Add new option information about the Plugin default path. Tested: local linux, jam
Diffstat (limited to 'src')
-rw-r--r--src/H5PL.c6
-rw-r--r--src/H5Z.c4
-rw-r--r--src/H5config.h.in2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/H5PL.c b/src/H5PL.c
index 1c4b355..21bc0f2 100644
--- a/src/H5PL.c
+++ b/src/H5PL.c
@@ -85,7 +85,7 @@ typedef const void *(__cdecl *H5PL_get_plugin_info_t)(void);
typedef const void *(*H5PL_get_plugin_info_t)(void);
#endif /* H5_HAVE_WIN32_API */
-#define H5PL_DEFAULT_PATH H5_DEFAULT_PLUGIN
+#define H5PL_DEFAULT_PATH H5_DEFAULT_PLUGINDIR
/* Special symbol to indicate no plugin loading */
#define H5PL_NO_PLUGIN "::"
@@ -273,6 +273,10 @@ H5PL_load(H5PL_type_t type, int id)
FUNC_ENTER_NOAPI(NULL)
+ /* Check for "no plugins" indicated" */
+ if(H5PL_no_plugin_g)
+ HGOTO_ERROR(H5E_PLUGIN, H5E_CANTLOAD, NULL, "required dynamically loaded plugin filter '%d' is not available", id)
+
/* Initialize the location paths for dynamic libraries, if they aren't
* already set up.
*/
diff --git a/src/H5Z.c b/src/H5Z.c
index d415060..901b506 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -1326,9 +1326,6 @@ H5Z_pipeline(const H5O_pline_t *pline, unsigned flags,
hbool_t issue_error = FALSE;
/* Check for "no plugins" indicated" */
- if(H5PL_no_plugin())
- issue_error = TRUE;
- else {
const H5Z_class2_t *filter_info;
/* Try loading the filter */
@@ -1343,7 +1340,6 @@ H5Z_pipeline(const H5O_pline_t *pline, unsigned flags,
} /* end if */
else
issue_error = TRUE;
- } /* end else */
/* Check for error */
if(issue_error) {
diff --git a/src/H5config.h.in b/src/H5config.h.in
index a86970a..02bafd8 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -18,7 +18,7 @@
#undef CXX_HAVE_OFFSETOF
/* Define the default plugins path to compile */
-#undef DEFAULT_PLUGIN
+#undef DEFAULT_PLUGINDIR
/* Define the default virtual file driver to compile */
#undef DEFAULT_VFD