-const char parsers_rcs[] = "$Id: parsers.c,v 1.49 2002/03/09 20:03:52 jongfoster Exp $";
+const char parsers_rcs[] = "$Id: parsers.c,v 1.53 2002/03/26 22:29:55 swa Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/parsers.c,v $
* and `server_set_cookie'.
*
* Copyright : Written by and Copyright (C) 2001 the SourceForge
- * IJBSWA team. http://ijbswa.sourceforge.net
+ * Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
*
* Revisions :
* $Log: parsers.c,v $
+ * Revision 1.53 2002/03/26 22:29:55 swa
+ * we have a new homepage!
+ *
+ * Revision 1.52 2002/03/24 13:25:43 swa
+ * name change related issues
+ *
+ * Revision 1.51 2002/03/13 00:27:05 jongfoster
+ * Killing warnings
+ *
+ * Revision 1.50 2002/03/12 01:45:35 oes
+ * More verbose logging
+ *
* Revision 1.49 2002/03/09 20:03:52 jongfoster
* - Making various functions return int rather than size_t.
* (Undoing a recent change). Since size_t is unsigned on
return(0);
}
- if (write_socket(fd, iob->cur, len))
+ if (write_socket(fd, iob->cur, (size_t)len))
{
return(-1);
}
* 2 : buf = holds the content to be added to the page
* 3 : n = number of bytes to be added
*
- * Returns : Number of bytes in the content buffer.
+ * Returns : None
*
*********************************************************************/
-size_t add_to_iob(struct client_state *csp, char *buf, size_t n)
+void add_to_iob(struct client_state *csp, char *buf, int n)
{
struct iob *iob = csp->iob;
size_t have, need;
if (n <= 0)
{
- return(have);
+ return;
}
need = have + n;
}
/* copy the new data into the iob buffer */
- memcpy(p, buf, n);
+ memcpy(p, buf, (size_t)n);
/* point to the end of the data */
p += n;
iob->cur = iob->buf;
iob->eod = p;
- return(need);
+ return;
}
iob->cur = p+1;
- if ((q = strchr(ret, '\r'))) *q = '\0';
+ if ((q = strchr(ret, '\r')) != NULL) *q = '\0';
/* is this a blank linke (i.e. the end of the header) ? */
if (*ret == '\0')
*********************************************************************/
jb_err client_referrer(struct client_state *csp, char **header)
{
- const char * newval;
+ const char *newval;
#ifdef FEATURE_FORCE_LOAD
/* Since the referrer can include the prefix even
*********************************************************************/
jb_err client_uagent(struct client_state *csp, char **header)
{
- const char * newval;
+ const char *newval;
if ((csp->action->flags & ACTION_HIDE_USER_AGENT) == 0)
{
*********************************************************************/
jb_err client_from(struct client_state *csp, char **header)
{
- const char * newval;
+ const char *newval;
if ((csp->action->flags & ACTION_HIDE_FROM) == 0)
{
int changed = 0;
/* A variable to store the tag we're working on */
- char * cur_tag;
+ char *cur_tag;
/* Skip "Set-Cookie:" (11 characters) in header */
cur_tag = *header + 11;
while (*cur_tag)
{
/* Find next tag */
- char * next_tag = strchr(cur_tag, ';');
+ char *next_tag = strchr(cur_tag, ';');
if (next_tag != NULL)
{
/* Skip the ';' character itself */
int hits = 0, len = strlen(substring);
char *pos, *p;
- while((pos = strstr(string, substring)))
+ while((pos = strstr(string, substring)) != NULL)
{
p = pos + len;
do