[svn-r23549] Description:

    More misc. cleanups, but main change is to make an "extern" header file
for the plugin interface.

Tested on:
    Mac OSX/64 10.8.3 (amazon)

1 files changed, 13 insertions, 12 deletions

diff --git a/test/dynlib1.c b/test/dynlib1.c
index de14f6f..1ccc33a 100644
--- a/test/dynlib1.c
+++ b/test/dynlib1.c
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <hdf5.h>
+#include "H5PLextern.h"
 
 #define H5Z_FILTER_DYNLIB1      257
 
@@ -38,8 +38,8 @@ const H5Z_class2_t H5Z_DYNLIB1[1] = {{
     (H5Z_func_t)H5Z_filter_dynlib1,    /* The actual filter function	*/
 }};
 
-H5PL_type_t   H5PL_get_plugin_type(void) {return H5PL_TYPE_FILTER;}
-H5Z_class2_t* H5PL_get_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
@@ -63,34 +63,35 @@ H5Z_filter_dynlib1(unsigned int flags, size_t cd_nelmts,
       const unsigned int *cd_values, size_t nbytes,
       size_t *buf_size, void **buf)
 {
-    int *int_ptr=(int *)*buf;          /* Pointer to the data values */
-    size_t buf_left=*buf_size;  /* Amount of data buffer left to process */
-    int         add_on = 0;
+    int *int_ptr = (int *)*buf;          /* Pointer to the data values */
+    size_t buf_left = *buf_size;  /* Amount of data buffer left to process */
+    int add_on = 0;
 
     /* Check for the correct number of parameters */
-    if(cd_nelmts==0)
+    if(cd_nelmts == 0)
         return(0);
 
     /* Check that permanent parameters are set correctly */
-    if(cd_values[0]<0 || cd_values[0]>9)
+    if(cd_values[0] > 9)
         return(0);
   
-    add_on = cd_values[0];
+    add_on = (int)cd_values[0];
 
     if(flags & H5Z_FLAG_REVERSE) { /*read*/
         /* Substract the "add on" value to all the data values */
-        while(buf_left>0) {
+        while(buf_left > 0) {
             *int_ptr++ -= add_on;
             buf_left -= sizeof(int);
         } /* end while */
     } /* end if */
     else { /*write*/
         /* Add the "add on" value to all the data values */
-        while(buf_left>0) {
+        while(buf_left > 0) {
             *int_ptr++ += add_on;
             buf_left -= sizeof(int);
         } /* end while */
     } /* end else */
 
     return nbytes;
-}
+} /* end H5Z_filter_dynlib1() */
+