add casting from size_t to int for printf()

[privoxy.git] / parsers.c

diff --git a/parsers.c b/parsers.c
index f749617..50539f0 100644 (file)
--- a/parsers.c
+++ b/parsers.c
@@ -1,4 +1,4 @@
-const char parsers_rcs[] = "$Id: parsers.c,v 1.23 2001/09/12 18:08:19 steudten Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.26 2001/09/16 17:05:14 jongfoster Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/parsers.c,v $
@@ -41,6 +41,15 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.23 2001/09/12 18:08:19 steudten E
  *
  * Revisions   :
  *    $Log: parsers.c,v $
+ *    Revision 1.26  2001/09/16 17:05:14  jongfoster
+ *    Removing unused #include showarg.h
+ *
+ *    Revision 1.25  2001/09/16 13:21:27  jongfoster
+ *    Changes to use new list functions.
+ *
+ *    Revision 1.24  2001/09/13 23:05:50  jongfoster
+ *    Changing the string paramater to the header parsers a "const".
+ *
  *    Revision 1.23  2001/09/12 18:08:19  steudten
  *
  *    In parse_http_request() header rewriting miss the host value, so
@@ -238,7 +247,6 @@ const char parsers_rcs[] = "$Id: parsers.c,v 1.23 2001/09/12 18:08:19 steudten E
 #include "encode.h"
 #include "filters.h"
 #include "loaders.h"
-#include "showargs.h"
 #include "jcc.h"
 #include "ssplit.h"
 #include "errlog.h"
@@ -489,14 +497,14 @@ char *get_header(struct client_state *csp)
  *********************************************************************/
 char *sed(const struct parsers pats[], void (* const more_headers[])(struct client_state *), struct client_state *csp)
 {
-   struct list *p;
+   struct list_entry *p;
    const struct parsers *v;
    char *hdr;
    void (* const *f)();
 
    for (v = pats; v->str ; v++)
    {
-      for (p = csp->headers->next; p ; p = p->next)
+      for (p = csp->headers->first; p ; p = p->next)
       {
          /* Header crunch()ed in previous run? -> ignore */
          if (p->str == NULL) continue;
@@ -506,7 +514,7 @@ char *sed(const struct parsers pats[], void (* const more_headers[])(struct clie
          if (strncmpic(p->str, v->str, v->len) == 0)
          {
             hdr = v->parser(v, p->str, csp);
-            freez(p->str);
+            freez((char *)p->str); /* FIXME: Yuck! patching a list...*/
             p->str = hdr;
          }
       }
@@ -776,9 +784,9 @@ char *content_length(const struct parsers *v, const char *s, struct client_state
    if (csp->content_length != 0) /* Content has been modified */
    {
       char * s2 = (char *) zalloc(100);
-      sprintf(s2, "Content-Length: %d", csp->content_length);
+      sprintf(s2, "Content-Length: %d", (int) csp->content_length);
 
-         log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", csp->content_length);
+         log_error(LOG_LEVEL_HEADER, "Adjust Content-Length to %d", (int) csp->content_length);
       return(s2);
    }
    else
@@ -865,13 +873,13 @@ char *client_referrer(const struct parsers *v, const char *s, struct client_stat
       /*
        * We have a specific (fixed) referer we want to send.
        */
-      char * s2;
+      char * s3;
 
       log_error(LOG_LEVEL_HEADER, "modified");
 
-      s2 = strsav( NULL, "Referer: " );
-      s2 = strsav( s2, newval );
-      return(s2);
+      s3 = strsav( NULL, "Referer: " );
+      s3 = strsav( s3, newval );
+      return(s3);
    }
 
    /* Should never get here! */
@@ -1150,11 +1158,11 @@ char *client_accept(const struct parsers *v, const char *s, struct client_state
  *********************************************************************/
 void client_cookie_adder(struct client_state *csp)
 {
-   struct list *lst;
+   struct list_entry *lst;
    char *tmp = NULL;
    char *e;
 
-   for (lst = csp->cookie_list->next; lst ; lst = lst->next)
+   for (lst = csp->cookie_list->first; lst ; lst = lst->next)
    {
       if (tmp)
       {
@@ -1163,7 +1171,7 @@ void client_cookie_adder(struct client_state *csp)
       tmp = strsav(tmp, lst->str);
    }
 
-   for (lst = csp->action->multi[ACTION_MULTI_WAFER]->next;  lst ; lst = lst->next)
+   for (lst = csp->action->multi[ACTION_MULTI_WAFER]->first;  lst ; lst = lst->next)
    {
       if (tmp)
       {
@@ -1206,9 +1214,9 @@ void client_cookie_adder(struct client_state *csp)
  *********************************************************************/
 void client_xtra_adder(struct client_state *csp)
 {
-   struct list *lst;
+   struct list_entry *lst;
 
-   for (lst = csp->action->multi[ACTION_MULTI_ADD_HEADER]->next;
+   for (lst = csp->action->multi[ACTION_MULTI_ADD_HEADER]->first;
         lst ; lst = lst->next)
    {
       log_error(LOG_LEVEL_HEADER, "addh: %s", lst->str);