RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-01 22:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: stick-table: use smp_expr_output_type() to retrieve the output type of a "struct sample_expr"

Browse Source 
It's just a minor cleanup.
This commit is contained in:
Thierry FOURNIER 2013-11-27 15:30:55 +01:00 committed by Willy Tarreau
parent 348971ea28
commit f73eb8f1dc
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/stick_table.c
View File

@ -665,19 +665,15 @@ struct stktable_key *stktable_fetch_key(struct stktable *t, struct proxy *px, st
*/ */
int stktable_compatible_sample(struct sample_expr *expr, unsigned long table_type) int stktable_compatible_sample(struct sample_expr *expr, unsigned long table_type)
{ {
int out_type;
if (table_type >= STKTABLE_TYPES) if (table_type >= STKTABLE_TYPES)
return 0; return 0;
if (LIST_ISEMPTY(&expr->conv_exprs)) { out_type = smp_expr_output_type(expr);
if (!sample_to_key[expr->fetch->out_type][table_type]) if (!sample_to_key[out_type][table_type])
return 0; return 0;
} else {
struct sample_conv_expr *conv_expr;
conv_expr = LIST_PREV(&expr->conv_exprs, typeof(conv_expr), list);
if (!sample_to_key[conv_expr->conv->out_type][table_type])
return 0;
}
return 1; return 1;
} }