From 1187820c3bbd2fb21c3ca971e09e2df9317340d5 Mon Sep 17 00:00:00 2001 From: Raymond Lu Date: Fri, 31 May 2013 10:37:17 -0500 Subject: [svn-r23721] I used H5_VMS macro to comment out the code for dynamic filter since we don't plan to support it on OpenVMS. I updated vms/src/h5pubconf.h, too. Tested on jam but not on OpenVMS yet. --- src/H5.c | 2 ++ src/H5PL.c | 4 ++-- src/H5PLextern.h | 3 +++ src/H5PLprivate.h | 2 ++ src/H5Pocpl.c | 8 ++++++-- src/H5Z.c | 5 ++++- vms/src/h5pubconf.h | 9 +++++++++ vms/test/make.com | 12 ++++++++++++ 8 files changed, 40 insertions(+), 5 deletions(-) diff --git a/src/H5.c b/src/H5.c index f4a8217..1c6cae1 100644 --- a/src/H5.c +++ b/src/H5.c @@ -267,7 +267,9 @@ H5_term_library(void) pending += DOWN(Z); pending += DOWN(FD); pending += DOWN(P); +#ifndef H5_VMS pending += DOWN(PL); +#endif /*H5_VMS*/ /* Don't shut down the error code until other APIs which use it are shut down */ if(pending == 0) pending += DOWN(E); diff --git a/src/H5PL.c b/src/H5PL.c index 7a8a296..59bb5e5 100644 --- a/src/H5PL.c +++ b/src/H5PL.c @@ -19,7 +19,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5PL__init_interface - /***********/ /* Headers */ /***********/ @@ -29,6 +28,7 @@ #include "H5PLprivate.h" /* Plugin */ #include "H5Zprivate.h" /* Filter pipeline */ +#ifndef H5_VMS /****************/ /* Local Macros */ @@ -658,4 +658,4 @@ H5PL__close(H5PL_HANDLE handle) FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5PL__close() */ - +#endif /*H5_VMS*/ diff --git a/src/H5PLextern.h b/src/H5PLextern.h index 943e3aa..f94101d 100644 --- a/src/H5PLextern.h +++ b/src/H5PLextern.h @@ -22,6 +22,8 @@ /* Include HDF5 header */ #include "hdf5.h" +#ifndef H5_VMS + /*******************/ /* Public Typedefs */ /*******************/ @@ -79,6 +81,7 @@ H5PLUGIN_DLL const void *H5PLget_plugin_info(void); #ifdef __cplusplus } #endif +#endif /*H5_VMS*/ #endif /* _H5PLextern_H */ diff --git a/src/H5PLprivate.h b/src/H5PLprivate.h index b117613..ee03def 100644 --- a/src/H5PLprivate.h +++ b/src/H5PLprivate.h @@ -25,6 +25,7 @@ /* Private headers needed by this file */ #include "H5private.h" /* Generic Functions */ +#ifndef H5_VMS /**************************/ /* Library Private Macros */ @@ -48,6 +49,7 @@ /* Internal API routines */ H5_DLL const void *H5PL_load(H5PL_type_t plugin_type, int type_id); H5_DLL htri_t H5PL_no_plugin(void); +#endif /*H5_VMS*/ #endif /* _H5PLprivate_H */ diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c index 88ba1e1..27a41a1 100644 --- a/src/H5Pocpl.c +++ b/src/H5Pocpl.c @@ -804,16 +804,20 @@ H5P__set_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned int flags, /* Check if filter is already available */ if((filter_avail = H5Z_filter_avail(filter)) < 0) - HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't check filter availability") + HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't check filter availability") /* If filter is not available, try to dynamically load it */ if(!filter_avail) { +#ifndef H5_VMS const H5Z_class2_t *filter_info; if(NULL == (filter_info = (const H5Z_class2_t *)H5PL_load(H5PL_TYPE_FILTER, (int)filter))) HGOTO_ERROR(H5E_PLINE, H5E_CANTLOAD, FAIL, "failed to load dynamically loaded plugin") if(H5Z_register(filter_info) < 0) - HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register filter") + HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register dynamic filter") +#else /*H5_VMS*/ + HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "filter is NOT registered") +#endif /*H5_VMS*/ } /* end if */ /* Get the pipeline property to append to */ diff --git a/src/H5Z.c b/src/H5Z.c index 2c0c180..2c5061f 100644 --- a/src/H5Z.c +++ b/src/H5Z.c @@ -1325,6 +1325,7 @@ H5Z_pipeline(const H5O_pline_t *pline, unsigned flags, */ if((fclass_idx = H5Z_find_idx(pline->filter[idx].id)) < 0) { hbool_t issue_error = FALSE; +#ifndef H5_VMS /* Check for "no plugins" indicated" */ if(H5PL_no_plugin()) @@ -1345,7 +1346,9 @@ H5Z_pipeline(const H5O_pline_t *pline, unsigned flags, else issue_error = TRUE; } /* end else */ - +#else /*H5_VMS*/ + issue_error = TRUE; +#endif /*H5_VMS*/ /* Check for error */ if(issue_error) { /* Print out the filter name to give more info. But the name is optional for diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h index 4cc1946..c7819df 100644 --- a/vms/src/h5pubconf.h +++ b/vms/src/h5pubconf.h @@ -99,6 +99,9 @@ /* Define if the direct I/O virtual file driver should be compiled */ /* #undef H5_HAVE_DIRECT */ +/* Define to 1 if you have the header file. */ +#define H5_HAVE_DIRENT_H 1 + /* Define to 1 if you have the header file. */ #define H5_HAVE_DLFCN_H 1 @@ -196,6 +199,9 @@ /* Define to 1 if you have the header file. */ /* #undef H5_HAVE_IO_H */ +/* Define to 1 if you have the `dl' library (-ldl). */ +#define H5_HAVE_LIBDL 1 + /* Define to 1 if you have the `dmalloc' library (-ldmalloc). */ /* #undef H5_HAVE_LIBDMALLOC */ @@ -274,6 +280,9 @@ /* Define to 1 if you have the `rand_r' function. */ /* #define H5_HAVE_RAND_R 1 */ +/* Define to 1 if you have the `setjmp' function. */ +#define H5_HAVE_SETJMP 1 + /* Define to 1 if you have the header file. */ #define H5_HAVE_SETJMP_H 1 diff --git a/vms/test/make.com b/vms/test/make.com index 8748925..562260a 100644 --- a/vms/test/make.com +++ b/vms/test/make.com @@ -169,6 +169,12 @@ $ link fheap, - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib $! $ type sys$input + Creating file_image test +$ ccc file_image +$ link file_image, - + libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib +$! +$ type sys$input Creating fillval test $ ccc fillval $ link fillval, - @@ -316,6 +322,12 @@ $ link unlink, - libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib $! $ type sys$input + Creating unregister test +$ ccc unregister +$ link unregister, - + libh5test.olb/lib,[-.src]hdf5.olb/lib,zlib_dir:libz.olb/lib +$! +$ type sys$input Creating vfd test $ ccc vfd $ link vfd, - -- cgit v0.12