REORG: mailers: move free_email_alert() to mailers.c

free_email_alert() was declared in cfgparse.c, but it should belong to
mailers.c instead.

diff --git a/include/haproxy/cfgparse.h b/include/haproxy/cfgparse.h
index 3a769d5d8feca18578ac42a582f0f0f6899f36d3..32bf186c4d6365bcbe74c59abac273994bbaee1d 100644 (file)
--- a/include/haproxy/cfgparse.h
+++ b/include/haproxy/cfgparse.h
@@ -127,7 +127,6 @@ int too_many_args(int maxarg, char **args, char **msg, int *err_code);
 int alertif_too_many_args_idx(int maxarg, int index, const char *file, int linenum, char **args, int *err_code);
 int alertif_too_many_args(int maxarg, const char *file, int linenum, char **args, int *err_code);
 int parse_process_number(const char *arg, unsigned long *proc, int max, int *autoinc, char **err);
-void free_email_alert(struct proxy *p);
 const char *cfg_find_best_match(const char *word, const struct list *list, int section, const char **extra);
 int warnifnotcap(struct proxy *proxy, int cap, const char *file, int line, const char *arg, const char *hint);
 int failifnotcap(struct proxy *proxy, int cap, const char *file, int line, const char *arg, const char *hint);

diff --git a/include/haproxy/mailers.h b/include/haproxy/mailers.h
index 89aa1b0920ede73dbbcc7814d4dbdbf8032da650..ad5fd437f6b67969e0dff79ccff0ec3597d9b63f 100644 (file)
--- a/include/haproxy/mailers.h
+++ b/include/haproxy/mailers.h
@@ -35,6 +35,7 @@ extern struct mailers *mailers;
 extern int send_email_disabled;
 
 int init_email_alert(struct mailers *mailers, struct proxy *p, char **err);
+void free_email_alert(struct proxy *p);
 void send_email_alert(struct server *s, int priority, const char *format, ...)
        __attribute__ ((format(printf, 3, 4)));
 

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 701a3700369234b96374364ea0262037077438a9..f7f64818832103117dd62c30a51e077519c6ec41 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -1259,14 +1259,6 @@ out:
        return err_code;
 }
 
-void free_email_alert(struct proxy *p)
-{
-       ha_free(&p->email_alert.mailers.name);
-       ha_free(&p->email_alert.from);
-       ha_free(&p->email_alert.to);
-       ha_free(&p->email_alert.myhostname);
-}
-
 
 int
 cfg_parse_netns(const char *file, int linenum, char **args, int kwm)

diff --git a/src/mailers.c b/src/mailers.c
index c09e73c3507746832e6fcf957216a269e027245d..85c18eebd52dd0d5b2cd4fd8ef0527b07c26b422 100644 (file)
--- a/src/mailers.c
+++ b/src/mailers.c
@@ -172,6 +172,14 @@ int init_email_alert(struct mailers *mls, struct proxy *p, char **err)
        return 1;
 }
 
+void free_email_alert(struct proxy *p)
+{
+       ha_free(&p->email_alert.mailers.name);
+       ha_free(&p->email_alert.from);
+       ha_free(&p->email_alert.to);
+       ha_free(&p->email_alert.myhostname);
+}
+
 static int enqueue_one_email_alert(struct proxy *p, struct server *s,
                                   struct email_alertq *q, const char *msg)
 {

diff --git a/src/proxy.c b/src/proxy.c
index 83d7436e31c542781526eb7812489c18cfc065e9..a29f8a526170c2cd83308545239cb87773839ba7 100644 (file)
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -34,6 +34,7 @@
 #include <haproxy/http_htx.h>
 #include <haproxy/http_ext.h>
 #include <haproxy/http_rules.h>
+#include <haproxy/mailers.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
 #include <haproxy/obj_type-t.h>