X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fpazpar2_config.c;h=474545843a6d5adcfb1fb4aa6173238b2394f7a4;hb=a745f0041d5e495db155d4c43883f80b0c613d7e;hp=3e2290e0504e51a8898b0c807297e3b50ff36859;hpb=6951bed95e519efe86d2b9bca10a0ac2d1ec1189;p=pazpar2-moved-to-github.git diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c index 3e2290e..4745458 100644 --- a/src/pazpar2_config.c +++ b/src/pazpar2_config.c @@ -930,16 +930,13 @@ void config_destroy(struct conf_config *config) } } -void config_read_settings(struct conf_config *config, - const char *path_override) +void config_read_settings(struct conf_config *config) { struct conf_service *s = config->servers->service; for (;s ; s = s->next) { init_settings(s); - if (path_override) - settings_read(s, path_override); - else if (s->settings) + if (s->settings) settings_read(s, s->settings); else if (config->servers->server_settings) settings_read(s, config->servers->server_settings);