X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=loaders.c;h=47dc61d0a93c80bbb2e1beae88707c71af642d69;hb=ddfc78740ab34144a83a0f589fc0a867270ed262;hp=d196f64578faed23143e14ce94d192a1d78494d5;hpb=4fe40027ab84df2690aaa393494e6fd1279f0b2f;p=privoxy.git diff --git a/loaders.c b/loaders.c index d196f645..47dc61d0 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.76 2010/07/21 14:35:09 fabiankeil Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.79 2011/01/14 19:47:16 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -765,7 +765,7 @@ char *read_config_line(char *buf, size_t buflen, FILE *fp, unsigned long *linenu if (strlen(buf2) + 1U > buflen) { log_error(LOG_LEVEL_FATAL, - "Max line limit reached. Linenumber: %u. Lenght: %u. Max lenght: %u.", + "Max line limit reached. Linenumber: %u. Length: %u. Max length: %u.", *linenum, strlen(buf2), buflen-1); } strlcpy(buf, buf2, buflen); @@ -858,10 +858,7 @@ int load_trustfile(struct client_state *csp) if (!check_file_changed(current_trustfile, csp->config->trustfile, &fs)) { /* No need to load */ - if (csp) - { - csp->tlist = current_trustfile; - } + csp->tlist = current_trustfile; return(0); } if (!fs) @@ -1475,7 +1472,8 @@ 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, "%s has been changed", file_to_check->filename); + log_error(LOG_LEVEL_INFO, + "File modification detected: %s", file_to_check->filename); return TRUE; } file_to_check = file_to_check->next;