See bug 1715

Changed a couple of stray calls to 'exit' to CCTK_WARN( 0, ... ),
rewrote code to avoid another.


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

2 files changed, 7 insertions, 8 deletions

diff --git a/src/Expression.c b/src/Expression.c
index dd84a5f..c8d5f49 100644
--- a/src/Expression.c
+++ b/src/Expression.c
@@ -792,15 +792,15 @@ int main(int argc, char *argv[])
   if(argc < 2)
   {
     printf("Usage: %s \"string\"\n", argv[0]);
-    exit(0);
   }
+  else
+  {
+    buffer = HTTP_ExpressionParse(argv[1]);
 
-  buffer = HTTP_ExpressionParse(argv[1]);
-
-  printf("Value is %f\n", HTTP_ExpressionEvaluate(buffer, evaluator,NULL)); 
+    printf("Value is %f\n", HTTP_ExpressionEvaluate(buffer, evaluator,NULL)); 
   
-  free(buffer);
-
+    free(buffer);
+  }
   return 0;
 }
   
diff --git a/src/Sockets.c b/src/Sockets.c
index 8ec9f46..42b06d1 100644
--- a/src/Sockets.c
+++ b/src/Sockets.c
@@ -149,8 +149,7 @@ int HTTP_SetupServer(int port, int queue_size, int hunt)
   sock = Socket_TCPOpenServerSocket (port, hunt ? &realport : NULL, queue_size);
   if (sock == INVALID_SOCKET)
   {
-    fprintf (stderr, "Failed to create server socket\n");
-    exit (EXIT_FAILURE);
+    CCTK_WARN (0, "HTTPD Failed to create server socket\n");
   }
 
   Util_GetHostName(hostname, sizeof(hostname));