RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-11 03:31:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

REORG: include: split mailers.h into haproxy/mailers{,-t}.h

Browse Source 
The file mostly contained struct definitions but there was also a
variable export. Most of the stuff currently lies in checks.h and
should definitely move here!
This commit is contained in:
Willy Tarreau 2020-06-04 11:09:42 +02:00
parent 167e1eb7c7
commit cc9bbfb7b5
5 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/types/mailers.h → include/haproxy/mailers-t.h
View File

@ -1,10 +1,10 @@
/*
* include/types/mailer.h
* include/haproxy/mailer-t.h
* This file defines everything related to mailer.
*
* Copyright 2015 Horms Solutions Ltd., Simon Horman <horms@verge.net.au>
*
* Based on include/types/peers.h
* Based on include/haproxy/peers-t.h
*
* Copyright 2010 EXCELIANCE, Emeric Brun <ebrun@exceliance.fr>
*
@ -23,8 +23,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _TYPES_MAILERS_H
#define _TYPES_MAILERS_H
#ifndef _HAPROXY_MAILERS_T_H
#define _HAPROXY_MAILERS_T_H
#include <sys/types.h>
#include <sys/socket.h>
@ -61,8 +61,5 @@ struct mailers {
} timeout;
};
extern struct mailers *mailers;
#endif /* _TYPES_MAILERS_H */
#endif /* _HAPROXY_MAILERS_T_H */

34
include/haproxy/mailers.h Normal file
View File

@ -0,0 +1,34 @@
/*
* include/haproxy/mailer.h
* This file lists exported variables and functions for mailers.
*
* Copyright 2015 Horms Solutions Ltd., Simon Horman <horms@verge.net.au>
* Copyright 2020 Willy Tarreau <w@1wt.eu>
*
* Based on include/haproxy/peers-t.h
*
* Copyright 2010 EXCELIANCE, Emeric Brun <ebrun@exceliance.fr>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation, version 2.1
* exclusively.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _HAPROXY_MAILERS_H
#define _HAPROXY_MAILERS_H
#include <haproxy/mailers-t.h>
extern struct mailers *mailers;
#endif /* _HAPROXY_MAILERS_H */

2
include/proto/checks.h
View File

@ -23,7 +23,7 @@
#define _PROTO_CHECKS_H
#include <haproxy/action-t.h>
#include <types/mailers.h>
#include <haproxy/mailers.h>
#include <types/checks.h>
const char *get_check_status_description(short check_status);

2
src/cfgparse.c
View File

@ -40,6 +40,7 @@
#include <haproxy/chunk.h>
#include <haproxy/dns.h>
#include <haproxy/errors.h>
#include <haproxy/mailers-t.h>
#include <haproxy/pool.h>
#include <haproxy/tools.h>
#include <haproxy/time.h>
@ -52,7 +53,6 @@
#include <types/global.h>
#include <types/obj_type.h>
#include <types/peers.h>
#include <types/mailers.h>
#include <types/stats.h>
#include <proto/acl.h>

2
src/mailers.c
View File

@ -12,6 +12,6 @@
#include <stdlib.h>
#include <types/mailers.h>
#include <haproxy/mailers-t.h>
struct mailers *mailers = NULL;