From: jongfoster Date: Sat, 22 Sep 2001 16:36:59 +0000 (+0000) Subject: Removing unused parameter fs from read_config_line() X-Git-Tag: v_2_9_9~45 X-Git-Url: http://www.privoxy.org/gitweb/copyright.html?a=commitdiff_plain;h=17bd47f8dfbf8c5cba82c8e389c3039ca78a66dc;p=privoxy.git Removing unused parameter fs from read_config_line() --- diff --git a/actions.c b/actions.c index a09f95a2..f08104bc 100644 --- a/actions.c +++ b/actions.c @@ -1,4 +1,4 @@ -const char actions_rcs[] = "$Id: actions.c,v 1.12 2001/09/16 13:21:27 jongfoster Exp $"; +const char actions_rcs[] = "$Id: actions.c,v 1.13 2001/09/16 15:47:37 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/actions.c,v $ @@ -33,6 +33,12 @@ const char actions_rcs[] = "$Id: actions.c,v 1.12 2001/09/16 13:21:27 jongfoster * * Revisions : * $Log: actions.c,v $ + * Revision 1.13 2001/09/16 15:47:37 jongfoster + * First version of CGI-based edit interface. This is very much a + * work-in-progress, and you can't actually use it to edit anything + * yet. You must #define FEATURE_CGI_EDIT_ACTIONS for these changes + * to have any effect. + * * Revision 1.12 2001/09/16 13:21:27 jongfoster * Changes to use new list functions. * @@ -1047,7 +1053,7 @@ int load_actions_file(struct client_state *csp) return 1; /* never get here */ } - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) + while (read_config_line(buf, sizeof(buf), fp) != NULL) { if (*buf == '{') { diff --git a/loadcfg.c b/loadcfg.c index fbd50d7e..72d91b39 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.20 2001/07/30 22:08:36 jongfoster Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.21 2001/09/16 17:10:43 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -35,6 +35,10 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.20 2001/07/30 22:08:36 jongfoster * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.21 2001/09/16 17:10:43 jongfoster + * Moving function savearg() here, since it was the only thing left in + * showargs.c. + * * Revision 1.20 2001/07/30 22:08:36 jongfoster * Tidying up #defines: * - All feature #defines are now of the form FEATURE_xxx @@ -458,7 +462,7 @@ struct configuration_spec * load_config(void) /* Never get here - LOG_LEVEL_FATAL causes program exit */ } - while (read_config_line(buf, sizeof(buf), configfp, fs) != NULL) + while (read_config_line(buf, sizeof(buf), configfp) != NULL) { char cmd[BUFFER_SIZE]; char arg[BUFFER_SIZE]; diff --git a/loaders.c b/loaders.c index b200b902..24b43d1b 100644 --- a/loaders.c +++ b/loaders.c @@ -1,4 +1,4 @@ -const char loaders_rcs[] = "$Id: loaders.c,v 1.25 2001/09/13 22:44:03 jongfoster Exp $"; +const char loaders_rcs[] = "$Id: loaders.c,v 1.26 2001/09/22 14:05:22 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.c,v $ @@ -35,6 +35,11 @@ const char loaders_rcs[] = "$Id: loaders.c,v 1.25 2001/09/13 22:44:03 jongfoster * * Revisions : * $Log: loaders.c,v $ + * Revision 1.26 2001/09/22 14:05:22 jongfoster + * Bugfix: Multiple escaped "#" characters in a configuration + * file are now permitted. + * Also removing 3 unused headers. + * * Revision 1.25 2001/09/13 22:44:03 jongfoster * Adding {} to an if statement * @@ -577,20 +582,17 @@ int check_file_changed(const struct file_list * current, * Description : Read a single non-empty line from a file and return * it. Trims comments, leading and trailing whitespace * and respects escaping of newline and comment char. - * Also writes the file to fs->proxy_args. * * Parameters : * 1 : buf = Buffer to use. * 2 : buflen = Size of buffer in bytes. * 3 : fp = File to read from - * 4 : fs = File will be written to fs->proxy_args. May - * be NULL to disable this feature. * * Returns : NULL on EOF or error * Otherwise, returns buf. * *********************************************************************/ -char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs) +char *read_config_line(char *buf, int buflen, FILE *fp) { char *p; char *src; @@ -746,7 +748,7 @@ int load_trustfile(struct client_state *csp) tl = csp->config->trust_list; - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) + while (read_config_line(buf, sizeof(buf), fp) != NULL) { trusted = 0; reject = 1; @@ -913,7 +915,7 @@ int load_re_filterfile(struct client_state *csp) } /* Read line by line */ - while (read_config_line(buf, sizeof(buf), fp, fs) != NULL) + while (read_config_line(buf, sizeof(buf), fp) != NULL) { enlist( bl->patterns, buf ); diff --git a/loaders.h b/loaders.h index 756a6de7..a0fea3e9 100644 --- a/loaders.h +++ b/loaders.h @@ -1,6 +1,6 @@ #ifndef LOADERS_H_INCLUDED #define LOADERS_H_INCLUDED -#define LOADERS_H_VERSION "$Id: loaders.h,v 1.8 2001/07/29 18:58:15 jongfoster Exp $" +#define LOADERS_H_VERSION "$Id: loaders.h,v 1.9 2001/07/30 22:08:36 jongfoster Exp $" /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loaders.h,v $ @@ -37,6 +37,12 @@ * * Revisions : * $Log: loaders.h,v $ + * Revision 1.9 2001/07/30 22:08:36 jongfoster + * Tidying up #defines: + * - All feature #defines are now of the form FEATURE_xxx + * - Permanently turned off WIN_GUI_EDIT + * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS + * * Revision 1.8 2001/07/29 18:58:15 jongfoster * Removing nested #includes, adding forward declarations for needed * structures, and changing the #define _FILENAME_H to FILENAME_H_INCLUDED. @@ -113,7 +119,7 @@ struct configuration_spec; struct url_spec; extern void sweep(void); -extern char *read_config_line(char *buf, int buflen, FILE *fp, struct file_list *fs); +extern char *read_config_line(char *buf, int buflen, FILE *fp); extern int check_file_changed(const struct file_list * current, const char * filename, struct file_list ** newfl);