From: jongfoster Date: Sun, 24 Mar 2002 13:05:48 +0000 (+0000) Subject: Renaming re_filterfile to filterfile X-Git-Tag: v_2_9_13~34 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=b51bca256e5e52889c2b30981b3590451a3258db Renaming re_filterfile to filterfile --- diff --git a/loadcfg.c b/loadcfg.c index 77b12d39..cfa03f77 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.36 2002/03/13 00:27:05 jongfoster Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.37 2002/03/16 23:54:06 jongfoster Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -35,6 +35,13 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.36 2002/03/13 00:27:05 jongfoster * * Revisions : * $Log: loadcfg.c,v $ + * Revision 1.37 2002/03/16 23:54:06 jongfoster + * Adding graceful termination feature, to help look for memory leaks. + * If you enable this (which, by design, has to be done by hand + * editing config.h) and then go to http://i.j.b/die, then the program + * will exit cleanly after the *next* request. It should free all the + * memory that was used. + * * Revision 1.36 2002/03/13 00:27:05 jongfoster * Killing warnings * @@ -360,6 +367,7 @@ static struct file_list *current_configfile = NULL; #define hash_deny_access 1227333715ul /* "deny-access" */ #define hash_enable_edit_actions 2517097536ul /* "enable-edit-actions" */ #define hash_enable_remote_toggle 2979744683ul /* "enable-remote-toggle" */ +#define hash_filterfile 250887266ul /* "filterfile" */ #define hash_forward 2029845ul /* "forward" */ #define hash_forward_socks4 3963965521ul /* "forward-socks4" */ #define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */ @@ -369,7 +377,6 @@ static struct file_list *current_configfile = NULL; #define hash_logfile 2114766ul /* "logfile" */ #define hash_permit_access 3587953268ul /* "permit-access" */ #define hash_proxy_info_url 3903079059ul /* "proxy-info-url" */ -#define hash_re_filterfile 3877522444ul /* "re_filterfile" */ #define hash_single_threaded 4250084780ul /* "single-threaded" */ #define hash_suppress_blocklists 1948693308ul /* "suppress-blocklists" */ #define hash_toggle 447966ul /* "toggle" */ @@ -1106,7 +1113,7 @@ struct configuration_spec * load_config(void) * re_filterfile file-name * In confdir by default. * *************************************************************************/ - case hash_re_filterfile : + case hash_filterfile : freez(config->re_filterfile); config->re_filterfile = make_path(config->confdir, arg); continue;