conf: rename reload_config --> reload_config_file

Michael
This commit is contained in:
Michael Adam 2009-12-21 23:31:10 +01:00
parent 6a5faa0bec
commit d3d31b434a
3 changed files with 6 additions and 6 deletions

View File

@ -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;

View File

@ -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

View File

@ -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);
}