Fixing a few warnings (lots left) and the FILE_VERSIONs

git-svn-id: http://svn.cactuscode.org/arrangements/CactusConnect/HTTPD/trunk@117 1faa4e14-9dd3-4be0-9f0e-ffe519881164

11 files changed, 18 insertions, 12 deletions

diff --git a/src/Authorisation.c b/src/Authorisation.c
index 92b0885..5b10df7 100644
--- a/src/Authorisation.c
+++ b/src/Authorisation.c
@@ -32,7 +32,7 @@
 
 static char *rcsid = "$Header$";
 
-CCTK_FILEVERSION(DevThorns_httpd_Authorisation_c)
+CCTK_FILEVERSION(CactusConnect_HTTPD_Authorisation_c)
 
 /********************************************************************
  *********************     Local Data Types   ***********************
diff --git a/src/Content.c b/src/Content.c
index 2c8992b..8745f26 100644
--- a/src/Content.c
+++ b/src/Content.c
@@ -39,7 +39,7 @@
 
 static char *rcsid = "$Header$";
 
-CCTK_FILEVERSION(DevThorns_httpd_Content_c)
+CCTK_FILEVERSION(CactusConnect_HTTPD_Content_c)
 
 /********************************************************************
  *********************     Local Data Types   ***********************
diff --git a/src/Cookies.c b/src/Cookies.c
index 9525832..b5e996e 100644
--- a/src/Cookies.c
+++ b/src/Cookies.c
@@ -20,7 +20,7 @@
 
 static char *rcsid = "$Header$";
 
-CCTK_FILEVERSION(DevThorns_httpd_Cookies_c)
+CCTK_FILEVERSION(CactusConnect_HTTPD_Cookies_c)
 
 /********************************************************************
  *********************     Local Data Types   ***********************
diff --git a/src/Groups.c b/src/Groups.c
index bc22c3f..3e13ba7 100644
--- a/src/Groups.c
+++ b/src/Groups.c
@@ -21,7 +21,7 @@
 
 static char *rcsid = "$Header$";
 
-CCTK_FILEVERSION(DevThorns_httpd_Groups_c)
+CCTK_FILEVERSION(CactusConnect_HTTPD_Groups_c)
 
 /********************************************************************
  *********************     Local Data Types   ***********************
@@ -33,12 +33,14 @@ CCTK_FILEVERSION(DevThorns_httpd_Groups_c)
 
 static int GroupsPage(cGH *cctkGH, httpRequest *request, void *data);
 
-static int watch[1024];
+/*static int watch[1024];*/
 
 /********************************************************************
  ********************* Other Routine Prototypes *********************
  ********************************************************************/
 
+int HTTPi_RegisterGroupsPages(void);
+
 /********************************************************************
  *********************     Local Data   *****************************
  ********************************************************************/
@@ -100,6 +102,10 @@ static int GroupsPage(cGH *cctkGH, httpRequest *request, void *data)
   cGroup gdata;
   char *groupname;
 
+  /* Avoid warnings */
+  void *cctk_dummy_pointer=NULL;
+  cctk_dummy_pointer=(void *)data;
+
   /* Status message */
   strcpy(message,"HTTP/1.0 200 OK\r\n");
   
diff --git a/src/Headers.c b/src/Headers.c
index d9646ed..50d6700 100644
--- a/src/Headers.c
+++ b/src/Headers.c
@@ -15,7 +15,7 @@
 
 static char *rcsid = "$Header$";
 
-CCTK_FILEVERSION(DevThorns_httpd_Headers_c)
+CCTK_FILEVERSION(CactusConnect_HTTPD_Headers_c)
 
 /********************************************************************
  *********************     Local Data Types   ***********************
diff --git a/src/Parameters.c b/src/Parameters.c
index 16e122d..f8f2420 100644
--- a/src/Parameters.c
+++ b/src/Parameters.c
@@ -36,7 +36,7 @@
 
 static char *rcsid = "$Header$";
 
-CCTK_FILEVERSION(DevThorns_httpd_Parameters_c)
+CCTK_FILEVERSION(CactusConnect_HTTPD_Parameters_c)
 
 /********************************************************************
  *********************     Local Data Types   ***********************
diff --git a/src/Server.c b/src/Server.c
index 8b928fb..70db391 100644
--- a/src/Server.c
+++ b/src/Server.c
@@ -29,7 +29,7 @@
 
 static char *rcsid = "$Header$";
 
-CCTK_FILEVERSION(DevThorns_httpd_Server_c)
+CCTK_FILEVERSION(CactusConnect_HTTPD_Server_c)
 
 /********************************************************************
  *********************     Local Data Types   ***********************
diff --git a/src/Sockets.c b/src/Sockets.c
index 36f273b..9d52218 100644
--- a/src/Sockets.c
+++ b/src/Sockets.c
@@ -50,7 +50,7 @@
 
 static char *rcsid = "$Header$";
 
-CCTK_FILEVERSION(DevThorns_httpd_Socket_c)
+CCTK_FILEVERSION(CactusConnect_HTTPD_Socket_c)
 
 /********************************************************************
  *********************     Local Data Types   ***********************
diff --git a/src/Steer.c b/src/Steer.c
index f54bd26..0fdea7f 100644
--- a/src/Steer.c
+++ b/src/Steer.c
@@ -34,7 +34,7 @@
 static char *rcsid = "$Header$";
 
 #ifdef CCTK_FILEVERSION
-CCTK_FILEVERSION(DevThorns_httpd_Steer_c)
+CCTK_FILEVERSION(CactusConnect_HTTPD_Steer_c)
 #endif
 
 /********************************************************************
diff --git a/src/Thorns.c b/src/Thorns.c
index e84150a..caec028 100644
--- a/src/Thorns.c
+++ b/src/Thorns.c
@@ -20,7 +20,7 @@
 
 static char *rcsid = "$Header$";
 
-CCTK_FILEVERSION(DevThorns_httpd_Thorns_c)
+CCTK_FILEVERSION(CactusConnect_HTTPD_Thorns_c)
 
 /********************************************************************
  *********************     Local Data Types   ***********************
diff --git a/src/http.c b/src/http.c
index d97d779..298cfe2 100644
--- a/src/http.c
+++ b/src/http.c
@@ -21,7 +21,7 @@
 
 static char *rcsid = "$Header$";
 
-CCTK_FILEVERSION(DevThorns_httpd_http_c)
+CCTK_FILEVERSION(CactusConnect_HTTPD_http_c)
 
 /********************************************************************
  *********************     Local Data Types   ***********************