[svn-r8384] Purpose:

    Code cleanup

Description:
    Clean up lots of warnings based on those reported from the SGI compilers
as well as gcc.

Platforms tested:
    SGI O3900, IRIX64 6.5 (Cheryl's SGI machine)
    FreeBSD 4.9 (sleipnir) w/ & w/o parallel
    h5committest

11 files changed, 42 insertions, 58 deletions

diff --git a/src/H5D.c b/src/H5D.c
index 066c048..f3affc4 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -599,7 +599,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5D_crt_fill_value_cmp(const void *value1, const void *value2, size_t size)
+H5D_crt_fill_value_cmp(const void *value1, const void *value2, size_t UNUSED size)
 {
     const H5O_fill_t     *fill1=(const H5O_fill_t *)value1,     /* Create local aliases for values */
         *fill2=(const H5O_fill_t *)value2;
@@ -655,7 +655,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5D_crt_ext_file_list_cmp(const void *value1, const void *value2, size_t size)
+H5D_crt_ext_file_list_cmp(const void *value1, const void *value2, size_t UNUSED size)
 {
     const H5O_efl_t     *efl1=(const H5O_efl_t *)value1,     /* Create local aliases for values */
         *efl2=(const H5O_efl_t *)value2;
@@ -737,7 +737,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-H5D_crt_data_pipeline_cmp(const void *value1, const void *value2, size_t size)
+H5D_crt_data_pipeline_cmp(const void *value1, const void *value2, size_t UNUSED size)
 {
     const H5O_pline_t     *pline1=(const H5O_pline_t *)value1,     /* Create local aliases for values */
         *pline2=(const H5O_pline_t *)value2;
@@ -763,40 +763,40 @@ H5D_crt_data_pipeline_cmp(const void *value1, const void *value2, size_t size)
     if(pline1->filter==NULL && pline2->filter!=NULL) HGOTO_DONE(-1);
     if(pline1->filter!=NULL && pline2->filter==NULL) HGOTO_DONE(1);
     if(pline1->filter!=NULL && pline1->nfilters>0) {
-        int i;       /* Local index variable */
+        size_t u;       /* Local index variable */
 
         /* Loop through all filters, comparing them */
-        for(i=0; i<pline1->nfilters; i++) {
+        for(u=0; u<pline1->nfilters; u++) {
             /* Check the ID of the filter */
-            if(pline1->filter[i].id < pline2->filter[i].id) HGOTO_DONE(-1);
-            if(pline1->filter[i].id > pline2->filter[i].id) HGOTO_DONE(1);
+            if(pline1->filter[u].id < pline2->filter[u].id) HGOTO_DONE(-1);
+            if(pline1->filter[u].id > pline2->filter[u].id) HGOTO_DONE(1);
 
             /* Check the flags for the filter */
-            if(pline1->filter[i].flags < pline2->filter[i].flags) HGOTO_DONE(-1);
-            if(pline1->filter[i].flags > pline2->filter[i].flags) HGOTO_DONE(1);
+            if(pline1->filter[u].flags < pline2->filter[u].flags) HGOTO_DONE(-1);
+            if(pline1->filter[u].flags > pline2->filter[u].flags) HGOTO_DONE(1);
 
             /* Check the name of the filter */
-            if(pline1->filter[i].name==NULL && pline2->filter[i].name!=NULL) HGOTO_DONE(-1);
-            if(pline1->filter[i].name!=NULL && pline2->filter[i].name==NULL) HGOTO_DONE(1);
-            if(pline1->filter[i].name!=NULL)
-                if((cmp_value=HDstrcmp(pline1->filter[i].name,pline2->filter[i].name))!=0)
+            if(pline1->filter[u].name==NULL && pline2->filter[u].name!=NULL) HGOTO_DONE(-1);
+            if(pline1->filter[u].name!=NULL && pline2->filter[u].name==NULL) HGOTO_DONE(1);
+            if(pline1->filter[u].name!=NULL)
+                if((cmp_value=HDstrcmp(pline1->filter[u].name,pline2->filter[u].name))!=0)
                     HGOTO_DONE(cmp_value);
 
             /* Check the number of parameters for the filter */
-            if(pline1->filter[i].cd_nelmts < pline2->filter[i].cd_nelmts) HGOTO_DONE(-1);
-            if(pline1->filter[i].cd_nelmts > pline2->filter[i].cd_nelmts) HGOTO_DONE(1);
+            if(pline1->filter[u].cd_nelmts < pline2->filter[u].cd_nelmts) HGOTO_DONE(-1);
+            if(pline1->filter[u].cd_nelmts > pline2->filter[u].cd_nelmts) HGOTO_DONE(1);
 
             /* Check the filter parameter information */
-            if(pline1->filter[i].cd_values==NULL && pline2->filter[i].cd_values!=NULL) HGOTO_DONE(-1);
-            if(pline1->filter[i].cd_values!=NULL && pline2->filter[i].cd_values==NULL) HGOTO_DONE(1);
-            if(pline1->filter[i].cd_values!=NULL && pline1->filter[i].cd_nelmts>0) {
+            if(pline1->filter[u].cd_values==NULL && pline2->filter[u].cd_values!=NULL) HGOTO_DONE(-1);
+            if(pline1->filter[u].cd_values!=NULL && pline2->filter[u].cd_values==NULL) HGOTO_DONE(1);
+            if(pline1->filter[u].cd_values!=NULL && pline1->filter[u].cd_nelmts>0) {
                 size_t v;       /* Local index variable */
 
                 /* Loop through all parameters, comparing them */
-                for(v=0; v<pline1->filter[i].cd_nelmts; v++) {
+                for(v=0; v<pline1->filter[u].cd_nelmts; v++) {
                     /* Check each parameter for the filter */
-                    if(pline1->filter[i].cd_values[v] < pline2->filter[i].cd_values[v]) HGOTO_DONE(-1);
-                    if(pline1->filter[i].cd_values[v] > pline2->filter[i].cd_values[v]) HGOTO_DONE(1);
+                    if(pline1->filter[u].cd_values[v] < pline2->filter[u].cd_values[v]) HGOTO_DONE(-1);
+                    if(pline1->filter[u].cd_values[v] > pline2->filter[u].cd_values[v]) HGOTO_DONE(1);
                 } /* end for */
             } /* end if */
         } /* end for */
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index 525d557..9b1ad40 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -138,7 +138,6 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
 #ifdef H5_HAVE_PARALLEL
     MPI_Comm	mpi_comm=MPI_COMM_NULL;	/* MPI communicator for file */
     int         mpi_rank=(-1);  /* This process's rank  */
-    int         mpi_size=(-1);  /* Total # of processes */
     int         mpi_code;       /* MPI return code */
     unsigned    blocks_written=0; /* Flag to indicate that chunk was actually written */
     unsigned    using_mpi=0;    /* Flag to indicate that the file is being accessed with an MPI-capable file driver */
@@ -167,8 +166,6 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
         /* Get the MPI rank & size */
         if ((mpi_rank=H5FD_mpio_mpi_rank(f->shared->lf))<0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI rank");
-        if ((mpi_size=H5FD_mpio_mpi_size(f->shared->lf))<0)
-            HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI size");
 
         /* Set the MPI-capable file driver flag */
         using_mpi=1;
@@ -181,8 +178,6 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
         /* Get the MPI rank & size */
         if ((mpi_rank=H5FD_mpiposix_mpi_rank(f->shared->lf))<0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI rank");
-        if ((mpi_size=H5FD_mpiposix_mpi_size(f->shared->lf))<0)
-            HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI size");
 
         /* Set the MPI-capable file driver flag */
         using_mpi=1;
@@ -197,9 +192,6 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
         if ((mpi_rank = H5FD_fphdf5_mpi_rank(f->shared->lf)) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI rank");
 
-        if ((mpi_size = H5FD_fphdf5_mpi_size(f->shared->lf)) < 0)
-            HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI size");
-
         /* Set the MPI-capable file driver flag */
         using_mpi = 1;
     } /* end if */
diff --git a/src/H5Dio.c b/src/H5Dio.c
index 364eaea..452663a 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -2690,7 +2690,7 @@ H5D_create_chunk_file_map_hyper(const fm_map *fm)
     } /* end for */
 
     /* Calculate the index of this chunk */
-    if(H5V_chunk_index(fm->f_ndims,coords,fm->layout->dim,fm->chunks,fm->down_chunks,&chunk_index)<0)
+    if(H5V_chunk_index(fm->f_ndims,coords,fm->layout->dim,fm->down_chunks,&chunk_index)<0)
         HGOTO_ERROR (H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index");
 
     /* Iterate through each chunk in the dataset */
@@ -2802,7 +2802,7 @@ H5D_create_chunk_file_map_hyper(const fm_map *fm)
             } while(coords[curr_dim]>sel_end[curr_dim]);
 
             /* Re-Calculate the index of this chunk */
-            if(H5V_chunk_index(fm->f_ndims,coords,fm->layout->dim,fm->chunks,fm->down_chunks,&chunk_index)<0)
+            if(H5V_chunk_index(fm->f_ndims,coords,fm->layout->dim,fm->down_chunks,&chunk_index)<0)
                 HGOTO_ERROR (H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index");
         } /* end if */
     } /* end while */
@@ -3024,7 +3024,7 @@ H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, hsize_t ndims, hssize
     FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_file_cb)
 
     /* Calculate the index of this chunk */
-    if(H5V_chunk_index((unsigned)ndims,coords,fm->layout->dim,fm->chunks,fm->down_chunks,&chunk_index)<0)
+    if(H5V_chunk_index((unsigned)ndims,coords,fm->layout->dim,fm->down_chunks,&chunk_index)<0)
         HGOTO_ERROR (H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index")
 
     /* Find correct chunk in file & memory TBBTs */
@@ -3135,7 +3135,7 @@ H5D_chunk_mem_cb(void UNUSED *elem, hid_t UNUSED type_id, hsize_t ndims, hssize_
     FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_mem_cb);
 
     /* Calculate the index of this chunk */
-    if(H5V_chunk_index((unsigned)ndims,coords,fm->layout->dim,fm->chunks,fm->down_chunks,&chunk_index)<0)
+    if(H5V_chunk_index((unsigned)ndims,coords,fm->layout->dim,fm->down_chunks,&chunk_index)<0)
         HGOTO_ERROR (H5E_DATASPACE, H5E_BADRANGE, FAIL, "can't get chunk index");
 
     /* Find correct chunk in file & memory TBBTs */
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 8f8c769..7cf6677 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -1754,7 +1754,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
         H5FD_mpio_xfer_t            xfer_mode;   /* I/O tranfer mode */
 
         /* Obtain the data transfer properties */
-        xfer_mode = H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
+        xfer_mode = (H5FD_mpio_xfer_t)H5P_peek_unsigned(plist, H5D_XFER_IO_XFER_MODE_NAME);
 
         /*
          * Set up for a fancy xfer using complex types, or single byte block. We
diff --git a/src/H5Fcontig.c b/src/H5Fcontig.c
index 525d557..9b1ad40 100644
--- a/src/H5Fcontig.c
+++ b/src/H5Fcontig.c
@@ -138,7 +138,6 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
 #ifdef H5_HAVE_PARALLEL
     MPI_Comm	mpi_comm=MPI_COMM_NULL;	/* MPI communicator for file */
     int         mpi_rank=(-1);  /* This process's rank  */
-    int         mpi_size=(-1);  /* Total # of processes */
     int         mpi_code;       /* MPI return code */
     unsigned    blocks_written=0; /* Flag to indicate that chunk was actually written */
     unsigned    using_mpi=0;    /* Flag to indicate that the file is being accessed with an MPI-capable file driver */
@@ -167,8 +166,6 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
         /* Get the MPI rank & size */
         if ((mpi_rank=H5FD_mpio_mpi_rank(f->shared->lf))<0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI rank");
-        if ((mpi_size=H5FD_mpio_mpi_size(f->shared->lf))<0)
-            HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI size");
 
         /* Set the MPI-capable file driver flag */
         using_mpi=1;
@@ -181,8 +178,6 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
         /* Get the MPI rank & size */
         if ((mpi_rank=H5FD_mpiposix_mpi_rank(f->shared->lf))<0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI rank");
-        if ((mpi_size=H5FD_mpiposix_mpi_size(f->shared->lf))<0)
-            HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI size");
 
         /* Set the MPI-capable file driver flag */
         using_mpi=1;
@@ -197,9 +192,6 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
         if ((mpi_rank = H5FD_fphdf5_mpi_rank(f->shared->lf)) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI rank");
 
-        if ((mpi_size = H5FD_fphdf5_mpi_size(f->shared->lf)) < 0)
-            HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "Can't retrieve MPI size");
-
         /* Set the MPI-capable file driver flag */
         using_mpi = 1;
     } /* end if */
diff --git a/src/H5G.c b/src/H5G.c
index b120231..e615963 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -595,9 +595,9 @@ H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx)
 
     /* Check args */
     if (NULL==(loc=H5G_loc (loc_id)))
-	HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID");
+	HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a location ID");
     if(H5G_get_type(loc,H5AC_ind_dxpl_id)!=H5G_GROUP)
-	HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, FAIL, "not a group");
+	HGOTO_ERROR (H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a group");
         
     if (H5G_get_num_objs(loc, &num_objs, H5AC_ind_dxpl_id)<0)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "unable to retrieve number of members");
@@ -605,7 +605,7 @@ H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "index out of bound");
         
     /*call private function*/
-    ret_value = H5G_get_objtype_by_idx(loc, idx, H5AC_ind_dxpl_id);
+    ret_value = (H5G_obj_t)H5G_get_objtype_by_idx(loc, idx, H5AC_ind_dxpl_id);
 
 done:
     FUNC_LEAVE_API(ret_value);
@@ -2566,7 +2566,7 @@ H5G_get_objinfo (H5G_entry_t *loc, const char *name, hbool_t follow_link,
                     statbuf->mtime = 0;
                 }
 	    }
-	    statbuf->type = H5G_get_type(&obj_ent, dxpl_id);
+	    statbuf->type = (H5G_obj_t)H5G_get_type(&obj_ent, dxpl_id);
 	    H5E_clear(); /*clear errors resulting from checking type*/
 
             /* Get object header information */
diff --git a/src/H5R.c b/src/H5R.c
index 8e18959..50e8745 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -880,7 +880,11 @@ H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref)
     file=loc->file;
 
     /* Get the object information */
-    if ((ret_value=H5R_get_obj_type(file,H5AC_ind_dxpl_id,ref_type,_ref))<0)
+    if ((ret_value=
+#ifndef H5_WANT_H5_V1_4_COMPAT
+		(H5G_obj_t)
+#endif /* H5_WANT_H5_V1_4_COMPAT */
+		H5R_get_obj_type(file,H5AC_ind_dxpl_id,ref_type,_ref))<0)
 	HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type");
     
 done:
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index e820b92..08632b9 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -567,7 +567,6 @@ H5S_mpio_space_type( const H5S_t *space, size_t elmt_size,
         case H5S_COMPLEX:
             /* not yet implemented */
             HGOTO_ERROR(H5E_DATASPACE, H5E_UNSUPPORTED, FAIL, "complex data spaces are not supported yet");
-            break;
 
         default:
             assert("unknown data space type" && 0);
diff --git a/src/H5V.c b/src/H5V.c
index 88793e2..dfadee9 100644
--- a/src/H5V.c
+++ b/src/H5V.c
@@ -1027,7 +1027,7 @@ done:
  *-------------------------------------------------------------------------
  */
 hsize_t
-H5V_array_offset_pre(unsigned n, const hsize_t *total_size, const hsize_t *acc, const hssize_t *offset)
+H5V_array_offset_pre(unsigned n, const hsize_t *acc, const hssize_t *offset)
 {
     hsize_t	    skip;	/*starting point byte offset		*/
     int             i;		/*counter				*/
@@ -1036,7 +1036,6 @@ H5V_array_offset_pre(unsigned n, const hsize_t *total_size, const hsize_t *acc,
     FUNC_ENTER_NOAPI(H5V_array_offset_pre, (HDabort(), 0));
 
     assert(n <= H5V_HYPER_NDIMS);
-    assert(total_size);
     assert(acc);
     assert(offset);
 
@@ -1089,7 +1088,7 @@ H5V_array_offset(unsigned n, const hsize_t *total_size, const hssize_t *offset)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, UFAIL, "can't compute down sizes");
 
     /* Set return value */
-    ret_value=H5V_array_offset_pre(n,total_size,acc_arr,offset);
+    ret_value=H5V_array_offset_pre(n,acc_arr,offset);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -1194,7 +1193,7 @@ done:
  */
 herr_t
 H5V_chunk_index(unsigned ndims, const hssize_t *coord, const hsize_t *chunk,
-    const hsize_t *nchunks, const hsize_t *down_nchunks, hsize_t *chunk_idx)
+    const hsize_t *down_nchunks, hsize_t *chunk_idx)
 {
     hssize_t	scaled_coord[H5V_HYPER_NDIMS];	/* Scaled, coordinates, in terms of chunks */
     unsigned    u;                      /* Local index variable */
@@ -1206,7 +1205,6 @@ H5V_chunk_index(unsigned ndims, const hssize_t *coord, const hsize_t *chunk,
     assert(ndims <= H5V_HYPER_NDIMS);
     assert(coord);
     assert(chunk);
-    assert(nchunks);
     assert(chunk_idx);
 
     /* Compute the scaled coordinates for actual coordinates */
@@ -1214,7 +1212,7 @@ H5V_chunk_index(unsigned ndims, const hssize_t *coord, const hsize_t *chunk,
         scaled_coord[u]=coord[u]/chunk[u];
 
     /* Compute the chunk index */
-    *chunk_idx=H5V_array_offset_pre(ndims,nchunks,down_nchunks,scaled_coord);
+    *chunk_idx=H5V_array_offset_pre(ndims,down_nchunks,scaled_coord);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h
index 07692b0..f109e27 100644
--- a/src/H5Vprivate.h
+++ b/src/H5Vprivate.h
@@ -85,15 +85,14 @@ H5_DLL herr_t H5V_array_fill(void *_dst, const void *src, size_t size,
 			      size_t count);
 H5_DLL herr_t H5V_array_down(unsigned n, const hsize_t *total_size,
     hsize_t *down);
-H5_DLL hsize_t H5V_array_offset_pre(unsigned n, const hsize_t *total_size,
+H5_DLL hsize_t H5V_array_offset_pre(unsigned n, 
     const hsize_t *acc, const hssize_t *offset);
 H5_DLL hsize_t H5V_array_offset(unsigned n, const hsize_t *total_size,
     const hssize_t *offset);
 H5_DLL herr_t H5V_array_calc(hsize_t offset, unsigned n,
     const hsize_t *total_size, hssize_t *coords);
 H5_DLL herr_t H5V_chunk_index(unsigned ndims, const hssize_t *coord,
-    const hsize_t *chunk, const hsize_t *nchunks, const hsize_t *down_nchunks,
-    hsize_t *chunk_idx);
+    const hsize_t *chunk, const hsize_t *down_nchunks, hsize_t *chunk_idx);
 H5_DLL ssize_t H5V_memcpyvv(void *_dst,
     size_t dst_max_nseq, size_t *dst_curr_seq, size_t dst_len_arr[], hsize_t dst_off_arr[],
     const void *_src,
diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c
index 89f15cc..e83cd86 100644
--- a/src/H5Zdeflate.c
+++ b/src/H5Zdeflate.c
@@ -48,7 +48,7 @@ const H5Z_class_t H5Z_DEFLATE[1] = {{
     H5Z_filter_deflate,         /* The actual filter function	*/
 }};
 
-#define H5Z_DEFLATE_SIZE_ADJUST(s) (HDceil((double)((s)*1.001))+12)
+#define H5Z_DEFLATE_SIZE_ADJUST(s) (HDceil(((double)(s))*1.001)+12)
 
 
 /*-------------------------------------------------------------------------