conf: rename reload_config --> reload_config_file

Michael

3 files changed, 6 insertions, 6 deletions

diff --git a/src/conf.c b/src/conf.c
index 3abadb1..c9a2e14 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -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;
 
diff --git a/src/conf.h b/src/conf.h
index c4f7ee9..257d6e0 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -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
diff --git a/src/main.c b/src/main.c
index 8947443..0e9c180 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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);
         }