diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf.c | 4 | ||||
| -rw-r--r-- | src/conf.h | 4 | ||||
| -rw-r--r-- | src/main.c | 4 | 
3 files changed, 6 insertions, 6 deletions
@@ -480,8 +480,8 @@ static void initialize_with_defaults (struct config_s *conf,  /**   * Load the configuration.   */ -int reload_config (const char *config_fname, struct config_s *conf, -                   struct config_s *defaults) +int reload_config_file (const char *config_fname, struct config_s *conf, +                        struct config_s *defaults)  {          int ret; @@ -100,7 +100,7 @@ struct config_s {  extern int load_config_file (const char *config_fname, struct config_s *conf);  void free_config (struct config_s *conf); -int reload_config (const char *config_fname, struct config_s *conf, -                   struct config_s *defaults); +int reload_config_file (const char *config_fname, struct config_s *conf, +                        struct config_s *defaults);  #endif @@ -339,8 +339,8 @@ main (int argc, char **argv)          log_message (LOG_INFO, "Initializing " PACKAGE " ..."); -        ret = reload_config(config_defaults.config_file, &config, -                            &config_defaults); +        ret = reload_config_file(config_defaults.config_file, &config, +                                 &config_defaults);          if (ret != 0) {                  exit (EX_SOFTWARE);          }  | 
