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, 17 insertions, 4 deletions

diff --git a/src/Expression.c b/src/Expression.c
index 9876417..bed5d74 100644
--- a/src/Expression.c
+++ b/src/Expression.c
@@ -48,11 +48,16 @@ static int cmpprecendence(const char *op1, const char *op2);
 
 static pToken *newtoken(const char *tokenstart, const char *tokenend);
 
+#if 0
 static void insertbefore(pToken *base, pToken *this);
-static void insertafter(pToken *base, pToken *this);
-static void FreeTokens(pToken *list);
+#endif
 
+#ifdef TEST_HTTP_EVALUATE
 static void printtokens(pToken *start);
+#endif
+
+static void insertafter(pToken *base, pToken *this);
+static void FreeTokens(pToken *list);
 
 /********************************************************************
  ********************* Other Routine Prototypes *********************
@@ -328,9 +333,11 @@ static pToken *Tokenise(const char *expression)
 @@*/
 #define PUSH(stack, stacklength, value) do                        \
 {                                                                 \
-  if(strlen(stack)+strlen(value)+3 > (stacklength))               \
+  int len = strlen(stack)+strlen(value)+3;                        \
+                                                                  \
+  if(len > stacklength)                                           \
   {                                                               \
-    stack = (char *)realloc(stack, strlen(stack)+strlen(value)+3);\
+    stack = (char *)realloc(stack, len);                          \
   }                                                               \
   sprintf(stack,"%s@%s",stack,value);                             \
 } while(0)
@@ -693,6 +700,7 @@ static pToken *newtoken(const char *tokenstart, const char *tokenend)
    @endhistory 
 
 @@*/
+#if 0
 static void insertbefore(pToken *base, pToken *this)
 {
   if(base && this)
@@ -707,6 +715,7 @@ static void insertbefore(pToken *base, pToken *this)
     }
   }
 }
+#endif
     
  /*@@
    @routine    insertafter
@@ -751,6 +760,7 @@ static void insertafter(pToken *base, pToken *this)
    @endhistory 
 
 @@*/
+#if TEST_HTTP_EVALUATE
 static void printtokens(pToken *start)
 {
   pToken *token;
@@ -762,6 +772,7 @@ static void printtokens(pToken *start)
 
   printf("\n");
 }
+#endif /* TEST_HTTP_EVALUATE */
 
  /*@@
    @routine    printstack
@@ -779,6 +790,7 @@ static void printtokens(pToken *start)
    @endhistory 
 
 @@*/
+#if 0
 static void printstack(char *stack)
 {
   char *first;
@@ -792,6 +804,7 @@ static void printstack(char *stack)
     printf("Token is %s\n", token);
   }
 }
+#endif
 
 
 /********************************************************************