aboutsummaryrefslogtreecommitdiff
path: root/src/Redirect.c
diff options
context:
space:
mode:
authortradke <tradke@1faa4e14-9dd3-4be0-9f0e-ffe519881164>2001-05-19 01:12:45 +0000
committertradke <tradke@1faa4e14-9dd3-4be0-9f0e-ffe519881164>2001-05-19 01:12:45 +0000
commitcffd0ee596d8344c3e26185887c78246906adb98 (patch)
tree8d2c6d9bc427c46241415e97c844bf6a41e643f3 /src/Redirect.c
parentd8f1697495666e3a90f1a6e438ad7111469e2f6a (diff)
Fixed compiler warnings.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusConnect/HTTPD/trunk@130 1faa4e14-9dd3-4be0-9f0e-ffe519881164
Diffstat (limited to 'src/Redirect.c')
-rw-r--r--src/Redirect.c28
1 files changed, 7 insertions, 21 deletions
diff --git a/src/Redirect.c b/src/Redirect.c
index ba04559..c987eaa 100644
--- a/src/Redirect.c
+++ b/src/Redirect.c
@@ -35,7 +35,7 @@ CCTK_FILEVERSION(CactusConnect_HTTPD_Redirect_c)
********************* Local Routine Prototypes *********************
********************************************************************/
-static int RegisterRedirect(void);
+static void RegisterRedirect(void);
static int RedirectPage(cGH *cctkGH, httpRequest *request, void *data);
/********************************************************************
@@ -175,16 +175,7 @@ const char *HTTP_Master(void)
@@*/
int HTTP_IsServer(void)
{
- int retcode;
-
- if(CCTK_MyProc(NULL)==0 || httpredirect)
- {
- retcode = 1;
- }
- else
- {
- retcode = 0;
- }
+ return (CCTK_MyProc (NULL) == 0 || httpredirect);
}
/*@@
@@ -248,7 +239,7 @@ CCTK_INT8 Util_GetHostAddr(char *hostname)
@endhistory
@@*/
-static int RegisterRedirect(void)
+static void RegisterRedirect(void)
{
#ifdef HTTP_DEBUG
printf("Registering Redirection Page");
@@ -277,12 +268,7 @@ static int RegisterRedirect(void)
static int RedirectPage(cGH *cctkGH, httpRequest *request, void *data)
{
int retval;
- char message[10098];
- char title[4098];
- char menu[4098];
- char *dir;
- char *file;
- struct httpLink *hlink;
+ char message[1024];
/* avoid compiler warning about unused parameter */
data = data;
@@ -302,14 +288,14 @@ static int RedirectPage(cGH *cctkGH, httpRequest *request, void *data)
/* Write out the main header part */
HTTP_Write(request, message, strlen(message));
sprintf(message,"<META http-equiv=\"refresh\" content=\"1; URL=http://%s:%u\"></HEAD><body>\n",
- HTTP_Master(),HTTP_Port());
+ HTTP_Master(), (unsigned int) HTTP_Port());
HTTP_Write(request,message,strlen(message));
/* ********** Server Redirect To Master ************* */
sprintf(message,"<p><h1>Redirect to master host=%s:%u</h1><p>\n",
- HTTP_Master(),HTTP_Port());
+ HTTP_Master(), (unsigned int) HTTP_Port());
HTTP_Write(request,message,strlen(message));
- HTTP_ContentFooter(cctkGH, 0, 4096, message);
+ HTTP_ContentFooter(cctkGH, 0, sizeof (message), message);
retval = HTTP_Write(request, message, strlen(message));
return retval;