conf: rename reload_config --> reload_config_file

Michael

diff --git a/src/conf.c b/src/conf.c
index 3abadb14ddd24a892bb0e063ea0c2c740bc7b8e0..c9a2e14cd8d740d78a226c2bb83e0d072d1722b2 100644 (file)
--- 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 c4f7ee9d2646484a2fcea211c86bf9a33672bdce..257d6e05f1b9a8da18e5e0762ae141cc646e13cd 100644 (file)
--- 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 8947443fba03fc1909e48964cf75777c13704917..0e9c180ad47b796e35e37fe249766e9b196fd6f2 100644 (file)
--- 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);
         }