X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=loaders.c;h=f277c51bff1e43a3bc0ff3258f0d974edcbaf5f3;hb=3c64dba7a2f09839f3bd99fe27a5229f4da4d592;hp=34bd59ee344f9986b1e05226ca099acb993e8ba0;hpb=0428133610c525457cb16f7ac6a54203a2743d6c;p=privoxy.git diff --git a/loaders.c b/loaders.c index 34bd59ee..f277c51b 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.85 2011/07/30 15:13:32 fabiankeil Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.89 2012/03/09 16:24:36 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -120,7 +120,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 +221,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 +569,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 +923,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 +931,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. @@ -1316,7 +1316,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 +1329,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", @@ -1458,8 +1458,6 @@ int any_loaded_file_changed(const struct file_list *files_to_check) { if (file_has_been_modified(file_to_check->filename, file_to_check->lastmodified)) { - log_error(LOG_LEVEL_INFO, - "File modification detected: %s", file_to_check->filename); return TRUE; } file_to_check = file_to_check->next;