Deduplicate a line in the dok-release target

[privoxy.git] / loadcfg.c

diff --git a/loadcfg.c b/loadcfg.c
index 9235a9a..d7f9db6 100644 (file)
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.118 2011/07/17 13:34:36 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.120 2011/07/19 11:00:20 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -1525,14 +1525,14 @@ struct configuration_spec * load_config(void)
       log_error(LOG_LEVEL_FATAL, "Out of memory loading config - insufficient memory for config->proxy_args");
    }
 
-   if (config->actions_file[0])
+   if (config->re_filterfile[0])
    {
-      add_loader(load_action_files, config);
+      add_loader(load_re_filterfiles, config);
    }
 
-   if (config->re_filterfile[0])
+   if (config->actions_file[0])
    {
-      add_loader(load_re_filterfiles, config);
+      add_loader(load_action_files, config);
    }
 
 #ifdef FEATURE_TRUST
@@ -1551,7 +1551,7 @@ struct configuration_spec * load_config(void)
       }
    }
 
-   for (i = 0; i < MAX_LISTENING_SOCKETS && NULL != config->haddr[i]; i++ )
+   for (i = 0; i < MAX_LISTENING_SOCKETS && NULL != config->haddr[i]; i++)
    {
       if ((*config->haddr[i] == '[')
          && (NULL != (p = strchr(config->haddr[i], ']')))