diff options
-rw-r--r-- | tools/h5repack/dynlib_rpk.c | 50 | ||||
-rw-r--r-- | tools/h5repack/dynlib_vrpk.c | 15 |
2 files changed, 21 insertions, 44 deletions
diff --git a/tools/h5repack/dynlib_rpk.c b/tools/h5repack/dynlib_rpk.c index 6e8a7b6..3469e58 100644 --- a/tools/h5repack/dynlib_rpk.c +++ b/tools/h5repack/dynlib_rpk.c @@ -12,10 +12,10 @@ * to either file, you may request a copy from help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - * Programmer: Raymond Lu - * 13 February 2013 + * Programmer: Raymond Lu + * 13 February 2013 * - * Purpose: Tests the plugin module (H5PL) + * Purpose: Tests the plugin module (H5PL) */ #include <stdlib.h> @@ -24,48 +24,36 @@ #define H5Z_FILTER_DYNLIB1 257 -/* gcc attribute support from H5private.h */ -#ifdef __cplusplus -# define H5_ATTR_CONST /*void*/ -#else /* __cplusplus */ -#if defined(H5_HAVE_ATTRIBUTE) && !defined(__SUNPRO_C) -# define H5_ATTR_CONST __attribute__((const)) -#else -# define H5_ATTR_CONST /*void*/ -#endif -#endif /* __cplusplus */ - - static size_t H5Z_filter_dynlib1(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_values, size_t nbytes, size_t *buf_size, void **buf); /* This message derives from H5Z */ const H5Z_class2_t H5Z_DYNLIB1[1] = {{ H5Z_CLASS_T_VERS, /* H5Z_class_t version */ - H5Z_FILTER_DYNLIB1, /* Filter id number */ + H5Z_FILTER_DYNLIB1, /* Filter id number */ 1, 1, /* Encoding and decoding enabled */ - "dynlib1", /* Filter name for debugging */ + "dynlib1", /* Filter name for debugging */ NULL, /* The "can apply" callback */ NULL, /* The "set local" callback */ - (H5Z_func_t)H5Z_filter_dynlib1, /* The actual filter function */ + (H5Z_func_t)H5Z_filter_dynlib1, /* The actual filter function */ }}; -H5_ATTR_CONST H5PL_type_t H5PLget_plugin_type(void) {return H5PL_TYPE_FILTER;} -H5_ATTR_CONST const void *H5PLget_plugin_info(void) {return H5Z_DYNLIB1;} +H5PL_type_t H5PLget_plugin_type(void) {return H5PL_TYPE_FILTER;} +const void *H5PLget_plugin_info(void) {return H5Z_DYNLIB1;} /*------------------------------------------------------------------------- - * Function: H5Z_filter_dynlib1 + * Function: H5Z_filter_dynlib1 * - * Purpose: A dynlib1 filter method that adds on and subtract from - * the original value with another value. It will be built - * as a shared library. plugin.c test will load and use - * this filter library. + * Purpose: A dynlib1 filter method that adds on and subtract from + * the original value with another value. It will be built + * as a shared library. plugin.c test will load and use + * this filter library. * - * Return: Success: Data chunk size + * Return: Success: Data chunk size * - * Failure: 0 + * Failure: 0 * - * Programmer: Raymond Lu + * Programmer: Raymond Lu * 29 March 2013 * *------------------------------------------------------------------------- @@ -81,12 +69,12 @@ H5Z_filter_dynlib1(unsigned int flags, size_t cd_nelmts, /* Check for the correct number of parameters */ if(cd_nelmts == 0) - return(0); + return 0; /* Check that permanent parameters are set correctly */ if(cd_values[0] > 9) - return(0); - + return 0; + add_on = (int)cd_values[0]; if(flags & H5Z_FLAG_REVERSE) { /*read*/ diff --git a/tools/h5repack/dynlib_vrpk.c b/tools/h5repack/dynlib_vrpk.c index 63ceaec..8da0270 100644 --- a/tools/h5repack/dynlib_vrpk.c +++ b/tools/h5repack/dynlib_vrpk.c @@ -21,17 +21,6 @@ #define H5Z_FILTER_DYNLIB4 260 -/* gcc attribute support from H5private.h */ -#ifdef __cplusplus -# define H5_ATTR_CONST /*void*/ -#else /* __cplusplus */ -#if defined(H5_HAVE_ATTRIBUTE) && !defined(__SUNPRO_C) -# define H5_ATTR_CONST __attribute__((const)) -#else -# define H5_ATTR_CONST /*void*/ -#endif -#endif /* __cplusplus */ - #define PUSH_ERR(func, minor, str) H5Epush2(H5E_DEFAULT, __FILE__, func, __LINE__, H5E_ERR_CLS, H5E_PLUGIN, minor, str) static size_t H5Z_filter_dynlib4(unsigned int flags, size_t cd_nelmts, @@ -48,8 +37,8 @@ const H5Z_class2_t H5Z_DYNLIB4[1] = {{ (H5Z_func_t)H5Z_filter_dynlib4, /* The actual filter function */ }}; -H5_ATTR_CONST H5PL_type_t H5PLget_plugin_type(void) {return H5PL_TYPE_FILTER;} -H5_ATTR_CONST const void *H5PLget_plugin_info(void) {return H5Z_DYNLIB4;} +H5PL_type_t H5PLget_plugin_type(void) {return H5PL_TYPE_FILTER;} +const void *H5PLget_plugin_info(void) {return H5Z_DYNLIB4;} /*------------------------------------------------------------------------- * Function: H5Z_filter_dynlib4 |