mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: sample: move smp_to_type to sample.c

Browse Source 
This way it can be exported and reused anywhere else to report type names.
This commit is contained in:
Willy Tarreau 2014-02-07 12:14:54 +01:00
parent 3ead5b93c6
commit 1cf8f08c17
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/sample.h
View File

@ -26,6 +26,8 @@
#include <types/sample.h>
#include <types/stick_table.h>
extern const char *smp_to_type[SMP_TYPES];
struct sample_expr *sample_parse_expr(char **str, int *idx, char **err, struct arg_list *al);
struct sample_conv *find_sample_conv(const char *kw, int len);
struct sample *sample_process(struct proxy *px, struct session *l4,

14
src/dumpstats.c
View File

@ -53,6 +53,7 @@
#include <proto/proto_http.h>
#include <proto/proto_uxst.h>
#include <proto/proxy.h>
#include <proto/sample.h>
#include <proto/session.h>
#include <proto/server.h>
#include <proto/raw_sock.h>
@ -4836,19 +4837,6 @@ static int stats_maps_list(struct stream_interface *si)
}
}
static const char *smp_to_type[SMP_TYPES] = {
[SMP_T_BOOL] = "bool",
[SMP_T_UINT] = "uint",
[SMP_T_SINT] = "sint",
[SMP_T_ADDR] = "addr",
[SMP_T_IPV4] = "ipv4",
[SMP_T_IPV6] = "ipv6",
[SMP_T_STR] = "str",
[SMP_T_BIN] = "bin",
[SMP_T_CSTR] = "cstr",
[SMP_T_CBIN] = "cbin",
};
static int stats_map_lookup(struct stream_interface *si)
{
struct appctx *appctx = __objt_appctx(si->end);

14
src/sample.c
View File

@ -28,6 +28,20 @@
#include <proto/sample.h>
#include <proto/stick_table.h>
/* sample type names */
const char *smp_to_type[SMP_TYPES] = {
[SMP_T_BOOL] = "bool",
[SMP_T_UINT] = "uint",
[SMP_T_SINT] = "sint",
[SMP_T_ADDR] = "addr",
[SMP_T_IPV4] = "ipv4",
[SMP_T_IPV6] = "ipv6",
[SMP_T_STR] = "str",
[SMP_T_BIN] = "bin",
[SMP_T_CSTR] = "cstr",
[SMP_T_CBIN] = "cbin",
};
/* static sample used in sample_process() when <p> is NULL */
static struct sample temp_smp;