Clean up warning messages

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

6 files changed, 18 insertions, 18 deletions

diff --git a/src/Authorisation.c b/src/Authorisation.c
index 0a4a928..b3e048d 100644
--- a/src/Authorisation.c
+++ b/src/Authorisation.c
@@ -343,13 +343,14 @@ static int VerifyPassword(const char *database,
             retcode = 1;
           }
 #else
-	  CCTK_WARN( 1, "Sorry, crypt(3) not supported in this configuration.\n" );
+	  CCTK_WARN( 1, "Sorry, crypt(3) not supported in this configuration." );
 #endif
         }
         else
         {
-	  CCTK_WARN( 1, "Unknown encryption algorithm: " );
-	  CCTK_WARN( 1, data->encryption_scheme  );
+          CCTK_VWarn(1, __LINE__,__FILE__,CCTK_THORNSTRING,
+                     "Unknown encryption algorithm: %s",
+                     data->encryption_scheme  );
         } 
       }
     }
diff --git a/src/Content.c b/src/Content.c
index cb49695..a2d7e3c 100644
--- a/src/Content.c
+++ b/src/Content.c
@@ -1035,8 +1035,8 @@ static int ControlSet(const cGH *cctkGH, httpRequest *request)
       case 'R' : HTTP_SteerQueue(CCTK_THORNSTRING, "pause", "no");
                  break;
       default  :
-		 CCTK_WARN(1, "Unknown runstate: \n\t" );
-		 CCTK_WARN(1, value );
+        CCTK_VWarn(1, __LINE__,__FILE__,CCTK_THORNSTRING,
+                  "Unknown runstate \"%s\"", value );
     }
   }
 
diff --git a/src/Parameters.c b/src/Parameters.c
index 8336a74..86e5d0e 100644
--- a/src/Parameters.c
+++ b/src/Parameters.c
@@ -313,11 +313,11 @@ static int ThornParameterPage(const cGH *cctkGH, httpRequest *request, void *dat
         while((argument = HTTP_ArgumentWalk(request, first)) != NULL)
         {
           first = 0;
-	  CCTK_WARN( 5, "Setting " );
-	  CCTK_WARN( 5, thorn );
-	  CCTK_WARN( 5, "::" );
-	  CCTK_WARN( 5, HTTP_ArgName( argument) );
-	  CCTK_WARN( 5, HTTP_ArgValue( argument ) );
+          CCTK_VWarn(5, __LINE__,__FILE__,CCTK_THORNSTRING,
+                     "Setting %s::%s%s",
+                     thorn,
+                     HTTP_ArgName( argument),
+                     HTTP_ArgValue( argument ) );
           HTTP_SteerQueue(thorn, HTTP_ArgName( argument),
                           HTTP_ArgValue( argument ));
         }
diff --git a/src/Server.c b/src/Server.c
index bd8b8a6..5959c9c 100644
--- a/src/Server.c
+++ b/src/Server.c
@@ -169,8 +169,8 @@ int HTTP_RegisterPage(const char *path, int (*function)(const cGH *, httpRequest
 
   if(Util_HashData(pages, strlen(path), path, 0))
   {
-    CCTK_WARN( 1, "Page already exists:\n" );
-    CCTK_WARN( 1, path );
+    CCTK_VWarn(1, __LINE__,__FILE__,CCTK_THORNSTRING,
+               "Page exists already:\n\"%s\"", path);
   }
   else
   {
diff --git a/src/Sockets.c b/src/Sockets.c
index 8d36ae8..33401ee 100644
--- a/src/Sockets.c
+++ b/src/Sockets.c
@@ -150,7 +150,7 @@ int HTTP_SetupServer(int port, int queue_size, int hunt)
   sock = Socket_TCPOpenServerSocket (port, hunt ? &realport : NULL, queue_size);
   if (sock == INVALID_SOCKET)
   {
-    CCTK_WARN (0, "HTTPD Failed to create server socket\n");
+    CCTK_WARN (0, "HTTPD Failed to create server socket");
   }
 
   Util_GetHostName(hostname, sizeof(hostname));
diff --git a/src/http.c b/src/http.c
index 3254954..91fffa0 100644
--- a/src/http.c
+++ b/src/http.c
@@ -628,8 +628,8 @@ static int AddHeader(httpRequest *request, const char *line)
   }
   else
   {
-    CCTK_WARN( 1, "Invalid header line:\n" );
-    CCTK_WARN( 1, line );
+    CCTK_VWarn(1, __LINE__,__FILE__,CCTK_THORNSTRING,
+               "Invalid header line:\n\"%s\"", line );
   }
   
   if(value)
@@ -780,9 +780,8 @@ static int StripArgs(httpRequest *request, char *request_uri)
       }
       else
       {
-          CCTK_WARN( 1, "Argument " );
-          CCTK_WARN( 1, token );
-          CCTK_WARN( 1, " has no value!\n" );
+        CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING,
+                    "Argument \"%s\" has no value!", token );
       }     
       token=strtok(NULL, "&");  
     }