Fixed most of the compiler warnings.

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

1 files changed, 8 insertions, 4 deletions

diff --git a/src/http.c b/src/http.c
index 298cfe2..546ba7d 100644
--- a/src/http.c
+++ b/src/http.c
@@ -112,6 +112,10 @@ int HTTP_ReadFromClient(cGH *cctkGH, void *connection)
   {
     keepalive = DealWithRequest(cctkGH, &request, buffer, nbytes);
   }
+  else
+  {
+    keepalive = 0;
+  }
 
   if(keepalive)
   {
@@ -301,9 +305,7 @@ static int DealWithRequest(cGH *cctkGH, httpRequest *request, char *buffer, int
 {
   char *line;
   char *tmp;
-  int size;
   int start;
-  char *token;
   char *method;
   char *request_uri;
   char *http_version;
@@ -382,7 +384,7 @@ static int DealWithRequest(cGH *cctkGH, httpRequest *request, char *buffer, int
   printf("Start of request header\n");
 #endif
 
-  while(line = NextLine(tmp, &start, bufsize))
+  while((line = NextLine(tmp, &start, bufsize)) != NULL)
   {
     if(! request->body && *line != 0)
     {
@@ -456,6 +458,8 @@ static int AddHeader(httpRequest *request, const char *line)
   char *temp;
   struct httpHeader *header_line;
 
+  keylength = -1;
+
   /* Split the string */
   value = strchr(line, ':');
 
@@ -557,7 +561,7 @@ static int StripArgs(httpRequest *request, char *request_uri)
     request->arguments = Util_HashCreate(INITIAL_SIZE);
 
     /* Parse the argument list */
-    *position++;
+    position++;
 
     token = strtok(position, "&");