mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 15:47:01 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: samples: rename a struct from sample_storage to sample_data

Browse Source 
This a first step of sample reorganization.
This commit is contained in:
Thierry FOURNIER 2015-08-14 00:02:11 +02:00 committed by Willy Tarreau
parent cc79b003cb
commit 12ba0c29d6
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/proto/map.h
View File

@ -25,10 +25,10 @@
#include <types/map.h>
/* maps output sample parser */
int map_parse_ip(const char *text, struct sample_storage *smp);
int map_parse_ip6(const char *text, struct sample_storage *smp);
int map_parse_str(const char *text, struct sample_storage *smp);
int map_parse_int(const char *text, struct sample_storage *smp);
int map_parse_ip(const char *text, struct sample_data *smp);
int map_parse_ip6(const char *text, struct sample_data *smp);
int map_parse_str(const char *text, struct sample_data *smp);
int map_parse_int(const char *text, struct sample_data *smp);
struct map_reference *map_get_reference(const char *reference);

2
include/proto/pattern.h
View File

@ -208,7 +208,7 @@ void pattern_init_expr(struct pattern_expr *expr);
struct pattern_expr *pattern_lookup_expr(struct pattern_head *head, struct pat_ref *ref);
struct pattern_expr *pattern_new_expr(struct pattern_head *head, struct pat_ref *ref,
char **err, int *reuse);
struct sample_storage **pattern_find_smp(struct pattern_expr *expr, struct pat_ref_elt *elt);
struct sample_data **pattern_find_smp(struct pattern_expr *expr, struct pat_ref_elt *elt);
int pattern_delete(struct pattern_expr *expr, struct pat_ref_elt *ref);

6
include/types/pattern.h
View File

@ -129,7 +129,7 @@ struct pat_time {
* "sample" with a tree entry. It is used with maps.
*/
struct pattern_tree {
struct sample_storage *smp;
struct sample_data *smp;
struct pat_ref_elt *ref;
struct ebmb_node node;
};
@ -168,7 +168,7 @@ struct pattern {
} ptr; /* indirect values, allocated */
int len; /* data length when required */
int sflags; /* flags relative to the storage method. */
struct sample_storage *smp; /* used to store a pointer to sample value associated
struct sample_data *smp; /* used to store a pointer to sample value associated
with the match. It is used with maps */
struct pat_ref_elt *ref;
};
@ -212,7 +212,7 @@ struct pattern_expr_list {
/* This struct contain a list of pattern expr */
struct pattern_head {
int (*parse)(const char *text, struct pattern *pattern, int flags, char **err);
int (*parse_smp)(const char *text, struct sample_storage *smp);
int (*parse_smp)(const char *text, struct sample_data *smp);
int (*index)(struct pattern_expr *, struct pattern *, char **);
void (*delete)(struct pattern_expr *, struct pat_ref_elt *);
void (*prune)(struct pattern_expr *);

2
include/types/sample.h
View File

@ -269,7 +269,7 @@ struct sample {
};
/* Used to store sample constant */
struct sample_storage {
struct sample_data {
int type; /* SMP_T_* */
union {
long long int sint; /* used for signed 64bits integers */

2
include/types/vars.h
View File

@ -27,7 +27,7 @@ struct var_desc {
struct var {
struct list l; /* Used for chaining vars. */
const char *name; /* Contains the variable name. */
struct sample_storage data; /* data storage. */
struct sample_data data; /* data storage. */
};
#endif

8
src/map.c
View File

@ -27,7 +27,7 @@
/* Parse an IPv4 address and store it into the sample.
* The output type is IPV4.
*/
int map_parse_ip(const char *text, struct sample_storage *smp)
int map_parse_ip(const char *text, struct sample_data *smp)
{
if (!buf2ip(text, strlen(text), &smp->data.ipv4))
return 0;
@ -38,7 +38,7 @@ int map_parse_ip(const char *text, struct sample_storage *smp)
/* Parse an IPv6 address and store it into the sample.
* The output type is IPV6.
*/
int map_parse_ip6(const char *text, struct sample_storage *smp)
int map_parse_ip6(const char *text, struct sample_data *smp)
{
if (!buf2ip6(text, strlen(text), &smp->data.ipv6))
return 0;
@ -52,7 +52,7 @@ int map_parse_ip6(const char *text, struct sample_storage *smp)
* overwritten because sample_conv_map() makes a const sample with this
* output.
*/
int map_parse_str(const char *text, struct sample_storage *smp)
int map_parse_str(const char *text, struct sample_data *smp)
{
smp->data.str.str = (char *)text;
smp->data.str.len = strlen(text);
@ -65,7 +65,7 @@ int map_parse_str(const char *text, struct sample_storage *smp)
* number is negative, or UINT if it is positive or null. The function returns
* zero (error) if the number is too large.
*/
int map_parse_int(const char *text, struct sample_storage *smp)
int map_parse_int(const char *text, struct sample_data *smp)
{
smp->type = SMP_T_SINT;
smp->data.sint = read_int64(&text, text + strlen(text));

8
src/pattern.c
View File

@ -1606,9 +1606,9 @@ static inline int pat_ref_set_elt(struct pat_ref *ref, struct pat_ref_elt *elt,
const char *value, char **err)
{
struct pattern_expr *expr;
struct sample_storage **smp;
struct sample_data **smp;
char *sample;
struct sample_storage test;
struct sample_data test;
/* Try all needed converters. */
list_for_each_entry(expr, &ref->pat, list) {
@ -1823,7 +1823,7 @@ static inline
int pat_ref_push(struct pat_ref_elt *elt, struct pattern_expr *expr,
int patflags, char **err)
{
struct sample_storage *smp;
struct sample_data *smp;
struct pattern pattern;
/* Create sample */
@ -2376,7 +2376,7 @@ void pattern_prune(struct pattern_head *head)
* the function returns NULL. If the key cannot be parsed, the function
* fill <err>.
*/
struct sample_storage **pattern_find_smp(struct pattern_expr *expr, struct pat_ref_elt *ref)
struct sample_data **pattern_find_smp(struct pattern_expr *expr, struct pat_ref_elt *ref)
{
struct ebmb_node *node;
struct pattern_tree *elt;