[svn-r12440] Purpose:

    Code cleanup

Description:
    Trim trailing whitespace in Makefile.am and C/C++ source files to make
diffing changes easier.

Platforms tested:
    None necessary, whitespace only change

6 files changed, 28 insertions, 28 deletions

diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index f8f7f53..4b0bb7e 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -65,7 +65,7 @@ static void aux_initglb_filter(pack_opt_t *options)
 int h5repack(const char* infile,
              const char* outfile,
              pack_opt_t *options,
-             int argc, 
+             int argc,
              const char *argv[])
 {
  /* check input */
diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h
index e835b66..e859347 100644
--- a/tools/h5repack/h5repack.h
+++ b/tools/h5repack/h5repack.h
@@ -47,8 +47,8 @@ typedef struct {
  H5Z_FILTER_SHUFFLE     2 , shuffle the data
  H5Z_FILTER_FLETCHER32  3 , letcher32 checksum of EDC
  H5Z_FILTER_SZIP        4 , szip compression
- H5Z_FILTER_NBIT        5 , nbit compression              
- H5Z_FILTER_SCALEOFFSET 6 , scaleoffset compression      
+ H5Z_FILTER_NBIT        5 , nbit compression
+ H5Z_FILTER_SCALEOFFSET 6 , scaleoffset compression
 */
 
 #define CDVALUES 2
@@ -139,13 +139,13 @@ int h5repack_cmpdcpl   (const char *fname1,
 
 int check_objects(const char* fname,
                   pack_opt_t *options,
-                  int argc, 
+                  int argc,
                   const char *argv[]);
 
 int copy_objects(const char* fnamein,
                  const char* fnameout,
                  pack_opt_t *options,
-                 int argc, 
+                 int argc,
                  const char *argv[]);
 
 void print_objlist(const char *filename,
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index 7b11b93..dee6c3f 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -36,7 +36,7 @@
  *
  *-------------------------------------------------------------------------
  */
-static void print_dataset_info(hid_t dcpl_id, 
+static void print_dataset_info(hid_t dcpl_id,
                                char *objname,
                                float per)
 {
@@ -143,7 +143,7 @@ static void print_dataset_info(hid_t dcpl_id,
   strcat(str,temp);
   printf(FORMAT_OBJ,str,objname);
  }
-  
+
 
 
 }
@@ -166,7 +166,7 @@ static void print_dataset_info(hid_t dcpl_id,
 int copy_objects(const char* fnamein,
                  const char* fnameout,
                  pack_opt_t *options,
-                 int argc, 
+                 int argc,
                  const char *argv[])
 {
  hid_t         fidin;
@@ -374,7 +374,7 @@ int do_copy_objects(hid_t fidin,
    if ((next=H5Pget_external_count (dcpl_id))<0)
     goto error;
 
-   if (next) 
+   if (next)
     fprintf(stderr," <warning: %s has external files, ignoring read...>\n",
     travt->objs[i].name );
 
@@ -402,7 +402,7 @@ int do_copy_objects(hid_t fidin,
     dsize_in=H5Dget_storage_size(dset_in);
 
   /*-------------------------------------------------------------------------
-   * read 
+   * read
    *-------------------------------------------------------------------------
    */
     if (nelmts)
@@ -416,13 +416,13 @@ int do_copy_objects(hid_t fidin,
       goto error;
 
      /*-------------------------------------------------------------------------
-      * check for datasets too small 
+      * check for datasets too small
       *-------------------------------------------------------------------------
       */
-     
+
      if (nelmts*msize < options->threshold )
       apply_s=0;
-     
+
     /*-------------------------------------------------------------------------
      * apply the filter
      *-------------------------------------------------------------------------
@@ -445,7 +445,7 @@ int do_copy_objects(hid_t fidin,
 					 dset_out=H5Dcreate(fidout,travt->objs[i].name,mtype_id,space_id,dcpl_out);
 				} H5E_END_TRY;
 
-    
+
 				if (dset_out==FAIL)
 				{
      if ((dset_out=H5Dcreate(fidout,travt->objs[i].name,mtype_id,space_id,dcpl_id))<0)
@@ -479,14 +479,14 @@ int do_copy_objects(hid_t fidin,
      else
       print_dataset_info(dcpl_id,travt->objs[i].name,0);
     }
-   
+
     if (apply_s==0 && options->verbose)
      printf(" <warning: filter not applied to %s. dataset smaller than %d bytes>\n",
        travt->objs[i].name,
        (int)options->threshold);
 
     if (apply_f==0 && options->verbose)
-						printf(" <warning: could not apply the filter to %s>\n", 
+						printf(" <warning: could not apply the filter to %s>\n",
       travt->objs[i].name);
 
     /*-------------------------------------------------------------------------
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 9f3b192..75ca771 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -201,7 +201,7 @@ int apply_filters(const char* name,    /* object name from traverse list */
 
  if (rank==0) /* scalar dataset, do not apply */
   return 0;
- 
+
 
 /*-------------------------------------------------------------------------
 	* initialize the assigment object
@@ -219,7 +219,7 @@ int apply_filters(const char* name,    /* object name from traverse list */
  /* get information about input filters */
  if ((nfilters = H5Pget_nfilters(dcpl_id))<0)
   return -1;
-	
+
  /*-------------------------------------------------------------------------
 		* check if we have filters in the pipeline
 		* we want to replace them with the input filters
@@ -294,7 +294,7 @@ int apply_filters(const char* name,    /* object name from traverse list */
 			case H5Z_FILTER_DEFLATE:
 				{
 					unsigned     aggression;     /* the deflate level */
-					
+
 					aggression = obj.filter[i].cd_values[0];
 					/* set up for deflated data */
 					if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
@@ -313,9 +313,9 @@ int apply_filters(const char* name,    /* object name from traverse list */
 					unsigned  options_mask;
 					unsigned  pixels_per_block;
 
-					options_mask     = obj.filter[i].cd_values[0]; 
+					options_mask     = obj.filter[i].cd_values[0];
 					pixels_per_block = obj.filter[i].cd_values[1];
-		
+
 					/* set up for szip data */
 					if(H5Pset_chunk(dcpl_id,obj.chunk.rank,obj.chunk.chunk_lengths)<0)
 						return -1;
@@ -363,12 +363,12 @@ int apply_filters(const char* name,    /* object name from traverse list */
 
 			case H5Z_FILTER_SCALEOFFSET:
 				{
-					H5Z_SO_scale_type_t scale_type; 
-     int                 scale_factor;      
-					
+					H5Z_SO_scale_type_t scale_type;
+     int                 scale_factor;
+
 					scale_type   = obj.filter[i].cd_values[0];
 					scale_factor = obj.filter[i].cd_values[1];
-					
+
 					if(H5Pset_chunk(dcpl_id, obj.chunk.rank, obj.chunk.chunk_lengths)<0)
 						return -1;
 					if (H5Pset_scaleoffset(dcpl_id,scale_type,scale_factor)<0)
diff --git a/tools/h5repack/h5repack_list.c b/tools/h5repack/h5repack_list.c
index f2eb2c9..05156d4 100644
--- a/tools/h5repack/h5repack_list.c
+++ b/tools/h5repack/h5repack_list.c
@@ -36,7 +36,7 @@
  */
 int check_objects(const char* fname,
                   pack_opt_t *options,
-                  int argc, 
+                  int argc,
                   const char *argv[])
 {
  hid_t         fid;
diff --git a/tools/h5repack/h5repack_parse.c b/tools/h5repack/h5repack_parse.c
index 9760fa2..9243b72 100644
--- a/tools/h5repack/h5repack_parse.c
+++ b/tools/h5repack/h5repack_parse.c
@@ -189,12 +189,12 @@ obj_list_t* parse_filter(const char *str,
 /*-------------------------------------------------------------------------
  * H5Z_FILTER_SCALEOFFSET
 	* scaleoffset has the format SOFF=<scale_factor,scale_type>
-	* scale_type can be 
+	* scale_type can be
 	*   integer datatype, H5Z_SO_INT (IN)
 	*   float datatype using D-scaling method, H5Z_SO_FLOAT_DSCALE  (DS)
 	*   float datatype using E-scaling method, H5Z_SO_FLOAT_ESCALE  (ES) , not yet implemented
 	* for integer datatypes, scale_factor denotes Minimum Bits
-	* for float datatypes, scale_factor denotes decimal scale factor 
+	* for float datatypes, scale_factor denotes decimal scale factor
  *  examples
 	*  SOFF=31,IN
 	*  SOFF=3,DF