Fixing compiler warnings about unused variables, missing prototypes,

and return values.
Fixing CactusPUGH-PUGH 264.


Thomas


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@176 b61c5cb5-eaca-4651-9a7a-d64986f99364

10 files changed, 23 insertions, 13 deletions

diff --git a/src/Comm.c b/src/Comm.c
index 9c4bc36..2259f0c 100644
--- a/src/Comm.c
+++ b/src/Comm.c
@@ -1159,6 +1159,7 @@ int pugh_SyncGFs(pGH *pughGH, int first_var, int n_vars, int timelevel)
       {
         int id = i*4;
         
+        GF = (pGF *) (pughGH->variables [i][timelevel]);
         if (GF->docomm[2*Dir] &&
             GF->storage) 
         {
diff --git a/src/GHExtension.c b/src/GHExtension.c
index 5810014..d9caf11 100644
--- a/src/GHExtension.c
+++ b/src/GHExtension.c
@@ -50,7 +50,6 @@ void *pugh_SetupGH(tFleshConfig *config,
   int   *ghostsize;
   int   *groupghostsize;
   int   *groupsize;
-  int    dir;
   cGroup pgroup;
   pGH    *newGH;
 
diff --git a/src/LoadAware.c b/src/LoadAware.c
index 2ba829e..dda77eb 100644
--- a/src/LoadAware.c
+++ b/src/LoadAware.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #include "pugh.h"
@@ -132,7 +133,7 @@ int pugh_GetBounds(int dim, int **bounds, int *nprocs, int *nsize) {
 
   DECLARE_CCTK_PARAMETERS                                                   
 
-  int dir, i;
+  int retval = 0;
 
   switch (dim) {
   case 1:
@@ -155,10 +156,12 @@ int pugh_GetBounds(int dim, int **bounds, int *nprocs, int *nsize) {
     break;
   default:
     CCTK_WARN(1,"Only 1D, 2D, and 3D supported");
+    retval = -1;
     break;
 
   }
 
+  return retval;
 }
 
 
diff --git a/src/PostSendGA.c b/src/PostSendGA.c
index 732ce52..132546d 100644
--- a/src/PostSendGA.c
+++ b/src/PostSendGA.c
@@ -57,7 +57,6 @@ void PostSendGA(pGH *GH, pGA *GA, int dir)
   double ts, tw, tp;
   MPI_Datatype mpi_type;
   MPI_Datatype *send_dt;
-  MPI_Status ms;
 
   if (!(GA->storage)) 
   {
diff --git a/src/SetupPGF.c b/src/SetupPGF.c
index 6d55fa8..e4b6402 100644
--- a/src/SetupPGF.c
+++ b/src/SetupPGF.c
@@ -205,7 +205,9 @@ int EnableGFDataStorage(pGH *GH, pGF *GF)
 {
   DECLARE_CCTK_PARAMETERS
   int i, dir, sz, ldir;
+#if 0
   int special_pad, cache_size, start;
+#endif
   static int ive_blathered = 0;
   char *temp_byte;
 
diff --git a/src/SetupPGH.c b/src/SetupPGH.c
index db43430..53e7f12 100644
--- a/src/SetupPGH.c
+++ b/src/SetupPGH.c
@@ -134,10 +134,6 @@ pGH *PUGH_SetupPGH(void *callerid,
 
 int pGH_SetupnProcs(pGH *GH, int dim)
 {
-
-  int i,j,k,idir;
-  int *nproc;
-
 #ifdef MPI
   CCTK_REAL4 sum_sizes [2], compiled_sizes [2];
 #endif 
@@ -187,6 +183,7 @@ int pGH_SetupnProcs(pGH *GH, int dim)
   GH->myproc = 0;
 #endif
 
+  return 0;
 }
 
 void pGH_SetupBasics(pGH *GH, 
@@ -196,7 +193,7 @@ void pGH_SetupBasics(pGH *GH,
                      int staggertype) 
 {
 
-  int i,j,k,idir;
+  int i,j,k;
 
   DECLARE_CCTK_PARAMETERS;
 
@@ -315,7 +312,6 @@ void pGH_SetupBounds(pGH *GH)
 void pGH_SetupOwnership(pGH *GH,int dim) 
 {
   int idir,i,j,k,dir,staglcv;
-  int *one;
 #ifdef MPI
   int dirs[3];
 #endif
@@ -691,7 +687,7 @@ break;
 
 void pGH_SetupStaggering(pGH *GH, int dim) 
 {
-  int s,d,k,i,dir;
+  int s,d,k,dir;
   int *upperbnd;
 
   upperbnd = (int*) malloc(dim*sizeof(int));
diff --git a/src/SetupPGV.c b/src/SetupPGV.c
index b0642ea..f48396a 100644
--- a/src/SetupPGV.c
+++ b/src/SetupPGV.c
@@ -1099,7 +1099,7 @@ int pugh_SetupBoundingBox(int dim,
                           int *nprocs,
                           pGExtras *this)
 {
-  int pnum,dir, i;
+  int pnum,dir;
 
   int **bounds;
   int *pos;
diff --git a/src/include/pugh.h b/src/include/pugh.h
index 6a41e02..41869c6 100644
--- a/src/include/pugh.h
+++ b/src/include/pugh.h
@@ -119,6 +119,17 @@ int pugh_GFGhostsize(int dim,
 
 pGH *pugh_pGH(cGH *GH);
 
+int GetSliceSizes(int np,
+                  int grid_points,
+                  char *slicesS,
+                  int **slices,
+                  int manual);
+
+int pugh_GetBounds(int dim,
+                   int **bounds,
+                   int *nprocs,
+                   int *nsize);
+
 #ifdef _cplusplus
 }
 #endif
diff --git a/src/pGF_PostSend.c b/src/pGF_PostSend.c
index 68a3b5f..2aed146 100644
--- a/src/pGF_PostSend.c
+++ b/src/pGF_PostSend.c
@@ -57,7 +57,6 @@ void pGF_PostSend(pGH *GH, pGF *GF, int dir)
   double ts, tw, tp;
   MPI_Datatype mpi_type;
   MPI_Datatype *send_dt;
-  MPI_Status ms;
 
   /* Return if GF has no storage */
   if (!(GF->storage)) return;
diff --git a/src/pugh_BoundingBox.c b/src/pugh_BoundingBox.c
index 4af0049..93acbe4 100644
--- a/src/pugh_BoundingBox.c
+++ b/src/pugh_BoundingBox.c
@@ -62,7 +62,7 @@ void BoundingBox3D(pGH *GH, int *nproc, int staggertype)
 {
   DECLARE_CCTK_PARAMETERS                                                   
 
-  int i,j,k,idir;
+  int i,j,k;
   int *lX, *lY, *lZ;
 
 #ifdef DEBUG_BB