RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-21 13:16:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
The file was split into two since it contains a variable declaration.
This commit is contained in:
Willy Tarreau 2020-06-04 11:18:28 +02:00
parent cc9bbfb7b5
commit 278161c1b8
13 changed files with 90 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
include/haproxy/capture-t.h Normal file
View File

@ -0,0 +1,43 @@
/*
* include/haproxy/capture-t.h
* This file defines types for captures.
*
* Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
*
* 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_CAPTURE_T_H
#define _HAPROXY_CAPTURE_T_H
#include <haproxy/pool-t.h>
struct cap_hdr {
struct cap_hdr *next;
char *name; /* header name, case insensitive, NULL if not header */
int namelen; /* length of the header name, to speed-up lookups, 0 if !name */
int len; /* capture length, not including terminal zero */
int index; /* index in the output array */
struct pool_head *pool; /* pool of pre-allocated memory area of (len+1) bytes */
};
#endif /* _HAPROXY_CAPTURE_T_H */
/*
* Local variables:
* c-indent-level: 8
* c-basic-offset: 8
* End:
*/

37
include/haproxy/capture.h Normal file
View File

@ -0,0 +1,37 @@
/*
* include/haproxy/capture.h
* This file defines prototypes for captures.
*
* Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
*
* 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_CAPTURE_H
#define _HAPROXY_CAPTURE_H
#include <haproxy/capture-t.h>
#include <haproxy/pool-t.h>
extern struct pool_head *pool_head_capture;
#endif /* _HAPROXY_CAPTURE_H */
/*
* Local variables:
* c-indent-level: 8
* c-basic-offset: 8
* End:
*/

46
include/types/capture.h
View File

@ -1,46 +0,0 @@
/*
include/types/capture.h
This file defines everything related to captures.
Copyright (C) 2000-2007 Willy Tarreau - w@1wt.eu
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 _TYPES_CAPTURE_H
#define _TYPES_CAPTURE_H
#include <haproxy/api-t.h>
#include <haproxy/pool-t.h>
struct cap_hdr {
struct cap_hdr *next;
char *name; /* header name, case insensitive, NULL if not header */
int namelen; /* length of the header name, to speed-up lookups, 0 if !name */
int len; /* capture length, not including terminal zero */
int index; /* index in the output array */
struct pool_head *pool; /* pool of pre-allocated memory area of (len+1) bytes */
};
extern struct pool_head *pool_head_capture;
#endif /* _TYPES_CAPTURE_H */
/*
* Local variables:
* c-indent-level: 8
* c-basic-offset: 8
* End:
*/

2
src/cfgparse-listen.c
View File

@ -14,7 +14,7 @@
#include <common/cfgparse.h>
#include <common/uri_auth.h>
#include <types/capture.h>
#include <haproxy/capture-t.h>
#include <haproxy/compression-t.h>
#include <haproxy/http_htx.h>
#include <types/stats.h>

2
src/cfgparse.c
View File

@ -36,6 +36,7 @@
#include <haproxy/action-t.h>
#include <haproxy/auth.h>
#include <haproxy/api.h>
#include <haproxy/capture.h>
#include <common/cfgparse.h>
#include <haproxy/chunk.h>
#include <haproxy/dns.h>
@ -48,7 +49,6 @@
#include <haproxy/namespace.h>
#include <haproxy/thread.h>
#include <types/capture.h>
#include <types/filters.h>
#include <types/global.h>
#include <types/obj_type.h>

2
src/haproxy.c
View File

@ -101,7 +101,7 @@
#include <haproxy/version.h>
#include <haproxy/thread.h>
#include <types/capture.h>
#include <haproxy/capture-t.h>
#include <types/cli.h>
#include <types/filters.h>
#include <types/global.h>

2
src/http_act.c
View File

@ -28,7 +28,7 @@
#include <common/uri_auth.h>
#include <haproxy/version.h>
#include <types/capture.h>
#include <haproxy/capture-t.h>
#include <types/global.h>
#include <proto/acl.h>

2
src/http_ana.c
View File

@ -20,7 +20,7 @@
#include <haproxy/regex.h>
#include <common/uri_auth.h>
#include <types/capture.h>
#include <haproxy/capture-t.h>
#include <proto/acl.h>
#include <proto/channel.h>

2
src/http_conv.c
View File

@ -23,7 +23,7 @@
#include <haproxy/tools.h>
#include <haproxy/version.h>
#include <types/capture.h>
#include <haproxy/capture-t.h>
#include <types/global.h>
#include <haproxy/arg.h>

2
src/http_rules.c
View File

@ -25,7 +25,7 @@
#include <haproxy/tools.h>
#include <haproxy/version.h>
#include <types/capture.h>
#include <haproxy/capture-t.h>
#include <types/global.h>
#include <proto/acl.h>

2
src/proxy.c
View File

@ -26,7 +26,7 @@
#include <import/eb32tree.h>
#include <import/ebistree.h>
#include <types/capture.h>
#include <haproxy/capture-t.h>
#include <types/cli.h>
#include <types/global.h>
#include <types/obj_type.h>

2
src/stream.c
View File

@ -16,6 +16,7 @@
#include <haproxy/action.h>
#include <haproxy/api.h>
#include <haproxy/capture.h>
#include <common/cfgparse.h>
#include <haproxy/dict.h>
#include <haproxy/dns.h>
@ -27,7 +28,6 @@
#include <haproxy/pool.h>
#include <types/applet.h>
#include <types/capture.h>
#include <types/cli.h>
#include <types/filters.h>
#include <types/global.h>

2
src/tcp_rules.c
View File

@ -11,6 +11,7 @@
*/
#include <haproxy/action.h>
#include <haproxy/api.h>
#include <haproxy/capture-t.h>
#include <common/cfgparse.h>
#include <haproxy/list.h>
#include <haproxy/tools.h>
@ -18,7 +19,6 @@
#include <haproxy/time.h>
#include <haproxy/arg-t.h>
#include <types/capture.h>
#include <types/connection.h>
#include <types/global.h>