X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loaders.c;h=f402406f347176e27d0e6daabe96cc40b13898ee;hp=a3f91ab8f0428336ba8d3236ba3dae318244664b;hb=6d2de29c307782cb6b8871b12dcf7a1d86f62471;hpb=d1c06dcb630d51c2b66a662ae271c0ba6a703569

diff --git a/loaders.c b/loaders.c
index a3f91ab8..f402406f 100644
--- a/loaders.c
+++ b/loaders.c
@@ -1,4 +1,4 @@
-const char loaders_rcs[] = "$Id: loaders.c,v 1.86 2011/09/04 11:10:56 fabiankeil Exp $";
+const char loaders_rcs[] = "$Id: loaders.c,v 1.90 2012/03/09 17:55:50 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loaders.c,v $
@@ -81,11 +81,6 @@ static struct file_list *current_re_filterfile[MAX_AF_FILES]  = {
    NULL, NULL, NULL, NULL, NULL
 };
 
-/*
- * Pseudo filter type for load_one_re_filterfile
- */
-#define NO_NEW_FILTER -1
-
 
 /*********************************************************************
  *
@@ -120,7 +115,7 @@ unsigned int sweep(void)
    unsigned int active_threads = 0;
 
    /* clear all of the file's active flags */
-   for ( fl = files->next; NULL != fl; fl = fl->next )
+   for (fl = files->next; NULL != fl; fl = fl->next)
    {
       fl->active = 0;
    }
@@ -221,7 +216,7 @@ unsigned int sweep(void)
 
    while (fl != NULL)
    {
-      if ( ( 0 == fl->active ) && ( NULL != fl->unloader ) )
+      if ((0 == fl->active) && (NULL != fl->unloader))
       {
          nfl->next = fl->next;
 
@@ -569,8 +564,8 @@ jb_err edit_read_line(FILE *fp,
 
    /* Main loop.  Loop while we need more data & it's not EOF. */
 
-   while ( (contflag || is_empty)
-        && (JB_ERR_OK == (rval = simple_read_line(fp, &linebuf, newline))))
+   while ((contflag || is_empty)
+       && (JB_ERR_OK == (rval = simple_read_line(fp, &linebuf, newline))))
    {
       if (line_number)
       {
@@ -923,7 +918,7 @@ int load_trustfile(struct client_state *csp)
        */
       if (trusted)
       {
-         if(++trusted_referrers < MAX_TRUSTED_REFERRERS)
+         if (++trusted_referrers < MAX_TRUSTED_REFERRERS)
          {
             *tl++ = b->url;
          }
@@ -931,7 +926,7 @@ int load_trustfile(struct client_state *csp)
       freez(buf);
    }
 
-   if(trusted_referrers >= MAX_TRUSTED_REFERRERS)
+   if (trusted_referrers >= MAX_TRUSTED_REFERRERS)
    {
       /*
        * FIXME: ... after Privoxy 3.0.4 is out.
@@ -1152,7 +1147,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
     */
    while (read_config_line(fp, &linenum, &buf) != NULL)
    {
-      int new_filter = NO_NEW_FILTER;
+      enum filter_type new_filter = FT_INVALID_FILTER;
 
       if (strncmp(buf, "FILTER:", 7) == 0)
       {
@@ -1179,7 +1174,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
        * If this is the head of a new filter block, make it a
        * re_filterfile spec of its own and chain it to the list:
        */
-      if (new_filter != NO_NEW_FILTER)
+      if (new_filter != FT_INVALID_FILTER)
       {
          new_bl = (struct re_filterfile_spec  *)zalloc(sizeof(*bl));
          if (new_bl == NULL)
@@ -1316,7 +1311,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
    /*
     * Schedule the now-obsolete old data for unloading
     */
-   if ( NULL != current_re_filterfile[fileid] )
+   if (NULL != current_re_filterfile[fileid])
    {
       current_re_filterfile[fileid]->unloader = unload_re_filterfile;
    }
@@ -1329,7 +1324,7 @@ int load_one_re_filterfile(struct client_state *csp, int fileid)
    current_re_filterfile[fileid] = fs;
    csp->rlist[fileid] = fs;
 
-   return( 0 );
+   return(0);
 
 load_re_filterfile_error:
    log_error(LOG_LEVEL_FATAL, "can't load re_filterfile '%s': %E",