MINOR: samples: rename a struct from sample_storage to sample_data
This a first step of sample reorganization.
diff --git a/include/proto/map.h b/include/proto/map.h
index 9690abb..21ff57c 100644
--- a/include/proto/map.h
+++ b/include/proto/map.h
@@ -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);
diff --git a/include/proto/pattern.h b/include/proto/pattern.h
index 7855474..0a132f2 100644
--- a/include/proto/pattern.h
+++ b/include/proto/pattern.h
@@ -208,7 +208,7 @@
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);
diff --git a/include/types/pattern.h b/include/types/pattern.h
index 54af8fb..86d4bc8 100644
--- a/include/types/pattern.h
+++ b/include/types/pattern.h
@@ -129,7 +129,7 @@
* "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 @@
} 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 @@
/* 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 *);
diff --git a/include/types/sample.h b/include/types/sample.h
index a7db5c0..f34cf17 100644
--- a/include/types/sample.h
+++ b/include/types/sample.h
@@ -269,7 +269,7 @@
};
/* 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 */
diff --git a/include/types/vars.h b/include/types/vars.h
index c387a77..14cb33d 100644
--- a/include/types/vars.h
+++ b/include/types/vars.h
@@ -27,7 +27,7 @@
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
diff --git a/src/map.c b/src/map.c
index fedd9d2..cd5a519 100644
--- a/src/map.c
+++ b/src/map.c
@@ -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 @@
/* 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 @@
* 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 @@
* 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));
diff --git a/src/pattern.c b/src/pattern.c
index 7691b93..9f34f73 100644
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -1606,9 +1606,9 @@
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 @@
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 @@
* 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;