RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-16 00:14:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

REORG: include: move map to haproxy/map{,-t}.h

Browse Source 
Only small cleanups, and removal of a few includes from files that
didn't need them.
This commit is contained in:
Willy Tarreau 2020-06-04 15:10:43 +02:00
parent 225a90aaec
commit 2cd5809f94
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/types/map.h → include/haproxy/map-t.h
View File

@ -1,5 +1,5 @@
/*
* include/types/map.h
* include/haproxy/map-t.h
* This file provides structures and types for MAPs.
*
* Copyright (C) 2000-2012 Willy Tarreau - w@1wt.eu
@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _TYPES_MAP_H
#define _TYPES_MAP_H
#ifndef _HAPROXY_MAP_T_H
#define _HAPROXY_MAP_T_H
#include <haproxy/pattern-t.h>
#include <types/sample.h>
@ -31,4 +31,4 @@ struct map_descriptor {
int do_free; /* set if <pat> is the original pat and must be freed */
};
#endif /* _TYPES_MAP_H */
#endif /* _HAPROXY_MAP_T_H */

11
include/proto/map.h → include/haproxy/map.h
View File

@ -1,5 +1,5 @@
/*
* include/proto/map.h
* include/haproxy/map.h
* This file provides structures and types for pattern matching.
*
* Copyright (C) 2000-2013 Willy Tarreau - w@1wt.eu
@ -19,10 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef _PROTO_MAP_H
#define _PROTO_MAP_H
#ifndef _HAPROXY_MAP_H
#define _HAPROXY_MAP_H
#include <types/map.h>
#include <haproxy/map-t.h>
#include <types/sample.h>
/* maps output sample parser */
int map_parse_ip(const char *text, struct sample_data *data);
@ -35,4 +36,4 @@ struct map_reference *map_get_reference(const char *reference);
int sample_load_map(struct arg *arg, struct sample_conv *conv,
const char *file, int line, char **err);
#endif /* _PROTO_PATTERN_H */
#endif /* _HAPROXY_MAP_H */

1
src/cli.c
View File

@ -57,7 +57,6 @@
#include <proto/log.h>
#include <haproxy/pipe.h>
#include <haproxy/protocol.h>
#include <proto/map.h>
#include <proto/proxy.h>
#include <proto/sample.h>
#include <proto/session.h>

2
src/hlua.c
View File

@ -33,6 +33,7 @@
#include <haproxy/hlua.h>
#include <haproxy/hlua_fcn.h>
#include <haproxy/http_rules.h>
#include <haproxy/map.h>
#include <haproxy/obj_type.h>
#include <haproxy/pattern.h>
#include <haproxy/tools.h>
@ -48,7 +49,6 @@
#include <proto/connection.h>
#include <proto/stats.h>
#include <proto/http_fetch.h>
#include <proto/map.h>
#include <proto/queue.h>
#include <proto/payload.h>
#include <proto/http_ana.h>

3
src/map.c
View File

@ -13,6 +13,7 @@
#include <stdio.h>
#include <haproxy/api.h>
#include <haproxy/map.h>
#include <haproxy/pattern.h>
#include <haproxy/regex.h>
#include <haproxy/tools.h>
@ -20,14 +21,12 @@
#include <types/applet.h>
#include <types/cli.h>
#include <types/global.h>
#include <types/map.h>
#include <types/stats.h>
#include <proto/applet.h>
#include <haproxy/arg.h>
#include <proto/cli.h>
#include <proto/log.h>
#include <proto/map.h>
#include <proto/stream_interface.h>
#include <proto/sample.h>

2
src/stats.c
View File

@ -36,6 +36,7 @@
#include <haproxy/pool.h>
#include <haproxy/list.h>
#include <haproxy/listener.h>
#include <haproxy/map-t.h>
#include <haproxy/pattern-t.h>
#include <haproxy/tools.h>
#include <haproxy/ticks.h>
@ -58,7 +59,6 @@
#include <haproxy/freq_ctr.h>
#include <proto/log.h>
#include <haproxy/pipe.h>
#include <proto/map.h>
#include <proto/proxy.h>
#include <proto/sample.h>
#include <proto/session.h>