X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=project.h;h=263aae0590f7f11db997b2fa05a9938d51213ad9;hb=55a9f2bd2e3b77f62e3eca2e24d5b18bcb2b5dfe;hp=86252656c2ae2fc5fab936f8e9cb66ffef6c5229;hpb=52bd067225c1e12ecf7156e5707161ed7df8e8c4;p=privoxy.git diff --git a/project.h b/project.h index 86252656..263aae05 100644 --- a/project.h +++ b/project.h @@ -1,6 +1,6 @@ #ifndef PROJECT_H_INCLUDED #define PROJECT_H_INCLUDED -#define PROJECT_H_VERSION "$Id: project.h,v 1.54 2002/03/09 20:03:52 jongfoster Exp $" +#define PROJECT_H_VERSION "$Id: project.h,v 1.57 2002/03/16 20:28:34 oes Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/project.h,v $ @@ -10,7 +10,7 @@ * (though it does declare some macros). * * Copyright : Written by and Copyright (C) 2001 the SourceForge - * IJBSWA team. http://ijbswa.sourceforge.net + * Privoxy team. http://ijbswa.sourceforge.net * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -36,6 +36,15 @@ * * Revisions : * $Log: project.h,v $ + * Revision 1.57 2002/03/16 20:28:34 oes + * Added descriptions to the filters so users will know what they select in the cgi editor + * + * Revision 1.56 2002/03/13 20:27:30 oes + * Fixing bug with CT_TABOO + * + * Revision 1.55 2002/03/12 01:42:50 oes + * Introduced modular filters + * * Revision 1.54 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 @@ -633,10 +642,10 @@ struct iob #define IOB_PEEK(CSP) ((CSP->iob->cur > CSP->iob->eod) ? (CSP->iob->eod - CSP->iob->cur) : 0) #define IOB_RESET(CSP) if(CSP->iob->buf) free(CSP->iob->buf); memset(CSP->iob, '\0', sizeof(CSP->iob)); -/* Keys for csp->content_type */ +/* Bits for csp->content_type */ #define CT_TEXT 1 /* Suitable for pcrs filtering */ #define CT_GIF 2 /* Suitable for GIF filtering */ -#define CT_TABOO 3 /* DONT filter */ +#define CT_TABOO 4 /* DONT filter */ #define ACTION_MASK_ALL (~0U) @@ -929,7 +938,8 @@ struct forward_spec */ struct re_filterfile_spec { - char *filtername; /* Name from FILTER: statement in re_filterfile (or "default") */ + char *name; /* Name from FILTER: statement in re_filterfile */ + char *description; /* Description from FILTER: statement in re_filterfile */ struct list patterns[1]; /* The patterns from the re_filterfile */ pcrs_job *joblist; /* The resulting compiled pcrs_jobs */ struct re_filterfile_spec *next; /* The pointer for chaining */