REORG: use the name "sample" instead of "pattern" to designate extracted data
This is mainly a massive renaming in the code to get it in line with the
calling convention. Next patch will rename a few files to complete this
operation.
diff --git a/include/proto/pattern.h b/include/proto/pattern.h
index f3250ec..c595ed6 100644
--- a/include/proto/pattern.h
+++ b/include/proto/pattern.h
@@ -25,10 +25,10 @@
#include <types/pattern.h>
#include <types/stick_table.h>
-struct pattern_expr *pattern_parse_expr(char **str, int *idx, char *err, int err_size);
-struct sample *pattern_process(struct proxy *px, struct session *l4,
- void *l7, unsigned int dir, struct pattern_expr *expr,
+struct sample_expr *sample_parse_expr(char **str, int *idx, char *err, int err_size);
+struct sample *sample_process(struct proxy *px, struct session *l4,
+ void *l7, unsigned int dir, struct sample_expr *expr,
struct sample *p);
-void pattern_register_fetches(struct pattern_fetch_kw_list *psl);
-void pattern_register_convs(struct pattern_conv_kw_list *psl);
+void sample_register_fetches(struct sample_fetch_kw_list *psl);
+void sample_register_convs(struct sample_conv_kw_list *psl);
#endif
diff --git a/include/proto/stick_table.h b/include/proto/stick_table.h
index 7756623..f7d650a 100644
--- a/include/proto/stick_table.h
+++ b/include/proto/stick_table.h
@@ -48,8 +48,8 @@
struct stksess *stktable_update_key(struct stktable *table, struct stktable_key *key);
struct stktable_key *stktable_fetch_key(struct stktable *t, struct proxy *px,
struct session *l4, void *l7, unsigned int opt,
- struct pattern_expr *expr);
-int stktable_compatible_pattern(struct pattern_expr *expr, unsigned long table_type);
+ struct sample_expr *expr);
+int stktable_compatible_sample(struct sample_expr *expr, unsigned long table_type);
int stktable_get_data_type(char *name);
struct proxy *find_stktable(const char *name);