Fix compiler warnings:

*  Add missing prototypes.
*  Cast output of sizeof() to int, to avoid comparison of signed with
   unsigned ints.
*  Change & to && in SpaceMask_get_free_bits, which I think was intended.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/SpaceMask/trunk@24 a491c6a4-70bf-4b89-8b36-d6c0cb1f094e

2 files changed, 38 insertions, 8 deletions

diff --git a/src/MaskInit.c b/src/MaskInit.c
index 3d7309a..5595f10 100644
--- a/src/MaskInit.c
+++ b/src/MaskInit.c
@@ -20,7 +20,7 @@
 
 static const char *rcsid = "$Header$";
 
-CCTK_FILEVERSION(CactusEinstein_Einstein_MaskInit_c)
+CCTK_FILEVERSION(CactusEinstein_Einstein_MaskInit_c);
 
 
 /********************************************************************
@@ -36,11 +36,16 @@ CCTK_FILEVERSION(CactusEinstein_Einstein_MaskInit_c)
  ********************************************************************/
 
 void MaskOne(CCTK_ARGUMENTS);
+void MaskSym(CCTK_ARGUMENTS);
+void MaskSym_emask(CCTK_ARGUMENTS);
+void MaskZero(CCTK_ARGUMENTS);
 
 /********************************************************************
  ********************* Other Routine Prototypes *********************
  ********************************************************************/
 
+void SetupSpaceMaskRegistry (void);
+
 /********************************************************************
  *********************     Local Data   *****************************
  ********************************************************************/
@@ -60,13 +65,13 @@ void MaskOne(CCTK_ARGUMENTS);
 void SetupSpaceMaskRegistry (void)
 {
   SpaceMask_Registry* spacemask_registry;
-
+  
   spacemask_registry = (SpaceMask_Registry*) malloc
     (sizeof(SpaceMask_Registry));
-
+  
   spacemask_registry->ntypes=0;
   spacemask_registry->type_list = NULL;
-
+  
   return;
 }
 
@@ -190,4 +195,3 @@ void MaskZero(CCTK_ARGUMENTS)
 /********************************************************************
  *********************     Local Routines   *************************
  ********************************************************************/
-
diff --git a/src/MaskUtils.c b/src/MaskUtils.c
index d2ea5f6..9dd064d 100644
--- a/src/MaskUtils.c
+++ b/src/MaskUtils.c
@@ -23,6 +23,33 @@ CCTK_FILEVERSION(CACTUSEINSTEIN_SPACEMASK_MaskUtils_c);
 
 SpaceMask_Registry* spacemask_registry = NULL;
 
+/* Prototypes */
+int SpaceMask_get_bit_nbr(int nstates);
+CCTK_INT SpaceMask_get_free_bits(int nbits);
+CCTK_INT* SpaceMask_determine_state_mask(CCTK_INT allocated_bits, int nstates);
+SpaceMask_State* SpaceMask_setup_new_state(CCTK_INT state_mask, char* name);
+SpaceMask_Type* SpaceMask_setup_new_type(CCTK_INT new_bits, char* type_name,
+					 int nstates, char** state_list, 
+					 CCTK_INT* state_mask);
+void SpaceMask_append_type_to_registry(SpaceMask_Type* new_type);
+int SpaceMask_RegisterType(char* type_name, int nstates, char** state_list);
+int SpaceMask_AppendStatesToType(char* type_name, int nstates, char** state_list);
+CCTK_INT SpaceMask_GetTypeBits(char* type_name);
+CCTK_INT SpaceMask_GetStateBits(char* type_name, char* state_name);
+void SpaceMask_SetState(CCTK_INT* mask, int point, char* type_name, char* state);
+int SpaceMask_CheckState(CCTK_INT* mask, int point, char* type_name, char* state);
+
+void CCTK_FCALL CCTK_FNAME(SpaceMask_GetTypeBits)(CCTK_INT* type_bits,
+						  ONE_FORTSTRING_ARG);
+void CCTK_FCALL CCTK_FNAME(SpaceMask_GetStateBits)(CCTK_INT* state_bits,
+						   TWO_FORTSTRING_ARG);
+void CCTK_FCALL CCTK_FNAME(SpaceMask_SetState)(CCTK_INT* mask,
+					       CCTK_INT* point, TWO_FORTSTRING_ARG);
+void CCTK_FCALL CCTK_FNAME(SpaceMask_CheckState)(int* retval,
+						 CCTK_INT* mask,
+						 CCTK_INT* point,
+						 TWO_FORTSTRING_ARG);
+
 /*@@
   @routine    SpaceMask_get_bit_nbr
   @author     Denis Pollney
@@ -78,7 +105,7 @@ SpaceMask_get_free_bits(int nbits)
   n=1;
   new_bits = 0;
   j = 0;
-  for (i=0; i<sizeof(CCTK_INT)*8 & j<nbits; ++i)
+  for (i=0; i < (int) sizeof(CCTK_INT)*8 && j<nbits; ++i)
     {
       if (!(n & used_bits))
 	{
@@ -125,7 +152,7 @@ SpaceMask_determine_state_mask(CCTK_INT allocated_bits, int nstates)
   n=1;
   bit=1;
 
-  for (i=0; i<sizeof(CCTK_INT)*8; ++i)
+  for (i=0; i < (int) sizeof(CCTK_INT)*8; ++i)
     {
       if (n & allocated_bits)
 	{
@@ -442,7 +469,6 @@ SpaceMask_CheckState(CCTK_INT* mask, int point, char* type_name, char* state)
   return SpaceMask_CheckStateBits(mask, point, type_bits, state_bits);
 }
 
-
 /********************************************************************
  *********************  Fortran Wrappers  ***************************
  ********************************************************************/